Sketches in fix for map-mirroring bug.
Adds tests for map collection model-removal.
Resolves map-mirroring bug introduced by exclude-existing optimization.