Trivial cleanup: Consistently use the CPP_MANGLE macro.

Almost not worth the pull request…