     /// By default, each parser has an option triggered by `-h` and `--help`. It also provides
     /// a console-displayable string of the options via the `helpStringForCommandName` method.
     ///
-    /// :param: definitions the option definitions to parse for.
-    /// :returns: a parser
+    /// - parameter definitions: the option definitions to parse for.
+    /// - returns: a parser
     public init(definitions defs:[Option] = []) {
         let helpOption = Option(trigger:.Mixed("h", "help"), helpDescription: "Display command help.")
-        if contains(defs, helpOption) {
+        if defs.contains(helpOption) {
             self.definitions = defs
         } else {
             self.definitions = defs + [helpOption]

    
    /// Determines if the given string matches this trigger.
    ///
    /// :param: str the string.
    /// :returns: `true` if the string matches this option's trigger, `false` otherwise.
    func matches(str:String) -> Bool {
        switch self.trigger {
        case .Short(let char):

    
    static func normalizeParameters(parameters:[String]) -> [String] {
        return parameters.reduce([String]()) { memo, next in
            let index = next.startIndex.advancedBy(0)
            if next[index] != "-" {
                return memo + [next]
            }
            
            let secondIndex = index.advancedBy(1)
            if next[secondIndex] == "-" {
                /* Assume everything that follows is valid. */
                return memo + [next]
