Tweak map's save

Not only does it avoid opAssign issues, but the final code is simpler anyways.