Improvements to CSV export.