Merge pull request #1700 from KhronosGroup/fix-pp

PP: Remove sub-tokens in macro recording and record spaces correctly.