Minor optimizations to new _IdMaps