* cppmacro.c (paste_tokens): Rename from paste_payloads.
        Change token type after pasting spellings.
        (paste_all_tokens): Use it.

From-SVN: r37596