diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 56c11c88b..2c87a7681 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -113,6 +113,7 @@ typedef struct rua_extra_s {
 		bool        params;
 		bool        expand;
 		bool        suppressed;
+		bool        no_lex;
 		qc_yypstate *qc_state;
 		pre_yypstate *pre_state;
 		pre_yypstate *args_state;
@@ -1548,10 +1549,10 @@ rescan:
 		extra->macro = macro->next;
 		macro->next = 0;
 	}
-	rua_tok_t e;
+	rua_tok_t e = {};
 	if (extra->macro) {
 		e = next_macro_token (extra->macro);
-	} else {
+	} else if (!extra->no_lex) {
 		tok->token = yylex (tok, &extra->location, scanner);
 		tok->location = extra->location;
 		if ((extra->pending_macro || extra->recording)
@@ -2407,17 +2408,28 @@ rua_macro_va_opt (rua_macro_t *macro, void *scanner)
 	if (!cur->args[~cur->num_params]->tokens) {
 		return;
 	}
-	for (auto t = macro->args[0]->tokens; t; t = t->next) {
-		symbol_t   *sym;
-		if (t->token == -rua_id
-			&& (sym = symtab_lookup (cur->params, t->text))) {
-			for (auto a = cur->args[sym->s.offset]->tokens; a; a = a->next) {
-				append_token (macro, a);
-			}
-		} else {
-			append_token (macro, t);
+	auto arg = macro->args[0];
+	arg->params = cur->params;
+	arg->num_params = cur->num_params;
+	arg->num_args = cur->num_args;
+	arg->args = cur->args;
+
+	rua_extra_t va_extra = *extra;
+	va_extra.macro = 0;
+	va_extra.no_lex = true;
+	queue_macro (&va_extra, arg);
+	qc_yyset_extra (&va_extra, scanner);
+
+	while (true) {
+		rua_tok_t   e;
+		if (next_token (&e, scanner)) {
+			append_token (macro, &e);
+			continue;
 		}
+		break;
 	}
+
+	qc_yyset_extra (extra, scanner);
 }
 
 void
diff --git a/tools/qfcc/test/Makemodule.am b/tools/qfcc/test/Makemodule.am
index eca0d5376..1e1b414de 100644
--- a/tools/qfcc/test/Makemodule.am
+++ b/tools/qfcc/test/Makemodule.am
@@ -47,6 +47,7 @@ test_progs_dat=\
 	tools/qfcc/test/pga2d.dat \
 	tools/qfcc/test/pga3d.dat \
 	tools/qfcc/test/postop.dat \
+	tools/qfcc/test/preproc-1.dat \
 	tools/qfcc/test/ptraliasenc.dat \
 	tools/qfcc/test/ptrfunc.dat \
 	tools/qfcc/test/ptrstructcast.dat \
@@ -582,6 +583,16 @@ tools/qfcc/test/postop.run: $(qfcc_test_run_deps)
 include $(postop_dep) # am--include-marker
 r_depfiles_remade += $(postop_dep)
 
+tools_qfcc_test_preproc_1_dat_SOURCES=tools/qfcc/test/preproc-1.r
+preproc_1_obj=$(tools_qfcc_test_preproc_1_dat_SOURCES:.r=.o)
+preproc_1_dep=$(call qcautodep,$(tools_qfcc_test_preproc_1_dat_SOURCES))
+tools/qfcc/test/preproc-1.dat$(EXEEXT): $(preproc_1_obj) $(QFCC_DEP)
+	$(V_QFCCLD)$(QLINK) -o $@ $(preproc_1_obj)
+tools/qfcc/test/preproc-1.run: $(qfcc_test_run_deps)
+	@$(top_srcdir)/tools/qfcc/test/build-run $@
+include $(preproc_1_dep) # am--include-marker
+r_depfiles_remade += $(preproc_1_dep)
+
 tools_qfcc_test_ptraliasenc_dat_SOURCES=tools/qfcc/test/ptraliasenc.r
 ptraliasenc_obj=$(tools_qfcc_test_ptraliasenc_dat_SOURCES:.r=.o)
 ptraliasenc_dep=$(call qcautodep,$(tools_qfcc_test_ptraliasenc_dat_SOURCES))
diff --git a/tools/qfcc/test/preproc-1.r b/tools/qfcc/test/preproc-1.r
new file mode 100644
index 000000000..1fef98608
--- /dev/null
+++ b/tools/qfcc/test/preproc-1.r
@@ -0,0 +1,10 @@
+#define LPAREN() (
+#define G(Q) 42
+#define F(R, X, ...) __VA_OPT__(G R X) )
+int x = F(LPAREN(), 0, <:-); // replaced by int x = 42;
+
+int
+main ()
+{
+	return x != 42;
+}