Token concatenation in CU_SCOPE_* is now implemented correctly.