Fix for changes to std::iter::Map