CPP: Replaced Macro's static map with a MacroMap class.