Refactor CombinatorParserCSV