RFC: clean up map
and collect
with iterator traits
#15146
Merged
map
and collect
with iterator traits
#15146