diff --git a/src/Init/Lean/Elab/DoNotation.lean b/src/Init/Lean/Elab/DoNotation.lean
index 2f582c72c6..8b800a82e4 100644
--- a/src/Init/Lean/Elab/DoNotation.lean
+++ b/src/Init/Lean/Elab/DoNotation.lean
@@ -50,7 +50,7 @@ private partial def hasLiftMethod : Syntax → Bool
   else args.any hasLiftMethod
 | _ => false
 
-private partial def expandLiftMethodAux : Syntax → StateT (Array Syntax) TermElabM Syntax
+private partial def expandLiftMethodAux : Syntax → StateT (Array Syntax) MacroM Syntax
 | stx@(Syntax.node k args) =>
   if k == `Lean.Parser.Term.do then pure stx
   else if k == `Lean.Parser.Term.liftMethod then withFreshMacroScope $ do
@@ -65,7 +65,7 @@ private partial def expandLiftMethodAux : Syntax → StateT (Array Syntax) TermE
     pure $ Syntax.node k args
 | stx => pure stx
 
-private def expandLiftMethod (stx : Syntax) : TermElabM (Option (Array Syntax)) :=
+private def expandLiftMethod (stx : Syntax) : MacroM (Option (Array Syntax)) :=
 if hasLiftMethod stx then do
   (stx, doElems) ← (expandLiftMethodAux stx).run #[];
   let doElems := doElems.push stx;
@@ -74,16 +74,16 @@ else
   pure none
 
 /- Expand `doLet`, `doPat`, nonterminal `doExpr`s, and `liftMethod` -/
-private partial def expandDoElems : Bool → Array Syntax → Nat → TermElabM (Option Syntax)
+private partial def expandDoElemsAux : Bool → Array Syntax → Nat → MacroM (Option Syntax)
 | modified, doElems, i =>
-  let mkRest : Unit → TermElabM Syntax := fun _ => do {
+  let mkRest : Unit → MacroM Syntax := fun _ => do {
     let restElems := doElems.extract (i+2) doElems.size;
     if restElems.size == 1 then
       pure $ (restElems.get! 0).getArg 0
     else
       `(do { $restElems* })
   };
-  let addPrefix (rest : Syntax) : TermElabM (Option Syntax) := do {
+  let addPrefix (rest : Syntax) : MacroM (Option Syntax) := do {
     if i == 0 then
       pure rest
     else
@@ -100,7 +100,7 @@ private partial def expandDoElems : Bool → Array Syntax → Nat → TermElabM
       let pre     := doElems.extract 0 i;
       let doElems := pre ++ doElemsNew ++ post;
       tmp ← `(do { $doElems* });
-      expandDoElems true doElems i
+      expandDoElemsAux true doElems i
     | none =>
       if doElem.getKind == `Lean.Parser.Term.doLet then do
         let letDecl := doElem.getArg 1;
@@ -126,14 +126,17 @@ private partial def expandDoElems : Bool → Array Syntax → Nat → TermElabM
         auxDo ← `(do x ← $term; $(Syntax.missing));
         let doElemNew := (getDoElems auxDo).get! 0;
         let doElems := doElems.set! i doElemNew;
-        expandDoElems true doElems (i+2)
+        expandDoElemsAux true doElems (i+2)
       else
-        expandDoElems modified doElems (i+2)
+        expandDoElemsAux modified doElems (i+2)
   else if modified then
     `(do { $doElems* })
   else
     pure none
 
+private partial def expandDoElems (doElems : Array Syntax) : MacroM (Option Syntax) :=
+expandDoElemsAux false doElems 0
+
 private def ensureDoElemType (ref : Syntax) (expectedMonad : Expr) (expectedType : Expr) (val : Expr) : TermElabM Expr := do
 -- TODO: try MonadLift
 ensureHasType ref expectedType val
@@ -215,7 +218,7 @@ fun stx expectedType? => do
   let ref := stx;
   tryPostponeIfNoneOrMVar expectedType?;
   let doElems := getDoElems stx;
-  stxNew? ← expandDoElems false doElems 0;
+  stxNew? ← liftMacroM $ expandDoElems doElems;
   match stxNew? with
   | some stxNew => withMacroExpansion stx stxNew $ elabTerm stxNew expectedType?
   | none => do
diff --git a/src/Init/Lean/Elab/Util.lean b/src/Init/Lean/Elab/Util.lean
index c993556f57..4ddc1c76cc 100644
--- a/src/Init/Lean/Elab/Util.lean
+++ b/src/Init/Lean/Elab/Util.lean
@@ -231,14 +231,17 @@ class MonadMacroAdapter (m : Type → Type) :=
 (throwError {} {α : Type}             : Syntax → MessageData → m α)
 (throwUnsupportedSyntax {} {α : Type} : m α)
 
-@[inline] def adaptMacro {m : Type → Type} [Monad m] [MonadMacroAdapter m] (x : Macro) (stx : Syntax) : m Syntax := do
+@[inline] def liftMacroM {α} {m : Type → Type} [Monad m] [MonadMacroAdapter m] (x : MacroM α) : m α := do
 scp  ← MonadMacroAdapter.getCurrMacroScope;
 env  ← MonadMacroAdapter.getEnv;
 next ← MonadMacroAdapter.getNextMacroScope;
-match x stx { currMacroScope := scp, mainModule := env.mainModule } next with
+match x { currMacroScope := scp, mainModule := env.mainModule } next with
 | EStateM.Result.error Macro.Exception.unsupportedSyntax _ => MonadMacroAdapter.throwUnsupportedSyntax
-| EStateM.Result.error (Macro.Exception.error msg) _       => MonadMacroAdapter.throwError stx msg
-| EStateM.Result.ok stx nextMacroScope                     => do MonadMacroAdapter.setNextMacroScope nextMacroScope; pure stx
+| EStateM.Result.error (Macro.Exception.error ref msg) _   => MonadMacroAdapter.throwError ref msg
+| EStateM.Result.ok a nextMacroScope                       => do MonadMacroAdapter.setNextMacroScope nextMacroScope; pure a
+
+@[inline] def adaptMacro {m : Type → Type} [Monad m] [MonadMacroAdapter m] (x : Macro) (stx : Syntax) : m Syntax :=
+liftMacroM (x stx)
 
 @[init] private def regTraceClasses : IO Unit := do
 registerTraceClass `Elab;
diff --git a/src/Init/LeanInit.lean b/src/Init/LeanInit.lean
index 45bdfdd144..17aa6c724b 100644
--- a/src/Init/LeanInit.lean
+++ b/src/Init/LeanInit.lean
@@ -366,7 +366,7 @@ structure Context :=
 (currMacroScope : MacroScope)
 
 inductive Exception
-| error             : String → Exception
+| error             : Syntax → String → Exception
 | unsupportedSyntax : Exception
 
 end Macro
@@ -380,6 +380,9 @@ pure $ Lean.addMacroScope ctx.mainModule n ctx.currMacroScope
 def Macro.throwUnsupported {α} : MacroM α :=
 throw Macro.Exception.unsupportedSyntax
 
+def Macro.throwError {α} (ref : Syntax) (msg : String) : MacroM α :=
+throw $ Macro.Exception.error ref msg
+
 @[inline] protected def Macro.withFreshMacroScope {α} (x : MacroM α) : MacroM α := do
 fresh ← modifyGet (fun s => (s, s+1));
 adaptReader (fun (ctx : Macro.Context) => { currMacroScope := fresh, .. ctx }) x