Fix the parsers to deal with commas in quotes