Eliminate extra indirection from within the map class.