Merge "Surrounding some field names with quotes to avoid breaking CSV assumptions."