Minor improvements to MappingIterator, preparing for sub-classability (initially for CSV)