Converted a few uses of 'Set' to 'std::set'
Converted some uses of 'Map' to 'std::map'
Converted some more uses of 'Map' to 'std::map'
And yet again: converted some uses of 'Map' to 'std::map'