Further simplification of CsvParsing