Tweak map's save

Not only does it avoid opAssign issues, but the final code is simpler anyways.
Merge pull request #2000 from monarchdodra/mapSave

Tweak map's save