preproc: Fix the token in expanding the %+/%- macro-parameters