More of the same: 'Map' -> 'std::map'