Fix SimpleCSV quotes and handling of missing tokens