Fixed CPP parser for map changes.