As of the last meeting, we no longer distinguish between identifiers in the C++ token space and the preprocessor token space for the purposes of XID_Start+XID_Continue and NFC checking because sequences that are canonically equivalent to macro names ought to behave as that macro name.