some more tweaks to mapping_iterator