Under betterFors don't drop the trailing map if it would result in a different type (also drop _ => ())

Under betterFors don't drop the trailing map if it would result in a different type (also drop _ => ()) #20721