i
These also now always set new map instances so that the angular
watcher picks up changes without having to do a deep comparison.