Changed the level-2 CSV parser from push to pull and
renamed some things for consistency.