More refactoring to MappingIterator api.