preproc: handle %+ even during early token replacement