     let len = length
     repeat {
       let c = stream[i]
-      if c == 13 { // "
+      if c == 13 {
         if let s = collectString(i) {
           contentTypeValue = s
         } else {
           throw BodyParserError.FileNameValue
         }
         entryParser = .ContentBody
-        index += 1
+        index = i + 1
         break
       } else if c > 32 { // Space.
         // ignore

  }

  mutating func inContentBody() throws {
    if stream[index] == 13 {
      index += 1
      entryParser = .LineFeed
      linedUpParser = .ContentData
    } else {
      throw BodyParserError.ContentBody
    }

      entryParser = .Space
      linedUpParser = .FileName
    } else if stream[index] == 13 { // Carriage return.
      entryParser = .ContentBody
      index += 1
    } else {
      throw BodyParserError.NameValue
