Same suggestion here as above - it would be better if map-specific state lived in the map.