More simplifications to CsvParsing - more closely matches the book now

See page 210 of Functional Programming in Scala