Small fixes to the C++ization of /map