More robust CSV support.