mapping: Make the iterators conform to the proper interface.