diff --git a/src/Lean/Elab/Command.lean b/src/Lean/Elab/Command.lean
index 0516e90039..82c892a1b3 100644
--- a/src/Lean/Elab/Command.lean
+++ b/src/Lean/Elab/Command.lean
@@ -300,30 +300,30 @@ builtin_initialize registerTraceClass `Elab.input
 macro expansion etc.
 -/
 def elabCommandTopLevel (stx : Syntax) : CommandElabM Unit := withRef stx do
-  trace[Elab.input] stx
-  let initMsgs ← modifyGet fun st => (st.messages, { st with messages := {} })
-  let initInfoTrees ← getResetInfoTrees
-  -- We should *not* factor out `elabCommand`'s `withLogging` to here since it would make its error
-  -- recovery more coarse. In particular, If `c` in `set_option ... in $c` fails, the remaining
-  -- `end` command of the `in` macro would be skipped and the option would be leaked to the outside!
-  elabCommand stx
-  withLogging do
-    runLinters stx
+  with_trace[Elab.input] stx do
+    let initMsgs ← modifyGet fun st => (st.messages, { st with messages := {} })
+    let initInfoTrees ← getResetInfoTrees
+    -- We should *not* factor out `elabCommand`'s `withLogging` to here since it would make its error
+    -- recovery more coarse. In particular, If `c` in `set_option ... in $c` fails, the remaining
+    -- `end` command of the `in` macro would be skipped and the option would be leaked to the outside!
+    elabCommand stx
+    withLogging do
+      runLinters stx
 
-  -- note the order: first process current messages & info trees, then add back old messages & trees,
-  -- then convert new traces to messages
-  let mut msgs := (← get).messages
-  -- `stx.hasMissing` should imply `initMsgs.hasErrors`, but the latter should be cheaper to check in general
-  if !showPartialSyntaxErrors.get (← getOptions) && initMsgs.hasErrors && stx.hasMissing then
-    -- discard elaboration errors, except for a few important and unlikely misleading ones, on parse error
-    msgs := ⟨msgs.msgs.filter fun msg =>
-      msg.data.hasTag (fun tag => tag == `Elab.synthPlaceholder || tag == `Tactic.unsolvedGoals || (`_traceMsg).isSuffixOf tag)⟩
-  for tree in (← getInfoTrees) do
-    trace[Elab.info] (← tree.format)
-  modify fun st => { st with
-    messages := initMsgs ++ msgs
-    infoState := { st.infoState with trees := initInfoTrees ++ st.infoState.trees }
-  }
+    -- note the order: first process current messages & info trees, then add back old messages & trees,
+    -- then convert new traces to messages
+    let mut msgs := (← get).messages
+    -- `stx.hasMissing` should imply `initMsgs.hasErrors`, but the latter should be cheaper to check in general
+    if !showPartialSyntaxErrors.get (← getOptions) && initMsgs.hasErrors && stx.hasMissing then
+      -- discard elaboration errors, except for a few important and unlikely misleading ones, on parse error
+      msgs := ⟨msgs.msgs.filter fun msg =>
+        msg.data.hasTag (fun tag => tag == `Elab.synthPlaceholder || tag == `Tactic.unsolvedGoals || (`_traceMsg).isSuffixOf tag)⟩
+    for tree in (← getInfoTrees) do
+      trace[Elab.info] (← tree.format)
+    modify fun st => { st with
+      messages := initMsgs ++ msgs
+      infoState := { st.infoState with trees := initInfoTrees ++ st.infoState.trees }
+    }
   addTraceAsMessages
 
 /-- Adapt a syntax transformation to a regular, command-producing elaborator. -/
diff --git a/src/Lean/Elab/Tactic/Basic.lean b/src/Lean/Elab/Tactic/Basic.lean
index 02966c977b..c122a49a69 100644
--- a/src/Lean/Elab/Tactic/Basic.lean
+++ b/src/Lean/Elab/Tactic/Basic.lean
@@ -147,7 +147,7 @@ partial def evalTactic (stx : Syntax) : TacticM Unit := do
         -- Macro writers create a sequence of tactics `t₁ ... tₙ` using `mkNullNode #[t₁, ..., tₙ]`
         stx.getArgs.forM evalTactic
       else do
-        trace[Elab.step] "{stx}"
+        with_trace[Elab.step] "{stx}" do
         let evalFns := tacticElabAttribute.getEntries (← getEnv) stx.getKind
         let macros  := macroAttribute.getEntries (← getEnv) stx.getKind
         if evalFns.isEmpty && macros.isEmpty then
diff --git a/src/Lean/Elab/Term.lean b/src/Lean/Elab/Term.lean
index 14d3333569..e6b7567ec9 100644
--- a/src/Lean/Elab/Term.lean
+++ b/src/Lean/Elab/Term.lean
@@ -759,7 +759,7 @@ def synthesizeInstMVarCore (instMVar : MVarId) (maxResultSize? : Option Nat := n
       throwError "failed to synthesize instance{indentExpr type}"
 
 def mkCoe (expectedType : Expr) (e : Expr) (f? : Option Expr := none) (errorMsgHeader? : Option String := none) : TermElabM Expr := do
-  trace[Elab.coe] "adding coercion for {e} : {← inferType e} =?= {expectedType}"
+  with_trace[Elab.coe] "adding coercion for {e} : {← inferType e} =?= {expectedType}" do
   try
     withoutMacroStackAtErr do
       match ← coerce? e expectedType with
diff --git a/tests/lean/traceTacticSteps.lean.expected.out b/tests/lean/traceTacticSteps.lean.expected.out
index cd52c46bd9..e7280b043d 100644
--- a/tests/lean/traceTacticSteps.lean.expected.out
+++ b/tests/lean/traceTacticSteps.lean.expected.out
@@ -9,23 +9,23 @@
 [Elab.step] 
       skip
       trivial
-[Elab.step] 
-      skip
-      trivial
-[Elab.step] skip
-[Elab.step] trivial
-[Elab.step] (apply And.intro✝) <;> trivial
-[Elab.step] focus
-      apply And.intro✝
-      with_annotate_state"<;>" skip
-      all_goals trivial
-[Elab.step] 
-      apply And.intro✝
-      with_annotate_state"<;>" skip
-      all_goals trivial
-[Elab.step] 
-      apply And.intro✝
-      with_annotate_state"<;>" skip
-      all_goals trivial
-[Elab.step] apply And.intro✝
-[Elab.step] apply True.intro✝
+  [Elab.step] 
+        skip
+        trivial
+    [Elab.step] skip
+    [Elab.step] trivial
+      [Elab.step] (apply And.intro✝) <;> trivial
+        [Elab.step] focus
+              apply And.intro✝
+              with_annotate_state"<;>" skip
+              all_goals trivial
+          [Elab.step] 
+                apply And.intro✝
+                with_annotate_state"<;>" skip
+                all_goals trivial
+            [Elab.step] 
+                  apply And.intro✝
+                  with_annotate_state"<;>" skip
+                  all_goals trivial
+              [Elab.step] apply And.intro✝
+      [Elab.step] apply True.intro✝