diff --git a/src/comp/syntax/ext/qquote.rs b/src/comp/syntax/ext/qquote.rs
index e1912ce0087d..90501870e731 100644
--- a/src/comp/syntax/ext/qquote.rs
+++ b/src/comp/syntax/ext/qquote.rs
@@ -2,7 +2,7 @@ import driver::session;
 
 import option::{none, some};
 
-import syntax::ast::{crate, expr_, expr_mac, mac_invoc, mac_qq};
+import syntax::ast::{crate, expr_, expr_mac, mac_invoc, mac_qq, mac_var};
 import syntax::fold::*;
 import syntax::ext::base::*;
 import syntax::ext::build::*;
@@ -29,6 +29,28 @@ fn expand_qquote(cx: ext_ctxt, sp: span, _e: @ast::expr) -> ast::expr_ {
     ret call.node;
 }
 
+fn replace(e: @ast::expr, repls: [@ast::expr]) -> @ast::expr {
+    let aft = default_ast_fold();
+    let f_pre = {fold_expr: bind replace_expr(repls, _, _, _,
+                                              aft.fold_expr)
+                 with *aft};
+    let f = make_fold(f_pre);
+    ret f.fold_expr(e);
+}
+
+fn replace_expr(repls: [@ast::expr],
+                e: ast::expr_, s: span, fld: ast_fold,
+                orig: fn@(ast::expr_, span, ast_fold)->(ast::expr_, span))
+    -> (ast::expr_, span)
+{
+    // note: nested enum matching will be really nice here so I can jusy say
+    //       expr_mac(mac_var(i))
+    alt e {
+      expr_mac({node: mac_var(i), _}) {let r = repls[i]; (r.node, r.span)}
+      _ {orig(e,s,fld)}
+    }
+}
+
 // Local Variables:
 // mode: rust
 // fill-column: 78;