 
   static var relaunchParser: Parser<Action> {
     return Parser<FBApplicationLaunchConfiguration>
-      .ofCommandWithArg(EventName.Relaunch.rawValue,
-                        FBProcessLaunchConfigurationParsers.appLaunchParser)
-      .fmap { Action.relaunch($0) }
+      .ofCommandWithArg(
+        EventName.Relaunch.rawValue,
+        FBProcessLaunchConfigurationParsers.appLaunchParser
+      )
+      .fmap(Action.relaunch)
       .sectionize("relaunch", "Action: Relaunch", "")
   }
 
   static var recordParser: Parser<Action> {
     return Parser<Record>
       .ofCommandWithArg(EventName.Record.rawValue, Record.parser)
-      .fmap { Action.record($0) }
+      .fmap(Action.record)
   }
 
   static var shutdownParser: Parser<Action> {

      self.osVersionsParser,
      self.deviceParser
    ])
      .sectionize("targets/query", "Target: Queries", "")
  }

  static var firstParser: Parser<FBiOSTargetQuery> {
    return Parser<Int>
      .ofFlagWithArg("first", Parser<Int>.ofInt, "")
      .fmap { FBiOSTargetQuery.ofCount($0) }
  }

  static var uuidParser: Parser<FBiOSTargetQuery> {
    return Parser<FBiOSTargetQuery>
      .ofUDID
      .fmap { FBiOSTargetQuery.udids([$0]) }
  }

  static var architectureParser: Parser<FBiOSTargetQuery> {
    return Parser<FBArchitecture>
      .alternative(FBArchitecture.allFields.map(architectureSubparser))
      .fmap { FBiOSTargetQuery.architectures([$0]) }
  }

  static func architectureSubparser(_ architecture: FBArchitecture) -> Parser<FBArchitecture> {

      self.allParser,
      self.unionParser
    ])
    .sectionize("targets", "Targets", "")
  }

  static var allParser: Parser<FBiOSTargetQuery> {
