preproc: fix more token pasting cases