diff --git a/stage0/src/Init/Lean/Elab/Command.lean b/stage0/src/Init/Lean/Elab/Command.lean
index 7813ba19ad..96ec4ed2ab 100644
--- a/stage0/src/Init/Lean/Elab/Command.lean
+++ b/stage0/src/Init/Lean/Elab/Command.lean
@@ -192,9 +192,7 @@ adaptReader (fun (ctx : Context) => { macroStack := { before := beforeStx, after
 
 instance : MonadMacroAdapter CommandElabM :=
 { getEnv                 := getEnv,
-  getNameGenerator       := do s ← get; pure s.ngen,
   getCurrMacroScope      := getCurrMacroScope,
-  setNameGenerator       := fun ngen => modify $ fun s => { ngen := ngen, .. s },
   throwError             := @throwError,
   throwUnsupportedSyntax := @throwUnsupportedSyntax}
 
diff --git a/stage0/src/Init/Lean/Elab/Tactic/Basic.lean b/stage0/src/Init/Lean/Elab/Tactic/Basic.lean
index c63967eb98..789609c747 100644
--- a/stage0/src/Init/Lean/Elab/Tactic/Basic.lean
+++ b/stage0/src/Init/Lean/Elab/Tactic/Basic.lean
@@ -176,9 +176,7 @@ adaptReader (fun (ctx : Context) => { macroStack := { before := beforeStx, after
 
 instance : MonadMacroAdapter TacticM :=
 { getEnv                 := getEnv,
-  getNameGenerator       := do s ← get; pure s.ngen,
   getCurrMacroScope      := getCurrMacroScope,
-  setNameGenerator       := fun ngen => modify $ fun s => { ngen := ngen, .. s },
   throwError             := @throwError,
   throwUnsupportedSyntax := @throwUnsupportedSyntax }
 
diff --git a/stage0/src/Init/Lean/Elab/Term.lean b/stage0/src/Init/Lean/Elab/Term.lean
index 8e86af5040..8dacd0b3a8 100644
--- a/stage0/src/Init/Lean/Elab/Term.lean
+++ b/stage0/src/Init/Lean/Elab/Term.lean
@@ -465,9 +465,7 @@ private def elabTermUsing (s : State) (stx : Syntax) (expectedType? : Option Exp
 
 instance : MonadMacroAdapter TermElabM :=
 { getEnv                 := getEnv,
-  getNameGenerator       := do s ← get; pure s.ngen,
   getCurrMacroScope      := getCurrMacroScope,
-  setNameGenerator       := fun ngen => modify $ fun s => { ngen := ngen, .. s },
   throwError             := @throwError,
   throwUnsupportedSyntax := @throwUnsupportedSyntax}
 
diff --git a/stage0/src/Init/Lean/Elab/Util.lean b/stage0/src/Init/Lean/Elab/Util.lean
index 47559b0f76..66e669f80b 100644
--- a/stage0/src/Init/Lean/Elab/Util.lean
+++ b/stage0/src/Init/Lean/Elab/Util.lean
@@ -187,19 +187,16 @@ fun stx =>
 class MonadMacroAdapter (m : Type → Type) :=
 (getEnv {}                            : m Environment)
 (getCurrMacroScope {}                 : m MacroScope)
-(getNameGenerator {}                  : m NameGenerator)
-(setNameGenerator {}                  : NameGenerator → m Unit)
 (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
 scp  ← MonadMacroAdapter.getCurrMacroScope;
 env  ← MonadMacroAdapter.getEnv;
-ngen ← MonadMacroAdapter.getNameGenerator;
-match x stx { currMacroScope := scp, mainModule := env.mainModule } { ngen := ngen } with
-| EStateM.Result.error Macro.Exception.unsupportedSyntax newS => MonadMacroAdapter.throwUnsupportedSyntax
-| EStateM.Result.ok stx newS                                  => do MonadMacroAdapter.setNameGenerator newS.ngen; pure stx
-| EStateM.Result.error (Macro.Exception.error msg) newS       => do MonadMacroAdapter.setNameGenerator newS.ngen; MonadMacroAdapter.throwError stx msg
+match x stx { currMacroScope := scp, mainModule := env.mainModule } with
+| Except.error Macro.Exception.unsupportedSyntax => MonadMacroAdapter.throwUnsupportedSyntax
+| Except.error (Macro.Exception.error msg)       => MonadMacroAdapter.throwError stx msg
+| Except.ok stx                                  => pure stx
 
 @[init] private def regTraceClasses : IO Unit := do
 registerTraceClass `Elab;
diff --git a/stage0/src/Init/LeanInit.lean b/stage0/src/Init/LeanInit.lean
index 67ede337b7..1c02b45ab0 100644
--- a/stage0/src/Init/LeanInit.lean
+++ b/stage0/src/Init/LeanInit.lean
@@ -9,7 +9,7 @@ import Init.Data.Array.Basic
 import Init.Data.UInt
 import Init.Data.Hashable
 import Init.Control.Reader
-import Init.Control.EState
+import Init.Control.Except
 
 namespace Lean
 /-
@@ -321,23 +321,17 @@ structure Context :=
 (mainModule     : Name)
 (currMacroScope : MacroScope)
 
-structure State :=
-(ngen : NameGenerator)
-
 inductive Exception
 | error             : String → Exception
 | unsupportedSyntax : Exception
 
 end Macro
 
-abbrev MacroM := ReaderT Macro.Context (EStateM Macro.Exception Macro.State)
+abbrev MacroM := ReaderT Macro.Context (ExceptT Macro.Exception Id)
 
-def Macro.mkFreshName (namePrefix : Name) : MacroM Name := do
+def Macro.addMacroScope (n : Name) : MacroM Name := do
 ctx ← read;
-s   ← get;
-let id := namePrefix ++ ctx.mainModule ++ s.ngen.curr;
-modify $ fun s => { ngen := s.ngen.next, .. s };
-pure id
+pure $ Lean.addMacroScope ctx.mainModule n ctx.currMacroScope
 
 instance MacroM.monadQuotation : MonadQuotation MacroM :=
 { getCurrMacroScope   := fun ctx => pure ctx.currMacroScope,
diff --git a/stage0/stdlib/Init/Lean/Elab/Command.c b/stage0/stdlib/Init/Lean/Elab/Command.c
index 46fafda2f3..bbcd6bdeb5 100644
--- a/stage0/stdlib/Init/Lean/Elab/Command.c
+++ b/stage0/stdlib/Init/Lean/Elab/Command.c
@@ -136,7 +136,6 @@ extern lean_object* l_String_splitAux___main___closed__1;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_Command_mkBuiltinCommandElabTable___spec__1___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabExport(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_13__addNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__2;
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_isLevelDefEqAux___main___closed__5;
@@ -273,14 +272,13 @@ size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermAux___main(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Char_HasRepr___closed__1;
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___closed__4;
-lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_1__ioErrorToMessage___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Elab_Command_14__checkAnonymousScope(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
 lean_object* l_Lean_Syntax_prettyPrint(lean_object*);
 lean_object* l_Lean_Elab_Command_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSynth___closed__3;
 lean_object* l_Lean_KVMap_insertCore___main(lean_object*, lean_object*, lean_object*);
@@ -359,7 +357,6 @@ extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__3;
 lean_object* l_Lean_Elab_Command_withMacroExpansion(lean_object*);
 lean_object* l_Lean_Elab_Command_withDeclId___closed__3;
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6;
 lean_object* l_ReaderT_bind___at_Lean_Elab_Command_CommandElabM_monadLog___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_sortDeclLevelParams(lean_object*, lean_object*);
@@ -408,7 +405,6 @@ lean_object* l_Lean_Elab_Command_elabEnd___closed__6;
 lean_object* l_Lean_Elab_Command_elabExport___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__6;
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_getMaxRecDepth(lean_object*);
 lean_object* l_Lean_Elab_Command_getMainModule(lean_object*, lean_object*);
@@ -489,7 +485,6 @@ lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_ob
 lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__7;
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_12__addScopes(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7;
 uint8_t l_Lean_DataValue_sameCtor(lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__5(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_14__checkAnonymousScope___boxed(lean_object*);
@@ -528,7 +523,6 @@ lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___bo
 lean_object* l_Lean_Syntax_asNode(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_elabExport___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_compile_decl(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Elab_Command_15__checkEndHeader(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_inhabited___closed__1;
@@ -4643,223 +4637,15 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Command_withMacroExpansion___rarg),
 return x_2;
 }
 }
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_5, 0, x_4);
-lean_ctor_set(x_5, 1, x_3);
-return x_5;
-}
-}
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-lean_inc(x_2);
-x_4 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_4) == 0)
-{
-lean_object* x_5; lean_object* x_6; uint8_t x_7; 
-x_5 = lean_ctor_get(x_4, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_4, 1);
-lean_inc(x_6);
-lean_dec(x_4);
-x_7 = !lean_is_exclusive(x_5);
-if (x_7 == 0)
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = lean_ctor_get(x_5, 1);
-lean_dec(x_8);
-lean_ctor_set(x_5, 1, x_1);
-x_9 = l___private_Init_Lean_Elab_Command_3__setState(x_5, x_2, x_6);
-if (lean_obj_tag(x_9) == 0)
-{
-uint8_t x_10; 
-x_10 = !lean_is_exclusive(x_9);
-if (x_10 == 0)
-{
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_ctor_get(x_9, 0);
-lean_dec(x_11);
-x_12 = lean_box(0);
-lean_ctor_set(x_9, 0, x_12);
-return x_9;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_9, 1);
-lean_inc(x_13);
-lean_dec(x_9);
-x_14 = lean_box(0);
-x_15 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_15, 0, x_14);
-lean_ctor_set(x_15, 1, x_13);
-return x_15;
-}
-}
-else
-{
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_9);
-if (x_16 == 0)
-{
-return x_9;
-}
-else
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = lean_ctor_get(x_9, 0);
-x_18 = lean_ctor_get(x_9, 1);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_dec(x_9);
-x_19 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_19, 0, x_17);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_20 = lean_ctor_get(x_5, 0);
-x_21 = lean_ctor_get(x_5, 2);
-x_22 = lean_ctor_get(x_5, 3);
-x_23 = lean_ctor_get(x_5, 4);
-x_24 = lean_ctor_get(x_5, 5);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_5);
-x_25 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_25, 0, x_20);
-lean_ctor_set(x_25, 1, x_1);
-lean_ctor_set(x_25, 2, x_21);
-lean_ctor_set(x_25, 3, x_22);
-lean_ctor_set(x_25, 4, x_23);
-lean_ctor_set(x_25, 5, x_24);
-x_26 = l___private_Init_Lean_Elab_Command_3__setState(x_25, x_2, x_6);
-if (lean_obj_tag(x_26) == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_ctor_get(x_26, 1);
-lean_inc(x_27);
-if (lean_is_exclusive(x_26)) {
- lean_ctor_release(x_26, 0);
- lean_ctor_release(x_26, 1);
- x_28 = x_26;
-} else {
- lean_dec_ref(x_26);
- x_28 = lean_box(0);
-}
-x_29 = lean_box(0);
-if (lean_is_scalar(x_28)) {
- x_30 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_30 = x_28;
-}
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_27);
-return x_30;
-}
-else
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_31 = lean_ctor_get(x_26, 0);
-lean_inc(x_31);
-x_32 = lean_ctor_get(x_26, 1);
-lean_inc(x_32);
-if (lean_is_exclusive(x_26)) {
- lean_ctor_release(x_26, 0);
- lean_ctor_release(x_26, 1);
- x_33 = x_26;
-} else {
- lean_dec_ref(x_26);
- x_33 = lean_box(0);
-}
-if (lean_is_scalar(x_33)) {
- x_34 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_34 = x_33;
-}
-lean_ctor_set(x_34, 0, x_31);
-lean_ctor_set(x_34, 1, x_32);
-return x_34;
-}
-}
-}
-else
-{
-uint8_t x_35; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_35 = !lean_is_exclusive(x_4);
-if (x_35 == 0)
-{
-return x_4;
-}
-else
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_4, 0);
-x_37 = lean_ctor_get(x_4, 1);
-lean_inc(x_37);
-lean_inc(x_36);
-lean_dec(x_4);
-x_38 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-return x_38;
-}
-}
-}
-}
 lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1___boxed), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__1;
-x_2 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__1;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Command_CommandElabM_monadLog___spec__2___rarg), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3() {
-_start:
-{
-lean_object* x_1; 
 x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Command_getEnv), 2, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__2), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5() {
+lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -4867,7 +4653,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Command_throwError), 1, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6() {
+lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -4875,44 +4661,30 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Command_throwUnsupportedSyntax___bo
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7() {
+lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_1 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__1;
 x_2 = l_Lean_Elab_Command_CommandElabM_MonadQuotation___closed__1;
 x_3 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__2;
-x_4 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4;
-x_5 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5;
-x_6 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6;
-x_7 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_7, 0, x_1);
-lean_ctor_set(x_7, 1, x_2);
-lean_ctor_set(x_7, 2, x_3);
-lean_ctor_set(x_7, 3, x_4);
-lean_ctor_set(x_7, 4, x_5);
-lean_ctor_set(x_7, 5, x_6);
-return x_7;
+x_4 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3;
+x_5 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_5, 0, x_1);
+lean_ctor_set(x_5, 1, x_2);
+lean_ctor_set(x_5, 2, x_3);
+lean_ctor_set(x_5, 3, x_4);
+return x_5;
 }
 }
 lean_object* _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7;
+x_1 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4;
 return x_1;
 }
 }
-lean_object* l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___lambda__1(x_1, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_4;
-}
-}
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Command_elabCommand___main___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -5310,56 +5082,56 @@ lean_ctor_set(x_34, 5, x_12);
 lean_ctor_set(x_34, 6, x_30);
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_160; lean_object* x_161; lean_object* x_162; uint8_t x_163; 
-x_160 = lean_ctor_get(x_1, 0);
-lean_inc(x_160);
-x_161 = lean_ctor_get(x_1, 1);
-lean_inc(x_161);
-x_162 = l_Lean_nullKind;
-x_163 = lean_name_eq(x_160, x_162);
-lean_dec(x_160);
-if (x_163 == 0)
+lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; 
+x_105 = lean_ctor_get(x_1, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_1, 1);
+lean_inc(x_106);
+x_107 = l_Lean_nullKind;
+x_108 = lean_name_eq(x_105, x_107);
+lean_dec(x_105);
+if (x_108 == 0)
 {
-lean_object* x_164; 
-lean_dec(x_161);
+lean_object* x_109; 
+lean_dec(x_106);
 lean_inc(x_34);
-x_164 = l_Lean_Elab_Command_getOptions(x_34, x_33);
-if (lean_obj_tag(x_164) == 0)
+x_109 = l_Lean_Elab_Command_getOptions(x_34, x_33);
+if (lean_obj_tag(x_109) == 0)
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; uint8_t x_168; 
-x_165 = lean_ctor_get(x_164, 0);
-lean_inc(x_165);
-x_166 = lean_ctor_get(x_164, 1);
-lean_inc(x_166);
-lean_dec(x_164);
-x_167 = l_Lean_Elab_Command_elabCommand___main___closed__1;
-x_168 = l_Lean_checkTraceOption(x_165, x_167);
-lean_dec(x_165);
-if (x_168 == 0)
+lean_object* x_110; lean_object* x_111; lean_object* x_112; uint8_t x_113; 
+x_110 = lean_ctor_get(x_109, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_109, 1);
+lean_inc(x_111);
+lean_dec(x_109);
+x_112 = l_Lean_Elab_Command_elabCommand___main___closed__1;
+x_113 = l_Lean_checkTraceOption(x_110, x_112);
+lean_dec(x_110);
+if (x_113 == 0)
 {
-x_35 = x_166;
-goto block_159;
+x_35 = x_111;
+goto block_104;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; 
+lean_object* x_114; lean_object* x_115; 
 lean_inc(x_1);
-x_169 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_169, 0, x_1);
+x_114 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_114, 0, x_1);
 lean_inc(x_34);
-x_170 = l_Lean_Elab_Command_logTrace(x_167, x_1, x_169, x_34, x_166);
-if (lean_obj_tag(x_170) == 0)
+x_115 = l_Lean_Elab_Command_logTrace(x_112, x_1, x_114, x_34, x_111);
+if (lean_obj_tag(x_115) == 0)
 {
-lean_object* x_171; 
-x_171 = lean_ctor_get(x_170, 1);
-lean_inc(x_171);
-lean_dec(x_170);
-x_35 = x_171;
-goto block_159;
+lean_object* x_116; 
+x_116 = lean_ctor_get(x_115, 1);
+lean_inc(x_116);
+lean_dec(x_115);
+x_35 = x_116;
+goto block_104;
 }
 else
 {
-uint8_t x_172; 
+uint8_t x_117; 
 lean_dec(x_34);
 lean_dec(x_30);
 lean_dec(x_25);
@@ -5369,30 +5141,30 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_172 = !lean_is_exclusive(x_170);
-if (x_172 == 0)
+x_117 = !lean_is_exclusive(x_115);
+if (x_117 == 0)
 {
-return x_170;
+return x_115;
 }
 else
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; 
-x_173 = lean_ctor_get(x_170, 0);
-x_174 = lean_ctor_get(x_170, 1);
-lean_inc(x_174);
-lean_inc(x_173);
-lean_dec(x_170);
-x_175 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_175, 0, x_173);
-lean_ctor_set(x_175, 1, x_174);
-return x_175;
+lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_118 = lean_ctor_get(x_115, 0);
+x_119 = lean_ctor_get(x_115, 1);
+lean_inc(x_119);
+lean_inc(x_118);
+lean_dec(x_115);
+x_120 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_120, 0, x_118);
+lean_ctor_set(x_120, 1, x_119);
+return x_120;
 }
 }
 }
 }
 else
 {
-uint8_t x_176; 
+uint8_t x_121; 
 lean_dec(x_34);
 lean_dec(x_30);
 lean_dec(x_25);
@@ -5402,29 +5174,29 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_176 = !lean_is_exclusive(x_164);
-if (x_176 == 0)
+x_121 = !lean_is_exclusive(x_109);
+if (x_121 == 0)
 {
-return x_164;
+return x_109;
 }
 else
 {
-lean_object* x_177; lean_object* x_178; lean_object* x_179; 
-x_177 = lean_ctor_get(x_164, 0);
-x_178 = lean_ctor_get(x_164, 1);
-lean_inc(x_178);
-lean_inc(x_177);
-lean_dec(x_164);
-x_179 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_179, 0, x_177);
-lean_ctor_set(x_179, 1, x_178);
-return x_179;
+lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_122 = lean_ctor_get(x_109, 0);
+x_123 = lean_ctor_get(x_109, 1);
+lean_inc(x_123);
+lean_inc(x_122);
+lean_dec(x_109);
+x_124 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_124, 0, x_122);
+lean_ctor_set(x_124, 1, x_123);
+return x_124;
 }
 }
 }
 else
 {
-lean_object* x_180; lean_object* x_181; 
+lean_object* x_125; lean_object* x_126; 
 lean_dec(x_30);
 lean_dec(x_25);
 lean_dec(x_12);
@@ -5433,15 +5205,15 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_180 = lean_unsigned_to_nat(0u);
-x_181 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_161, x_180, x_34, x_33);
-lean_dec(x_161);
-return x_181;
+x_125 = lean_unsigned_to_nat(0u);
+x_126 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_106, x_125, x_34, x_33);
+lean_dec(x_106);
+return x_126;
 }
 }
 else
 {
-lean_object* x_182; lean_object* x_183; 
+lean_object* x_127; lean_object* x_128; 
 lean_dec(x_30);
 lean_dec(x_25);
 lean_dec(x_12);
@@ -5449,12 +5221,12 @@ lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_182 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
-x_183 = l_Lean_Elab_Command_throwError___rarg(x_1, x_182, x_34, x_33);
+x_127 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
+x_128 = l_Lean_Elab_Command_throwError___rarg(x_1, x_127, x_34, x_33);
 lean_dec(x_1);
-return x_183;
+return x_128;
 }
-block_159:
+block_104:
 {
 lean_object* x_36; 
 lean_inc(x_34);
@@ -5512,337 +5284,79 @@ lean_inc(x_34);
 x_77 = l_Lean_Elab_Command_getEnv(x_34, x_76);
 if (lean_obj_tag(x_77) == 0)
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
 x_78 = lean_ctor_get(x_77, 0);
 lean_inc(x_78);
 x_79 = lean_ctor_get(x_77, 1);
 lean_inc(x_79);
 lean_dec(x_77);
-lean_inc(x_34);
-x_80 = l___private_Init_Lean_Elab_Command_2__getState(x_34, x_79);
-if (lean_obj_tag(x_80) == 0)
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_81 = lean_ctor_get(x_80, 0);
-lean_inc(x_81);
-x_82 = lean_ctor_get(x_80, 1);
-lean_inc(x_82);
-lean_dec(x_80);
-x_83 = lean_ctor_get(x_81, 1);
-lean_inc(x_83);
-lean_dec(x_81);
-x_84 = lean_environment_main_module(x_78);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_75);
+x_80 = lean_environment_main_module(x_78);
+x_81 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_81, 0, x_80);
+lean_ctor_set(x_81, 1, x_75);
 lean_inc(x_1);
-x_86 = l_Lean_Elab_getMacros(x_47, x_1, x_85, x_83);
+x_82 = l_Lean_Elab_getMacros(x_47, x_1, x_81);
 lean_dec(x_47);
-if (lean_obj_tag(x_86) == 0)
+if (lean_obj_tag(x_82) == 0)
 {
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_87 = lean_ctor_get(x_86, 0);
-lean_inc(x_87);
-x_88 = lean_ctor_get(x_86, 1);
+lean_object* x_83; 
+lean_dec(x_30);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+lean_dec(x_82);
+if (lean_obj_tag(x_83) == 0)
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_84 = lean_ctor_get(x_83, 0);
+lean_inc(x_84);
+lean_dec(x_83);
+x_85 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_85, 0, x_84);
+x_86 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_86, 0, x_85);
+lean_inc(x_34);
+x_87 = l_Lean_Elab_Command_throwError___rarg(x_1, x_86, x_34, x_79);
+x_88 = lean_ctor_get(x_87, 0);
 lean_inc(x_88);
-lean_dec(x_86);
-lean_inc(x_34);
-x_89 = l___private_Init_Lean_Elab_Command_2__getState(x_34, x_82);
-if (lean_obj_tag(x_89) == 0)
+x_89 = lean_ctor_get(x_87, 1);
+lean_inc(x_89);
+lean_dec(x_87);
+x_57 = x_88;
+x_58 = x_89;
+goto block_73;
+}
+else
 {
-lean_object* x_90; lean_object* x_91; uint8_t x_92; 
-x_90 = lean_ctor_get(x_89, 0);
-lean_inc(x_90);
-x_91 = lean_ctor_get(x_89, 1);
+lean_object* x_90; 
+x_90 = lean_box(1);
+x_57 = x_90;
+x_58 = x_79;
+goto block_73;
+}
+}
+else
+{
+lean_object* x_91; 
+lean_dec(x_49);
+lean_dec(x_44);
+lean_dec(x_34);
+x_91 = lean_ctor_get(x_82, 0);
 lean_inc(x_91);
-lean_dec(x_89);
-x_92 = !lean_is_exclusive(x_90);
-if (x_92 == 0)
-{
-lean_object* x_93; lean_object* x_94; 
-x_93 = lean_ctor_get(x_90, 1);
-lean_dec(x_93);
-lean_ctor_set(x_90, 1, x_88);
-lean_inc(x_34);
-x_94 = l___private_Init_Lean_Elab_Command_3__setState(x_90, x_34, x_91);
-if (lean_obj_tag(x_94) == 0)
-{
-lean_object* x_95; 
-lean_dec(x_49);
-lean_dec(x_44);
-lean_dec(x_34);
-x_95 = lean_ctor_get(x_94, 1);
-lean_inc(x_95);
-lean_dec(x_94);
-x_50 = x_87;
-x_51 = x_95;
+lean_dec(x_82);
+x_50 = x_91;
+x_51 = x_79;
 goto block_56;
 }
-else
-{
-lean_object* x_96; lean_object* x_97; 
-lean_dec(x_87);
-lean_dec(x_30);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_96 = lean_ctor_get(x_94, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_94, 1);
-lean_inc(x_97);
-lean_dec(x_94);
-x_57 = x_96;
-x_58 = x_97;
-goto block_73;
-}
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_98 = lean_ctor_get(x_90, 0);
-x_99 = lean_ctor_get(x_90, 2);
-x_100 = lean_ctor_get(x_90, 3);
-x_101 = lean_ctor_get(x_90, 4);
-x_102 = lean_ctor_get(x_90, 5);
-lean_inc(x_102);
-lean_inc(x_101);
-lean_inc(x_100);
-lean_inc(x_99);
-lean_inc(x_98);
-lean_dec(x_90);
-x_103 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_103, 0, x_98);
-lean_ctor_set(x_103, 1, x_88);
-lean_ctor_set(x_103, 2, x_99);
-lean_ctor_set(x_103, 3, x_100);
-lean_ctor_set(x_103, 4, x_101);
-lean_ctor_set(x_103, 5, x_102);
-lean_inc(x_34);
-x_104 = l___private_Init_Lean_Elab_Command_3__setState(x_103, x_34, x_91);
-if (lean_obj_tag(x_104) == 0)
-{
-lean_object* x_105; 
-lean_dec(x_49);
-lean_dec(x_44);
-lean_dec(x_34);
-x_105 = lean_ctor_get(x_104, 1);
-lean_inc(x_105);
-lean_dec(x_104);
-x_50 = x_87;
-x_51 = x_105;
-goto block_56;
-}
-else
-{
-lean_object* x_106; lean_object* x_107; 
-lean_dec(x_87);
-lean_dec(x_30);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_106 = lean_ctor_get(x_104, 0);
-lean_inc(x_106);
-x_107 = lean_ctor_get(x_104, 1);
-lean_inc(x_107);
-lean_dec(x_104);
-x_57 = x_106;
-x_58 = x_107;
-goto block_73;
-}
-}
-}
-else
-{
-lean_object* x_108; lean_object* x_109; 
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_30);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_108 = lean_ctor_get(x_89, 0);
-lean_inc(x_108);
-x_109 = lean_ctor_get(x_89, 1);
-lean_inc(x_109);
-lean_dec(x_89);
-x_57 = x_108;
-x_58 = x_109;
-goto block_73;
-}
-}
-else
-{
-lean_object* x_110; 
-lean_dec(x_30);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_110 = lean_ctor_get(x_86, 0);
-lean_inc(x_110);
-if (lean_obj_tag(x_110) == 0)
-{
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_86, 1);
-lean_inc(x_111);
-lean_dec(x_86);
-x_112 = lean_ctor_get(x_110, 0);
-lean_inc(x_112);
-lean_dec(x_110);
-lean_inc(x_34);
-x_113 = l___private_Init_Lean_Elab_Command_2__getState(x_34, x_82);
-if (lean_obj_tag(x_113) == 0)
-{
-lean_object* x_114; lean_object* x_115; uint8_t x_116; 
-x_114 = lean_ctor_get(x_113, 0);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_113, 1);
-lean_inc(x_115);
-lean_dec(x_113);
-x_116 = !lean_is_exclusive(x_114);
-if (x_116 == 0)
-{
-lean_object* x_117; lean_object* x_118; 
-x_117 = lean_ctor_get(x_114, 1);
-lean_dec(x_117);
-lean_ctor_set(x_114, 1, x_111);
-lean_inc(x_34);
-x_118 = l___private_Init_Lean_Elab_Command_3__setState(x_114, x_34, x_115);
-if (lean_obj_tag(x_118) == 0)
-{
-lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
-x_119 = lean_ctor_get(x_118, 1);
-lean_inc(x_119);
-lean_dec(x_118);
-x_120 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_120, 0, x_112);
-x_121 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_121, 0, x_120);
-lean_inc(x_34);
-x_122 = l_Lean_Elab_Command_throwError___rarg(x_1, x_121, x_34, x_119);
-x_123 = lean_ctor_get(x_122, 0);
-lean_inc(x_123);
-x_124 = lean_ctor_get(x_122, 1);
-lean_inc(x_124);
-lean_dec(x_122);
-x_57 = x_123;
-x_58 = x_124;
-goto block_73;
-}
-else
-{
-lean_object* x_125; lean_object* x_126; 
-lean_dec(x_112);
-x_125 = lean_ctor_get(x_118, 0);
-lean_inc(x_125);
-x_126 = lean_ctor_get(x_118, 1);
-lean_inc(x_126);
-lean_dec(x_118);
-x_57 = x_125;
-x_58 = x_126;
-goto block_73;
-}
-}
-else
-{
-lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_127 = lean_ctor_get(x_114, 0);
-x_128 = lean_ctor_get(x_114, 2);
-x_129 = lean_ctor_get(x_114, 3);
-x_130 = lean_ctor_get(x_114, 4);
-x_131 = lean_ctor_get(x_114, 5);
-lean_inc(x_131);
-lean_inc(x_130);
-lean_inc(x_129);
-lean_inc(x_128);
-lean_inc(x_127);
-lean_dec(x_114);
-x_132 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_132, 0, x_127);
-lean_ctor_set(x_132, 1, x_111);
-lean_ctor_set(x_132, 2, x_128);
-lean_ctor_set(x_132, 3, x_129);
-lean_ctor_set(x_132, 4, x_130);
-lean_ctor_set(x_132, 5, x_131);
-lean_inc(x_34);
-x_133 = l___private_Init_Lean_Elab_Command_3__setState(x_132, x_34, x_115);
-if (lean_obj_tag(x_133) == 0)
-{
-lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-x_134 = lean_ctor_get(x_133, 1);
-lean_inc(x_134);
-lean_dec(x_133);
-x_135 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_135, 0, x_112);
-x_136 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_136, 0, x_135);
-lean_inc(x_34);
-x_137 = l_Lean_Elab_Command_throwError___rarg(x_1, x_136, x_34, x_134);
-x_138 = lean_ctor_get(x_137, 0);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_137, 1);
-lean_inc(x_139);
-lean_dec(x_137);
-x_57 = x_138;
-x_58 = x_139;
-goto block_73;
-}
-else
-{
-lean_object* x_140; lean_object* x_141; 
-lean_dec(x_112);
-x_140 = lean_ctor_get(x_133, 0);
-lean_inc(x_140);
-x_141 = lean_ctor_get(x_133, 1);
-lean_inc(x_141);
-lean_dec(x_133);
-x_57 = x_140;
-x_58 = x_141;
-goto block_73;
-}
-}
-}
-else
-{
-lean_object* x_142; lean_object* x_143; 
-lean_dec(x_112);
-lean_dec(x_111);
-x_142 = lean_ctor_get(x_113, 0);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_113, 1);
-lean_inc(x_143);
-lean_dec(x_113);
-x_57 = x_142;
-x_58 = x_143;
-goto block_73;
-}
-}
-else
-{
-lean_object* x_144; 
-lean_dec(x_86);
-x_144 = lean_box(1);
-x_57 = x_144;
-x_58 = x_82;
-goto block_73;
-}
-}
-}
-else
-{
-lean_object* x_145; lean_object* x_146; 
-lean_dec(x_78);
+lean_object* x_92; lean_object* x_93; 
 lean_dec(x_75);
 lean_dec(x_47);
 lean_dec(x_30);
@@ -5852,35 +5366,13 @@ lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_145 = lean_ctor_get(x_80, 0);
-lean_inc(x_145);
-x_146 = lean_ctor_get(x_80, 1);
-lean_inc(x_146);
-lean_dec(x_80);
-x_57 = x_145;
-x_58 = x_146;
-goto block_73;
-}
-}
-else
-{
-lean_object* x_147; lean_object* x_148; 
-lean_dec(x_75);
-lean_dec(x_47);
-lean_dec(x_30);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_147 = lean_ctor_get(x_77, 0);
-lean_inc(x_147);
-x_148 = lean_ctor_get(x_77, 1);
-lean_inc(x_148);
+x_92 = lean_ctor_get(x_77, 0);
+lean_inc(x_92);
+x_93 = lean_ctor_get(x_77, 1);
+lean_inc(x_93);
 lean_dec(x_77);
-x_57 = x_147;
-x_58 = x_148;
+x_57 = x_92;
+x_58 = x_93;
 goto block_73;
 }
 block_56:
@@ -5967,7 +5459,7 @@ return x_72;
 }
 else
 {
-uint8_t x_149; 
+uint8_t x_94; 
 lean_dec(x_44);
 lean_dec(x_34);
 lean_dec(x_30);
@@ -5978,29 +5470,29 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_149 = !lean_is_exclusive(x_46);
-if (x_149 == 0)
+x_94 = !lean_is_exclusive(x_46);
+if (x_94 == 0)
 {
 return x_46;
 }
 else
 {
-lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-x_150 = lean_ctor_get(x_46, 0);
-x_151 = lean_ctor_get(x_46, 1);
-lean_inc(x_151);
-lean_inc(x_150);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_46, 0);
+x_96 = lean_ctor_get(x_46, 1);
+lean_inc(x_96);
+lean_inc(x_95);
 lean_dec(x_46);
-x_152 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_152, 0, x_150);
-lean_ctor_set(x_152, 1, x_151);
-return x_152;
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
 }
 }
 }
 else
 {
-lean_object* x_153; lean_object* x_154; 
+lean_object* x_98; lean_object* x_99; 
 lean_dec(x_44);
 lean_dec(x_30);
 lean_dec(x_25);
@@ -6009,16 +5501,16 @@ lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_153 = lean_ctor_get(x_45, 0);
-lean_inc(x_153);
+x_98 = lean_ctor_get(x_45, 0);
+lean_inc(x_98);
 lean_dec(x_45);
-x_154 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_37, x_1, x_153, x_34, x_38);
-return x_154;
+x_99 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_37, x_1, x_98, x_34, x_38);
+return x_99;
 }
 }
 else
 {
-uint8_t x_155; 
+uint8_t x_100; 
 lean_dec(x_34);
 lean_dec(x_30);
 lean_dec(x_25);
@@ -6028,30 +5520,30 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_155 = !lean_is_exclusive(x_36);
-if (x_155 == 0)
+x_100 = !lean_is_exclusive(x_36);
+if (x_100 == 0)
 {
 return x_36;
 }
 else
 {
-lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_156 = lean_ctor_get(x_36, 0);
-x_157 = lean_ctor_get(x_36, 1);
-lean_inc(x_157);
-lean_inc(x_156);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_36, 0);
+x_102 = lean_ctor_get(x_36, 1);
+lean_inc(x_102);
+lean_inc(x_101);
 lean_dec(x_36);
-x_158 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_158, 0, x_156);
-lean_ctor_set(x_158, 1, x_157);
-return x_158;
+x_103 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_103, 0, x_101);
+lean_ctor_set(x_103, 1, x_102);
+return x_103;
 }
 }
 }
 }
 else
 {
-uint8_t x_184; 
+uint8_t x_129; 
 lean_dec(x_30);
 lean_dec(x_25);
 lean_dec(x_12);
@@ -6060,676 +5552,461 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_184 = !lean_is_exclusive(x_32);
-if (x_184 == 0)
+x_129 = !lean_is_exclusive(x_32);
+if (x_129 == 0)
 {
 return x_32;
 }
 else
 {
-lean_object* x_185; lean_object* x_186; lean_object* x_187; 
-x_185 = lean_ctor_get(x_32, 0);
-x_186 = lean_ctor_get(x_32, 1);
-lean_inc(x_186);
-lean_inc(x_185);
+lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+x_130 = lean_ctor_get(x_32, 0);
+x_131 = lean_ctor_get(x_32, 1);
+lean_inc(x_131);
+lean_inc(x_130);
 lean_dec(x_32);
-x_187 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_187, 0, x_185);
-lean_ctor_set(x_187, 1, x_186);
-return x_187;
+x_132 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_132, 0, x_130);
+lean_ctor_set(x_132, 1, x_131);
+return x_132;
 }
 }
 }
 else
 {
-lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; 
-x_188 = lean_ctor_get(x_27, 0);
-x_189 = lean_ctor_get(x_27, 1);
-x_190 = lean_ctor_get(x_27, 2);
-x_191 = lean_ctor_get(x_27, 3);
-x_192 = lean_ctor_get(x_27, 4);
-x_193 = lean_ctor_get(x_27, 5);
-lean_inc(x_193);
-lean_inc(x_192);
-lean_inc(x_191);
-lean_inc(x_190);
-lean_inc(x_189);
-lean_inc(x_188);
+lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_133 = lean_ctor_get(x_27, 0);
+x_134 = lean_ctor_get(x_27, 1);
+x_135 = lean_ctor_get(x_27, 2);
+x_136 = lean_ctor_get(x_27, 3);
+x_137 = lean_ctor_get(x_27, 4);
+x_138 = lean_ctor_get(x_27, 5);
+lean_inc(x_138);
+lean_inc(x_137);
+lean_inc(x_136);
+lean_inc(x_135);
+lean_inc(x_134);
+lean_inc(x_133);
 lean_dec(x_27);
-x_194 = lean_nat_add(x_192, x_24);
-x_195 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_195, 0, x_188);
-lean_ctor_set(x_195, 1, x_189);
-lean_ctor_set(x_195, 2, x_190);
-lean_ctor_set(x_195, 3, x_191);
-lean_ctor_set(x_195, 4, x_194);
-lean_ctor_set(x_195, 5, x_193);
-x_196 = l___private_Init_Lean_Elab_Command_3__setState(x_195, x_2, x_28);
-if (lean_obj_tag(x_196) == 0)
+x_139 = lean_nat_add(x_137, x_24);
+x_140 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_140, 0, x_133);
+lean_ctor_set(x_140, 1, x_134);
+lean_ctor_set(x_140, 2, x_135);
+lean_ctor_set(x_140, 3, x_136);
+lean_ctor_set(x_140, 4, x_139);
+lean_ctor_set(x_140, 5, x_138);
+x_141 = l___private_Init_Lean_Elab_Command_3__setState(x_140, x_2, x_28);
+if (lean_obj_tag(x_141) == 0)
 {
-lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_197 = lean_ctor_get(x_196, 1);
-lean_inc(x_197);
-lean_dec(x_196);
-lean_inc(x_192);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_142 = lean_ctor_get(x_141, 1);
+lean_inc(x_142);
+lean_dec(x_141);
+lean_inc(x_137);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_25);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_198 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_198, 0, x_7);
-lean_ctor_set(x_198, 1, x_8);
-lean_ctor_set(x_198, 2, x_9);
-lean_ctor_set(x_198, 3, x_25);
-lean_ctor_set(x_198, 4, x_11);
-lean_ctor_set(x_198, 5, x_12);
-lean_ctor_set(x_198, 6, x_192);
+x_143 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_143, 0, x_7);
+lean_ctor_set(x_143, 1, x_8);
+lean_ctor_set(x_143, 2, x_9);
+lean_ctor_set(x_143, 3, x_25);
+lean_ctor_set(x_143, 4, x_11);
+lean_ctor_set(x_143, 5, x_12);
+lean_ctor_set(x_143, 6, x_137);
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_309; lean_object* x_310; lean_object* x_311; uint8_t x_312; 
-x_309 = lean_ctor_get(x_1, 0);
-lean_inc(x_309);
-x_310 = lean_ctor_get(x_1, 1);
-lean_inc(x_310);
-x_311 = l_Lean_nullKind;
-x_312 = lean_name_eq(x_309, x_311);
-lean_dec(x_309);
-if (x_312 == 0)
+lean_object* x_214; lean_object* x_215; lean_object* x_216; uint8_t x_217; 
+x_214 = lean_ctor_get(x_1, 0);
+lean_inc(x_214);
+x_215 = lean_ctor_get(x_1, 1);
+lean_inc(x_215);
+x_216 = l_Lean_nullKind;
+x_217 = lean_name_eq(x_214, x_216);
+lean_dec(x_214);
+if (x_217 == 0)
 {
-lean_object* x_313; 
-lean_dec(x_310);
-lean_inc(x_198);
-x_313 = l_Lean_Elab_Command_getOptions(x_198, x_197);
-if (lean_obj_tag(x_313) == 0)
+lean_object* x_218; 
+lean_dec(x_215);
+lean_inc(x_143);
+x_218 = l_Lean_Elab_Command_getOptions(x_143, x_142);
+if (lean_obj_tag(x_218) == 0)
 {
-lean_object* x_314; lean_object* x_315; lean_object* x_316; uint8_t x_317; 
-x_314 = lean_ctor_get(x_313, 0);
-lean_inc(x_314);
-x_315 = lean_ctor_get(x_313, 1);
-lean_inc(x_315);
-lean_dec(x_313);
-x_316 = l_Lean_Elab_Command_elabCommand___main___closed__1;
-x_317 = l_Lean_checkTraceOption(x_314, x_316);
-lean_dec(x_314);
-if (x_317 == 0)
+lean_object* x_219; lean_object* x_220; lean_object* x_221; uint8_t x_222; 
+x_219 = lean_ctor_get(x_218, 0);
+lean_inc(x_219);
+x_220 = lean_ctor_get(x_218, 1);
+lean_inc(x_220);
+lean_dec(x_218);
+x_221 = l_Lean_Elab_Command_elabCommand___main___closed__1;
+x_222 = l_Lean_checkTraceOption(x_219, x_221);
+lean_dec(x_219);
+if (x_222 == 0)
 {
-x_199 = x_315;
-goto block_308;
+x_144 = x_220;
+goto block_213;
 }
 else
 {
-lean_object* x_318; lean_object* x_319; 
+lean_object* x_223; lean_object* x_224; 
 lean_inc(x_1);
-x_318 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_318, 0, x_1);
+x_223 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_223, 0, x_1);
+lean_inc(x_143);
+x_224 = l_Lean_Elab_Command_logTrace(x_221, x_1, x_223, x_143, x_220);
+if (lean_obj_tag(x_224) == 0)
+{
+lean_object* x_225; 
+x_225 = lean_ctor_get(x_224, 1);
+lean_inc(x_225);
+lean_dec(x_224);
+x_144 = x_225;
+goto block_213;
+}
+else
+{
+lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; 
+lean_dec(x_143);
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_226 = lean_ctor_get(x_224, 0);
+lean_inc(x_226);
+x_227 = lean_ctor_get(x_224, 1);
+lean_inc(x_227);
+if (lean_is_exclusive(x_224)) {
+ lean_ctor_release(x_224, 0);
+ lean_ctor_release(x_224, 1);
+ x_228 = x_224;
+} else {
+ lean_dec_ref(x_224);
+ x_228 = lean_box(0);
+}
+if (lean_is_scalar(x_228)) {
+ x_229 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_229 = x_228;
+}
+lean_ctor_set(x_229, 0, x_226);
+lean_ctor_set(x_229, 1, x_227);
+return x_229;
+}
+}
+}
+else
+{
+lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 
+lean_dec(x_143);
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_230 = lean_ctor_get(x_218, 0);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_218, 1);
+lean_inc(x_231);
+if (lean_is_exclusive(x_218)) {
+ lean_ctor_release(x_218, 0);
+ lean_ctor_release(x_218, 1);
+ x_232 = x_218;
+} else {
+ lean_dec_ref(x_218);
+ x_232 = lean_box(0);
+}
+if (lean_is_scalar(x_232)) {
+ x_233 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_233 = x_232;
+}
+lean_ctor_set(x_233, 0, x_230);
+lean_ctor_set(x_233, 1, x_231);
+return x_233;
+}
+}
+else
+{
+lean_object* x_234; lean_object* x_235; 
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_234 = lean_unsigned_to_nat(0u);
+x_235 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_215, x_234, x_143, x_142);
+lean_dec(x_215);
+return x_235;
+}
+}
+else
+{
+lean_object* x_236; lean_object* x_237; 
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_236 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
+x_237 = l_Lean_Elab_Command_throwError___rarg(x_1, x_236, x_143, x_142);
+lean_dec(x_1);
+return x_237;
+}
+block_213:
+{
+lean_object* x_145; 
+lean_inc(x_143);
+x_145 = l___private_Init_Lean_Elab_Command_2__getState(x_143, x_144);
+if (lean_obj_tag(x_145) == 0)
+{
+lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; 
+x_146 = lean_ctor_get(x_145, 0);
+lean_inc(x_146);
+x_147 = lean_ctor_get(x_145, 1);
+lean_inc(x_147);
+lean_dec(x_145);
+x_148 = l_Lean_Elab_Command_commandElabAttribute;
+x_149 = lean_ctor_get(x_148, 1);
+lean_inc(x_149);
+x_150 = lean_ctor_get(x_146, 0);
+lean_inc(x_150);
+x_151 = l_Lean_PersistentEnvExtension_getState___rarg(x_149, x_150);
+lean_dec(x_150);
+lean_dec(x_149);
+x_152 = lean_ctor_get(x_151, 1);
+lean_inc(x_152);
+lean_dec(x_151);
+lean_inc(x_1);
+x_153 = l_Lean_Syntax_getKind(x_1);
+x_154 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__1(x_152, x_153);
+if (lean_obj_tag(x_154) == 0)
+{
+lean_object* x_155; 
+lean_dec(x_146);
+lean_inc(x_143);
+x_155 = l_Lean_Elab_Command_getEnv(x_143, x_147);
+if (lean_obj_tag(x_155) == 0)
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_166; lean_object* x_167; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_156 = lean_ctor_get(x_155, 0);
+lean_inc(x_156);
+x_157 = lean_ctor_get(x_155, 1);
+lean_inc(x_157);
+if (lean_is_exclusive(x_155)) {
+ lean_ctor_release(x_155, 0);
+ lean_ctor_release(x_155, 1);
+ x_158 = x_155;
+} else {
+ lean_dec_ref(x_155);
+ x_158 = lean_box(0);
+}
+x_183 = l_Lean_Elab_Command_getCurrMacroScope(x_143, x_157);
+x_184 = lean_ctor_get(x_183, 0);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_183, 1);
+lean_inc(x_185);
+lean_dec(x_183);
+lean_inc(x_143);
+x_186 = l_Lean_Elab_Command_getEnv(x_143, x_185);
+if (lean_obj_tag(x_186) == 0)
+{
+lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+lean_dec(x_186);
+x_189 = lean_environment_main_module(x_187);
+x_190 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_190, 0, x_189);
+lean_ctor_set(x_190, 1, x_184);
+lean_inc(x_1);
+x_191 = l_Lean_Elab_getMacros(x_156, x_1, x_190);
+lean_dec(x_156);
+if (lean_obj_tag(x_191) == 0)
+{
+lean_object* x_192; 
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_192 = lean_ctor_get(x_191, 0);
+lean_inc(x_192);
+lean_dec(x_191);
+if (lean_obj_tag(x_192) == 0)
+{
+lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+x_193 = lean_ctor_get(x_192, 0);
+lean_inc(x_193);
+lean_dec(x_192);
+x_194 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_194, 0, x_193);
+x_195 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_195, 0, x_194);
+lean_inc(x_143);
+x_196 = l_Lean_Elab_Command_throwError___rarg(x_1, x_195, x_143, x_188);
+x_197 = lean_ctor_get(x_196, 0);
+lean_inc(x_197);
+x_198 = lean_ctor_get(x_196, 1);
 lean_inc(x_198);
-x_319 = l_Lean_Elab_Command_logTrace(x_316, x_1, x_318, x_198, x_315);
-if (lean_obj_tag(x_319) == 0)
-{
-lean_object* x_320; 
-x_320 = lean_ctor_get(x_319, 1);
-lean_inc(x_320);
-lean_dec(x_319);
-x_199 = x_320;
-goto block_308;
+lean_dec(x_196);
+x_166 = x_197;
+x_167 = x_198;
+goto block_182;
 }
 else
 {
-lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; 
-lean_dec(x_198);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_321 = lean_ctor_get(x_319, 0);
-lean_inc(x_321);
-x_322 = lean_ctor_get(x_319, 1);
-lean_inc(x_322);
-if (lean_is_exclusive(x_319)) {
- lean_ctor_release(x_319, 0);
- lean_ctor_release(x_319, 1);
- x_323 = x_319;
-} else {
- lean_dec_ref(x_319);
- x_323 = lean_box(0);
-}
-if (lean_is_scalar(x_323)) {
- x_324 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_324 = x_323;
-}
-lean_ctor_set(x_324, 0, x_321);
-lean_ctor_set(x_324, 1, x_322);
-return x_324;
-}
-}
-}
-else
-{
-lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; 
-lean_dec(x_198);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_325 = lean_ctor_get(x_313, 0);
-lean_inc(x_325);
-x_326 = lean_ctor_get(x_313, 1);
-lean_inc(x_326);
-if (lean_is_exclusive(x_313)) {
- lean_ctor_release(x_313, 0);
- lean_ctor_release(x_313, 1);
- x_327 = x_313;
-} else {
- lean_dec_ref(x_313);
- x_327 = lean_box(0);
-}
-if (lean_is_scalar(x_327)) {
- x_328 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_328 = x_327;
-}
-lean_ctor_set(x_328, 0, x_325);
-lean_ctor_set(x_328, 1, x_326);
-return x_328;
+lean_object* x_199; 
+x_199 = lean_box(1);
+x_166 = x_199;
+x_167 = x_188;
+goto block_182;
 }
 }
 else
 {
-lean_object* x_329; lean_object* x_330; 
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_329 = lean_unsigned_to_nat(0u);
-x_330 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_310, x_329, x_198, x_197);
-lean_dec(x_310);
-return x_330;
-}
-}
-else
-{
-lean_object* x_331; lean_object* x_332; 
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_331 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
-x_332 = l_Lean_Elab_Command_throwError___rarg(x_1, x_331, x_198, x_197);
-lean_dec(x_1);
-return x_332;
-}
-block_308:
-{
 lean_object* x_200; 
-lean_inc(x_198);
-x_200 = l___private_Init_Lean_Elab_Command_2__getState(x_198, x_199);
-if (lean_obj_tag(x_200) == 0)
+lean_dec(x_158);
+lean_dec(x_153);
+lean_dec(x_143);
+x_200 = lean_ctor_get(x_191, 0);
+lean_inc(x_200);
+lean_dec(x_191);
+x_159 = x_200;
+x_160 = x_188;
+goto block_165;
+}
+}
+else
 {
-lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; 
-x_201 = lean_ctor_get(x_200, 0);
+lean_object* x_201; lean_object* x_202; 
+lean_dec(x_184);
+lean_dec(x_156);
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_201 = lean_ctor_get(x_186, 0);
 lean_inc(x_201);
-x_202 = lean_ctor_get(x_200, 1);
+x_202 = lean_ctor_get(x_186, 1);
 lean_inc(x_202);
-lean_dec(x_200);
-x_203 = l_Lean_Elab_Command_commandElabAttribute;
-x_204 = lean_ctor_get(x_203, 1);
-lean_inc(x_204);
-x_205 = lean_ctor_get(x_201, 0);
-lean_inc(x_205);
-x_206 = l_Lean_PersistentEnvExtension_getState___rarg(x_204, x_205);
-lean_dec(x_205);
-lean_dec(x_204);
-x_207 = lean_ctor_get(x_206, 1);
-lean_inc(x_207);
-lean_dec(x_206);
-lean_inc(x_1);
-x_208 = l_Lean_Syntax_getKind(x_1);
-x_209 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__1(x_207, x_208);
-if (lean_obj_tag(x_209) == 0)
+lean_dec(x_186);
+x_166 = x_201;
+x_167 = x_202;
+goto block_182;
+}
+block_165:
 {
-lean_object* x_210; 
-lean_dec(x_201);
-lean_inc(x_198);
-x_210 = l_Lean_Elab_Command_getEnv(x_198, x_202);
-if (lean_obj_tag(x_210) == 0)
-{
-lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_221; lean_object* x_222; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; 
-x_211 = lean_ctor_get(x_210, 0);
-lean_inc(x_211);
-x_212 = lean_ctor_get(x_210, 1);
-lean_inc(x_212);
-if (lean_is_exclusive(x_210)) {
- lean_ctor_release(x_210, 0);
- lean_ctor_release(x_210, 1);
- x_213 = x_210;
-} else {
- lean_dec_ref(x_210);
- x_213 = lean_box(0);
-}
-x_238 = l_Lean_Elab_Command_getCurrMacroScope(x_198, x_212);
-x_239 = lean_ctor_get(x_238, 0);
-lean_inc(x_239);
-x_240 = lean_ctor_get(x_238, 1);
-lean_inc(x_240);
-lean_dec(x_238);
-lean_inc(x_198);
-x_241 = l_Lean_Elab_Command_getEnv(x_198, x_240);
-if (lean_obj_tag(x_241) == 0)
-{
-lean_object* x_242; lean_object* x_243; lean_object* x_244; 
-x_242 = lean_ctor_get(x_241, 0);
-lean_inc(x_242);
-x_243 = lean_ctor_get(x_241, 1);
-lean_inc(x_243);
-lean_dec(x_241);
-lean_inc(x_198);
-x_244 = l___private_Init_Lean_Elab_Command_2__getState(x_198, x_243);
-if (lean_obj_tag(x_244) == 0)
-{
-lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; 
-x_245 = lean_ctor_get(x_244, 0);
-lean_inc(x_245);
-x_246 = lean_ctor_get(x_244, 1);
-lean_inc(x_246);
-lean_dec(x_244);
-x_247 = lean_ctor_get(x_245, 1);
-lean_inc(x_247);
-lean_dec(x_245);
-x_248 = lean_environment_main_module(x_242);
-x_249 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_249, 0, x_248);
-lean_ctor_set(x_249, 1, x_239);
-lean_inc(x_1);
-x_250 = l_Lean_Elab_getMacros(x_211, x_1, x_249, x_247);
-lean_dec(x_211);
-if (lean_obj_tag(x_250) == 0)
-{
-lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-x_251 = lean_ctor_get(x_250, 0);
-lean_inc(x_251);
-x_252 = lean_ctor_get(x_250, 1);
-lean_inc(x_252);
-lean_dec(x_250);
-lean_inc(x_198);
-x_253 = l___private_Init_Lean_Elab_Command_2__getState(x_198, x_246);
-if (lean_obj_tag(x_253) == 0)
-{
-lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; 
-x_254 = lean_ctor_get(x_253, 0);
-lean_inc(x_254);
-x_255 = lean_ctor_get(x_253, 1);
-lean_inc(x_255);
-lean_dec(x_253);
-x_256 = lean_ctor_get(x_254, 0);
-lean_inc(x_256);
-x_257 = lean_ctor_get(x_254, 2);
-lean_inc(x_257);
-x_258 = lean_ctor_get(x_254, 3);
-lean_inc(x_258);
-x_259 = lean_ctor_get(x_254, 4);
-lean_inc(x_259);
-x_260 = lean_ctor_get(x_254, 5);
-lean_inc(x_260);
-if (lean_is_exclusive(x_254)) {
- lean_ctor_release(x_254, 0);
- lean_ctor_release(x_254, 1);
- lean_ctor_release(x_254, 2);
- lean_ctor_release(x_254, 3);
- lean_ctor_release(x_254, 4);
- lean_ctor_release(x_254, 5);
- x_261 = x_254;
-} else {
- lean_dec_ref(x_254);
- x_261 = lean_box(0);
-}
-if (lean_is_scalar(x_261)) {
- x_262 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_262 = x_261;
-}
-lean_ctor_set(x_262, 0, x_256);
-lean_ctor_set(x_262, 1, x_252);
-lean_ctor_set(x_262, 2, x_257);
-lean_ctor_set(x_262, 3, x_258);
-lean_ctor_set(x_262, 4, x_259);
-lean_ctor_set(x_262, 5, x_260);
-lean_inc(x_198);
-x_263 = l___private_Init_Lean_Elab_Command_3__setState(x_262, x_198, x_255);
-if (lean_obj_tag(x_263) == 0)
-{
-lean_object* x_264; 
-lean_dec(x_213);
-lean_dec(x_208);
-lean_dec(x_198);
-x_264 = lean_ctor_get(x_263, 1);
-lean_inc(x_264);
-lean_dec(x_263);
-x_214 = x_251;
-x_215 = x_264;
-goto block_220;
-}
-else
-{
-lean_object* x_265; lean_object* x_266; 
-lean_dec(x_251);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_265 = lean_ctor_get(x_263, 0);
-lean_inc(x_265);
-x_266 = lean_ctor_get(x_263, 1);
-lean_inc(x_266);
-lean_dec(x_263);
-x_221 = x_265;
-x_222 = x_266;
-goto block_237;
-}
-}
-else
-{
-lean_object* x_267; lean_object* x_268; 
-lean_dec(x_252);
-lean_dec(x_251);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_267 = lean_ctor_get(x_253, 0);
-lean_inc(x_267);
-x_268 = lean_ctor_get(x_253, 1);
-lean_inc(x_268);
-lean_dec(x_253);
-x_221 = x_267;
-x_222 = x_268;
-goto block_237;
-}
-}
-else
-{
-lean_object* x_269; 
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_269 = lean_ctor_get(x_250, 0);
-lean_inc(x_269);
-if (lean_obj_tag(x_269) == 0)
-{
-lean_object* x_270; lean_object* x_271; lean_object* x_272; 
-x_270 = lean_ctor_get(x_250, 1);
-lean_inc(x_270);
-lean_dec(x_250);
-x_271 = lean_ctor_get(x_269, 0);
-lean_inc(x_271);
-lean_dec(x_269);
-lean_inc(x_198);
-x_272 = l___private_Init_Lean_Elab_Command_2__getState(x_198, x_246);
-if (lean_obj_tag(x_272) == 0)
-{
-lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; 
-x_273 = lean_ctor_get(x_272, 0);
-lean_inc(x_273);
-x_274 = lean_ctor_get(x_272, 1);
-lean_inc(x_274);
-lean_dec(x_272);
-x_275 = lean_ctor_get(x_273, 0);
-lean_inc(x_275);
-x_276 = lean_ctor_get(x_273, 2);
-lean_inc(x_276);
-x_277 = lean_ctor_get(x_273, 3);
-lean_inc(x_277);
-x_278 = lean_ctor_get(x_273, 4);
-lean_inc(x_278);
-x_279 = lean_ctor_get(x_273, 5);
-lean_inc(x_279);
-if (lean_is_exclusive(x_273)) {
- lean_ctor_release(x_273, 0);
- lean_ctor_release(x_273, 1);
- lean_ctor_release(x_273, 2);
- lean_ctor_release(x_273, 3);
- lean_ctor_release(x_273, 4);
- lean_ctor_release(x_273, 5);
- x_280 = x_273;
-} else {
- lean_dec_ref(x_273);
- x_280 = lean_box(0);
-}
-if (lean_is_scalar(x_280)) {
- x_281 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_281 = x_280;
-}
-lean_ctor_set(x_281, 0, x_275);
-lean_ctor_set(x_281, 1, x_270);
-lean_ctor_set(x_281, 2, x_276);
-lean_ctor_set(x_281, 3, x_277);
-lean_ctor_set(x_281, 4, x_278);
-lean_ctor_set(x_281, 5, x_279);
-lean_inc(x_198);
-x_282 = l___private_Init_Lean_Elab_Command_3__setState(x_281, x_198, x_274);
-if (lean_obj_tag(x_282) == 0)
-{
-lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; 
-x_283 = lean_ctor_get(x_282, 1);
-lean_inc(x_283);
-lean_dec(x_282);
-x_284 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_284, 0, x_271);
-x_285 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_285, 0, x_284);
-lean_inc(x_198);
-x_286 = l_Lean_Elab_Command_throwError___rarg(x_1, x_285, x_198, x_283);
-x_287 = lean_ctor_get(x_286, 0);
-lean_inc(x_287);
-x_288 = lean_ctor_get(x_286, 1);
-lean_inc(x_288);
-lean_dec(x_286);
-x_221 = x_287;
-x_222 = x_288;
-goto block_237;
-}
-else
-{
-lean_object* x_289; lean_object* x_290; 
-lean_dec(x_271);
-x_289 = lean_ctor_get(x_282, 0);
-lean_inc(x_289);
-x_290 = lean_ctor_get(x_282, 1);
-lean_inc(x_290);
-lean_dec(x_282);
-x_221 = x_289;
-x_222 = x_290;
-goto block_237;
-}
-}
-else
-{
-lean_object* x_291; lean_object* x_292; 
-lean_dec(x_271);
-lean_dec(x_270);
-x_291 = lean_ctor_get(x_272, 0);
-lean_inc(x_291);
-x_292 = lean_ctor_get(x_272, 1);
-lean_inc(x_292);
-lean_dec(x_272);
-x_221 = x_291;
-x_222 = x_292;
-goto block_237;
-}
-}
-else
-{
-lean_object* x_293; 
-lean_dec(x_250);
-x_293 = lean_box(1);
-x_221 = x_293;
-x_222 = x_246;
-goto block_237;
-}
-}
-}
-else
-{
-lean_object* x_294; lean_object* x_295; 
-lean_dec(x_242);
-lean_dec(x_239);
-lean_dec(x_211);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_294 = lean_ctor_get(x_244, 0);
-lean_inc(x_294);
-x_295 = lean_ctor_get(x_244, 1);
-lean_inc(x_295);
-lean_dec(x_244);
-x_221 = x_294;
-x_222 = x_295;
-goto block_237;
-}
-}
-else
-{
-lean_object* x_296; lean_object* x_297; 
-lean_dec(x_239);
-lean_dec(x_211);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_296 = lean_ctor_get(x_241, 0);
-lean_inc(x_296);
-x_297 = lean_ctor_get(x_241, 1);
-lean_inc(x_297);
-lean_dec(x_241);
-x_221 = x_296;
-x_222 = x_297;
-goto block_237;
-}
-block_220:
-{
-lean_object* x_216; lean_object* x_217; lean_object* x_218; 
-lean_inc(x_214);
-x_216 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_216, 0, x_1);
-lean_ctor_set(x_216, 1, x_214);
-x_217 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_217, 0, x_216);
-lean_ctor_set(x_217, 1, x_12);
-x_218 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_218, 0, x_7);
-lean_ctor_set(x_218, 1, x_8);
-lean_ctor_set(x_218, 2, x_9);
-lean_ctor_set(x_218, 3, x_25);
-lean_ctor_set(x_218, 4, x_11);
-lean_ctor_set(x_218, 5, x_217);
-lean_ctor_set(x_218, 6, x_192);
-x_1 = x_214;
-x_2 = x_218;
-x_3 = x_215;
+lean_object* x_161; lean_object* x_162; lean_object* x_163; 
+lean_inc(x_159);
+x_161 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_161, 0, x_1);
+lean_ctor_set(x_161, 1, x_159);
+x_162 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_162, 0, x_161);
+lean_ctor_set(x_162, 1, x_12);
+x_163 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_163, 0, x_7);
+lean_ctor_set(x_163, 1, x_8);
+lean_ctor_set(x_163, 2, x_9);
+lean_ctor_set(x_163, 3, x_25);
+lean_ctor_set(x_163, 4, x_11);
+lean_ctor_set(x_163, 5, x_162);
+lean_ctor_set(x_163, 6, x_137);
+x_1 = x_159;
+x_2 = x_163;
+x_3 = x_160;
 goto _start;
 }
-block_237:
+block_182:
 {
-if (lean_obj_tag(x_221) == 0)
+if (lean_obj_tag(x_166) == 0)
 {
-lean_object* x_223; 
-lean_dec(x_208);
-lean_dec(x_198);
+lean_object* x_168; 
+lean_dec(x_153);
+lean_dec(x_143);
 lean_dec(x_1);
-if (lean_is_scalar(x_213)) {
- x_223 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_158)) {
+ x_168 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_223 = x_213;
- lean_ctor_set_tag(x_223, 1);
+ x_168 = x_158;
+ lean_ctor_set_tag(x_168, 1);
 }
-lean_ctor_set(x_223, 0, x_221);
-lean_ctor_set(x_223, 1, x_222);
-return x_223;
+lean_ctor_set(x_168, 0, x_166);
+lean_ctor_set(x_168, 1, x_167);
+return x_168;
 }
 else
 {
-lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; 
-lean_dec(x_213);
-x_224 = l_Lean_Name_toString___closed__1;
-x_225 = l_Lean_Name_toStringWithSep___main(x_224, x_208);
-x_226 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_226, 0, x_225);
-x_227 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_227, 0, x_226);
-x_228 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
-x_229 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_229, 0, x_228);
-lean_ctor_set(x_229, 1, x_227);
-x_230 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
-x_231 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_231, 0, x_229);
-lean_ctor_set(x_231, 1, x_230);
-x_232 = l_Lean_Elab_Command_throwError___rarg(x_1, x_231, x_198, x_222);
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; 
+lean_dec(x_158);
+x_169 = l_Lean_Name_toString___closed__1;
+x_170 = l_Lean_Name_toStringWithSep___main(x_169, x_153);
+x_171 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_171, 0, x_170);
+x_172 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_172, 0, x_171);
+x_173 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
+x_174 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_174, 0, x_173);
+lean_ctor_set(x_174, 1, x_172);
+x_175 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
+x_176 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_176, 0, x_174);
+lean_ctor_set(x_176, 1, x_175);
+x_177 = l_Lean_Elab_Command_throwError___rarg(x_1, x_176, x_143, x_167);
 lean_dec(x_1);
-x_233 = lean_ctor_get(x_232, 0);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_232, 1);
-lean_inc(x_234);
-if (lean_is_exclusive(x_232)) {
- lean_ctor_release(x_232, 0);
- lean_ctor_release(x_232, 1);
- x_235 = x_232;
+x_178 = lean_ctor_get(x_177, 0);
+lean_inc(x_178);
+x_179 = lean_ctor_get(x_177, 1);
+lean_inc(x_179);
+if (lean_is_exclusive(x_177)) {
+ lean_ctor_release(x_177, 0);
+ lean_ctor_release(x_177, 1);
+ x_180 = x_177;
 } else {
- lean_dec_ref(x_232);
- x_235 = lean_box(0);
+ lean_dec_ref(x_177);
+ x_180 = lean_box(0);
 }
-if (lean_is_scalar(x_235)) {
- x_236 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_180)) {
+ x_181 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_236 = x_235;
+ x_181 = x_180;
 }
-lean_ctor_set(x_236, 0, x_233);
-lean_ctor_set(x_236, 1, x_234);
-return x_236;
+lean_ctor_set(x_181, 0, x_178);
+lean_ctor_set(x_181, 1, x_179);
+return x_181;
 }
 }
 }
 else
 {
-lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
-lean_dec(x_208);
-lean_dec(x_198);
-lean_dec(x_192);
+lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
+lean_dec(x_153);
+lean_dec(x_143);
+lean_dec(x_137);
 lean_dec(x_25);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -6737,16 +6014,605 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_298 = lean_ctor_get(x_210, 0);
-lean_inc(x_298);
-x_299 = lean_ctor_get(x_210, 1);
-lean_inc(x_299);
-if (lean_is_exclusive(x_210)) {
- lean_ctor_release(x_210, 0);
- lean_ctor_release(x_210, 1);
- x_300 = x_210;
+x_203 = lean_ctor_get(x_155, 0);
+lean_inc(x_203);
+x_204 = lean_ctor_get(x_155, 1);
+lean_inc(x_204);
+if (lean_is_exclusive(x_155)) {
+ lean_ctor_release(x_155, 0);
+ lean_ctor_release(x_155, 1);
+ x_205 = x_155;
 } else {
- lean_dec_ref(x_210);
+ lean_dec_ref(x_155);
+ x_205 = lean_box(0);
+}
+if (lean_is_scalar(x_205)) {
+ x_206 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_206 = x_205;
+}
+lean_ctor_set(x_206, 0, x_203);
+lean_ctor_set(x_206, 1, x_204);
+return x_206;
+}
+}
+else
+{
+lean_object* x_207; lean_object* x_208; 
+lean_dec(x_153);
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_207 = lean_ctor_get(x_154, 0);
+lean_inc(x_207);
+lean_dec(x_154);
+x_208 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_146, x_1, x_207, x_143, x_147);
+return x_208;
+}
+}
+else
+{
+lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; 
+lean_dec(x_143);
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_209 = lean_ctor_get(x_145, 0);
+lean_inc(x_209);
+x_210 = lean_ctor_get(x_145, 1);
+lean_inc(x_210);
+if (lean_is_exclusive(x_145)) {
+ lean_ctor_release(x_145, 0);
+ lean_ctor_release(x_145, 1);
+ x_211 = x_145;
+} else {
+ lean_dec_ref(x_145);
+ x_211 = lean_box(0);
+}
+if (lean_is_scalar(x_211)) {
+ x_212 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_212 = x_211;
+}
+lean_ctor_set(x_212, 0, x_209);
+lean_ctor_set(x_212, 1, x_210);
+return x_212;
+}
+}
+}
+else
+{
+lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; 
+lean_dec(x_137);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_238 = lean_ctor_get(x_141, 0);
+lean_inc(x_238);
+x_239 = lean_ctor_get(x_141, 1);
+lean_inc(x_239);
+if (lean_is_exclusive(x_141)) {
+ lean_ctor_release(x_141, 0);
+ lean_ctor_release(x_141, 1);
+ x_240 = x_141;
+} else {
+ lean_dec_ref(x_141);
+ x_240 = lean_box(0);
+}
+if (lean_is_scalar(x_240)) {
+ x_241 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_241 = x_240;
+}
+lean_ctor_set(x_241, 0, x_238);
+lean_ctor_set(x_241, 1, x_239);
+return x_241;
+}
+}
+}
+else
+{
+uint8_t x_242; 
+lean_dec(x_2);
+lean_dec(x_25);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_242 = !lean_is_exclusive(x_26);
+if (x_242 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_243; lean_object* x_244; lean_object* x_245; 
+x_243 = lean_ctor_get(x_26, 0);
+x_244 = lean_ctor_get(x_26, 1);
+lean_inc(x_244);
+lean_inc(x_243);
+lean_dec(x_26);
+x_245 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_245, 0, x_243);
+lean_ctor_set(x_245, 1, x_244);
+return x_245;
+}
+}
+}
+else
+{
+lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
+lean_dec(x_2);
+x_246 = lean_unsigned_to_nat(1u);
+x_247 = lean_nat_add(x_10, x_246);
+lean_dec(x_10);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_247);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_248 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_248, 0, x_7);
+lean_ctor_set(x_248, 1, x_8);
+lean_ctor_set(x_248, 2, x_9);
+lean_ctor_set(x_248, 3, x_247);
+lean_ctor_set(x_248, 4, x_11);
+lean_ctor_set(x_248, 5, x_12);
+lean_ctor_set(x_248, 6, x_13);
+lean_inc(x_248);
+x_249 = l___private_Init_Lean_Elab_Command_2__getState(x_248, x_6);
+if (lean_obj_tag(x_249) == 0)
+{
+lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; 
+x_250 = lean_ctor_get(x_249, 0);
+lean_inc(x_250);
+x_251 = lean_ctor_get(x_249, 1);
+lean_inc(x_251);
+lean_dec(x_249);
+x_252 = lean_ctor_get(x_250, 0);
+lean_inc(x_252);
+x_253 = lean_ctor_get(x_250, 1);
+lean_inc(x_253);
+x_254 = lean_ctor_get(x_250, 2);
+lean_inc(x_254);
+x_255 = lean_ctor_get(x_250, 3);
+lean_inc(x_255);
+x_256 = lean_ctor_get(x_250, 4);
+lean_inc(x_256);
+x_257 = lean_ctor_get(x_250, 5);
+lean_inc(x_257);
+if (lean_is_exclusive(x_250)) {
+ lean_ctor_release(x_250, 0);
+ lean_ctor_release(x_250, 1);
+ lean_ctor_release(x_250, 2);
+ lean_ctor_release(x_250, 3);
+ lean_ctor_release(x_250, 4);
+ lean_ctor_release(x_250, 5);
+ x_258 = x_250;
+} else {
+ lean_dec_ref(x_250);
+ x_258 = lean_box(0);
+}
+x_259 = lean_nat_add(x_256, x_246);
+if (lean_is_scalar(x_258)) {
+ x_260 = lean_alloc_ctor(0, 6, 0);
+} else {
+ x_260 = x_258;
+}
+lean_ctor_set(x_260, 0, x_252);
+lean_ctor_set(x_260, 1, x_253);
+lean_ctor_set(x_260, 2, x_254);
+lean_ctor_set(x_260, 3, x_255);
+lean_ctor_set(x_260, 4, x_259);
+lean_ctor_set(x_260, 5, x_257);
+x_261 = l___private_Init_Lean_Elab_Command_3__setState(x_260, x_248, x_251);
+if (lean_obj_tag(x_261) == 0)
+{
+lean_object* x_262; lean_object* x_263; lean_object* x_264; 
+x_262 = lean_ctor_get(x_261, 1);
+lean_inc(x_262);
+lean_dec(x_261);
+lean_inc(x_256);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_247);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_263 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_263, 0, x_7);
+lean_ctor_set(x_263, 1, x_8);
+lean_ctor_set(x_263, 2, x_9);
+lean_ctor_set(x_263, 3, x_247);
+lean_ctor_set(x_263, 4, x_11);
+lean_ctor_set(x_263, 5, x_12);
+lean_ctor_set(x_263, 6, x_256);
+if (lean_obj_tag(x_1) == 1)
+{
+lean_object* x_334; lean_object* x_335; lean_object* x_336; uint8_t x_337; 
+x_334 = lean_ctor_get(x_1, 0);
+lean_inc(x_334);
+x_335 = lean_ctor_get(x_1, 1);
+lean_inc(x_335);
+x_336 = l_Lean_nullKind;
+x_337 = lean_name_eq(x_334, x_336);
+lean_dec(x_334);
+if (x_337 == 0)
+{
+lean_object* x_338; 
+lean_dec(x_335);
+lean_inc(x_263);
+x_338 = l_Lean_Elab_Command_getOptions(x_263, x_262);
+if (lean_obj_tag(x_338) == 0)
+{
+lean_object* x_339; lean_object* x_340; lean_object* x_341; uint8_t x_342; 
+x_339 = lean_ctor_get(x_338, 0);
+lean_inc(x_339);
+x_340 = lean_ctor_get(x_338, 1);
+lean_inc(x_340);
+lean_dec(x_338);
+x_341 = l_Lean_Elab_Command_elabCommand___main___closed__1;
+x_342 = l_Lean_checkTraceOption(x_339, x_341);
+lean_dec(x_339);
+if (x_342 == 0)
+{
+x_264 = x_340;
+goto block_333;
+}
+else
+{
+lean_object* x_343; lean_object* x_344; 
+lean_inc(x_1);
+x_343 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_343, 0, x_1);
+lean_inc(x_263);
+x_344 = l_Lean_Elab_Command_logTrace(x_341, x_1, x_343, x_263, x_340);
+if (lean_obj_tag(x_344) == 0)
+{
+lean_object* x_345; 
+x_345 = lean_ctor_get(x_344, 1);
+lean_inc(x_345);
+lean_dec(x_344);
+x_264 = x_345;
+goto block_333;
+}
+else
+{
+lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; 
+lean_dec(x_263);
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_346 = lean_ctor_get(x_344, 0);
+lean_inc(x_346);
+x_347 = lean_ctor_get(x_344, 1);
+lean_inc(x_347);
+if (lean_is_exclusive(x_344)) {
+ lean_ctor_release(x_344, 0);
+ lean_ctor_release(x_344, 1);
+ x_348 = x_344;
+} else {
+ lean_dec_ref(x_344);
+ x_348 = lean_box(0);
+}
+if (lean_is_scalar(x_348)) {
+ x_349 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_349 = x_348;
+}
+lean_ctor_set(x_349, 0, x_346);
+lean_ctor_set(x_349, 1, x_347);
+return x_349;
+}
+}
+}
+else
+{
+lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; 
+lean_dec(x_263);
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_350 = lean_ctor_get(x_338, 0);
+lean_inc(x_350);
+x_351 = lean_ctor_get(x_338, 1);
+lean_inc(x_351);
+if (lean_is_exclusive(x_338)) {
+ lean_ctor_release(x_338, 0);
+ lean_ctor_release(x_338, 1);
+ x_352 = x_338;
+} else {
+ lean_dec_ref(x_338);
+ x_352 = lean_box(0);
+}
+if (lean_is_scalar(x_352)) {
+ x_353 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_353 = x_352;
+}
+lean_ctor_set(x_353, 0, x_350);
+lean_ctor_set(x_353, 1, x_351);
+return x_353;
+}
+}
+else
+{
+lean_object* x_354; lean_object* x_355; 
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_1);
+x_354 = lean_unsigned_to_nat(0u);
+x_355 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_335, x_354, x_263, x_262);
+lean_dec(x_335);
+return x_355;
+}
+}
+else
+{
+lean_object* x_356; lean_object* x_357; 
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_356 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
+x_357 = l_Lean_Elab_Command_throwError___rarg(x_1, x_356, x_263, x_262);
+lean_dec(x_1);
+return x_357;
+}
+block_333:
+{
+lean_object* x_265; 
+lean_inc(x_263);
+x_265 = l___private_Init_Lean_Elab_Command_2__getState(x_263, x_264);
+if (lean_obj_tag(x_265) == 0)
+{
+lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
+x_266 = lean_ctor_get(x_265, 0);
+lean_inc(x_266);
+x_267 = lean_ctor_get(x_265, 1);
+lean_inc(x_267);
+lean_dec(x_265);
+x_268 = l_Lean_Elab_Command_commandElabAttribute;
+x_269 = lean_ctor_get(x_268, 1);
+lean_inc(x_269);
+x_270 = lean_ctor_get(x_266, 0);
+lean_inc(x_270);
+x_271 = l_Lean_PersistentEnvExtension_getState___rarg(x_269, x_270);
+lean_dec(x_270);
+lean_dec(x_269);
+x_272 = lean_ctor_get(x_271, 1);
+lean_inc(x_272);
+lean_dec(x_271);
+lean_inc(x_1);
+x_273 = l_Lean_Syntax_getKind(x_1);
+x_274 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__1(x_272, x_273);
+if (lean_obj_tag(x_274) == 0)
+{
+lean_object* x_275; 
+lean_dec(x_266);
+lean_inc(x_263);
+x_275 = l_Lean_Elab_Command_getEnv(x_263, x_267);
+if (lean_obj_tag(x_275) == 0)
+{
+lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_286; lean_object* x_287; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; 
+x_276 = lean_ctor_get(x_275, 0);
+lean_inc(x_276);
+x_277 = lean_ctor_get(x_275, 1);
+lean_inc(x_277);
+if (lean_is_exclusive(x_275)) {
+ lean_ctor_release(x_275, 0);
+ lean_ctor_release(x_275, 1);
+ x_278 = x_275;
+} else {
+ lean_dec_ref(x_275);
+ x_278 = lean_box(0);
+}
+x_303 = l_Lean_Elab_Command_getCurrMacroScope(x_263, x_277);
+x_304 = lean_ctor_get(x_303, 0);
+lean_inc(x_304);
+x_305 = lean_ctor_get(x_303, 1);
+lean_inc(x_305);
+lean_dec(x_303);
+lean_inc(x_263);
+x_306 = l_Lean_Elab_Command_getEnv(x_263, x_305);
+if (lean_obj_tag(x_306) == 0)
+{
+lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; 
+x_307 = lean_ctor_get(x_306, 0);
+lean_inc(x_307);
+x_308 = lean_ctor_get(x_306, 1);
+lean_inc(x_308);
+lean_dec(x_306);
+x_309 = lean_environment_main_module(x_307);
+x_310 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_310, 0, x_309);
+lean_ctor_set(x_310, 1, x_304);
+lean_inc(x_1);
+x_311 = l_Lean_Elab_getMacros(x_276, x_1, x_310);
+lean_dec(x_276);
+if (lean_obj_tag(x_311) == 0)
+{
+lean_object* x_312; 
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_312 = lean_ctor_get(x_311, 0);
+lean_inc(x_312);
+lean_dec(x_311);
+if (lean_obj_tag(x_312) == 0)
+{
+lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; 
+x_313 = lean_ctor_get(x_312, 0);
+lean_inc(x_313);
+lean_dec(x_312);
+x_314 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_314, 0, x_313);
+x_315 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_315, 0, x_314);
+lean_inc(x_263);
+x_316 = l_Lean_Elab_Command_throwError___rarg(x_1, x_315, x_263, x_308);
+x_317 = lean_ctor_get(x_316, 0);
+lean_inc(x_317);
+x_318 = lean_ctor_get(x_316, 1);
+lean_inc(x_318);
+lean_dec(x_316);
+x_286 = x_317;
+x_287 = x_318;
+goto block_302;
+}
+else
+{
+lean_object* x_319; 
+x_319 = lean_box(1);
+x_286 = x_319;
+x_287 = x_308;
+goto block_302;
+}
+}
+else
+{
+lean_object* x_320; 
+lean_dec(x_278);
+lean_dec(x_273);
+lean_dec(x_263);
+x_320 = lean_ctor_get(x_311, 0);
+lean_inc(x_320);
+lean_dec(x_311);
+x_279 = x_320;
+x_280 = x_308;
+goto block_285;
+}
+}
+else
+{
+lean_object* x_321; lean_object* x_322; 
+lean_dec(x_304);
+lean_dec(x_276);
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_321 = lean_ctor_get(x_306, 0);
+lean_inc(x_321);
+x_322 = lean_ctor_get(x_306, 1);
+lean_inc(x_322);
+lean_dec(x_306);
+x_286 = x_321;
+x_287 = x_322;
+goto block_302;
+}
+block_285:
+{
+lean_object* x_281; lean_object* x_282; lean_object* x_283; 
+lean_inc(x_279);
+x_281 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_281, 0, x_1);
+lean_ctor_set(x_281, 1, x_279);
+x_282 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_282, 0, x_281);
+lean_ctor_set(x_282, 1, x_12);
+x_283 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_283, 0, x_7);
+lean_ctor_set(x_283, 1, x_8);
+lean_ctor_set(x_283, 2, x_9);
+lean_ctor_set(x_283, 3, x_247);
+lean_ctor_set(x_283, 4, x_11);
+lean_ctor_set(x_283, 5, x_282);
+lean_ctor_set(x_283, 6, x_256);
+x_1 = x_279;
+x_2 = x_283;
+x_3 = x_280;
+goto _start;
+}
+block_302:
+{
+if (lean_obj_tag(x_286) == 0)
+{
+lean_object* x_288; 
+lean_dec(x_273);
+lean_dec(x_263);
+lean_dec(x_1);
+if (lean_is_scalar(x_278)) {
+ x_288 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_288 = x_278;
+ lean_ctor_set_tag(x_288, 1);
+}
+lean_ctor_set(x_288, 0, x_286);
+lean_ctor_set(x_288, 1, x_287);
+return x_288;
+}
+else
+{
+lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
+lean_dec(x_278);
+x_289 = l_Lean_Name_toString___closed__1;
+x_290 = l_Lean_Name_toStringWithSep___main(x_289, x_273);
+x_291 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_291, 0, x_290);
+x_292 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_292, 0, x_291);
+x_293 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
+x_294 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_294, 0, x_293);
+lean_ctor_set(x_294, 1, x_292);
+x_295 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
+x_296 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_296, 0, x_294);
+lean_ctor_set(x_296, 1, x_295);
+x_297 = l_Lean_Elab_Command_throwError___rarg(x_1, x_296, x_263, x_287);
+lean_dec(x_1);
+x_298 = lean_ctor_get(x_297, 0);
+lean_inc(x_298);
+x_299 = lean_ctor_get(x_297, 1);
+lean_inc(x_299);
+if (lean_is_exclusive(x_297)) {
+ lean_ctor_release(x_297, 0);
+ lean_ctor_release(x_297, 1);
+ x_300 = x_297;
+} else {
+ lean_dec_ref(x_297);
  x_300 = lean_box(0);
 }
 if (lean_is_scalar(x_300)) {
@@ -6759,969 +6625,165 @@ lean_ctor_set(x_301, 1, x_299);
 return x_301;
 }
 }
-else
-{
-lean_object* x_302; lean_object* x_303; 
-lean_dec(x_208);
-lean_dec(x_192);
-lean_dec(x_25);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_302 = lean_ctor_get(x_209, 0);
-lean_inc(x_302);
-lean_dec(x_209);
-x_303 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_201, x_1, x_302, x_198, x_202);
-return x_303;
-}
 }
 else
 {
-lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; 
-lean_dec(x_198);
-lean_dec(x_192);
-lean_dec(x_25);
+lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; 
+lean_dec(x_273);
+lean_dec(x_263);
+lean_dec(x_256);
+lean_dec(x_247);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_304 = lean_ctor_get(x_200, 0);
-lean_inc(x_304);
-x_305 = lean_ctor_get(x_200, 1);
-lean_inc(x_305);
-if (lean_is_exclusive(x_200)) {
- lean_ctor_release(x_200, 0);
- lean_ctor_release(x_200, 1);
- x_306 = x_200;
+x_323 = lean_ctor_get(x_275, 0);
+lean_inc(x_323);
+x_324 = lean_ctor_get(x_275, 1);
+lean_inc(x_324);
+if (lean_is_exclusive(x_275)) {
+ lean_ctor_release(x_275, 0);
+ lean_ctor_release(x_275, 1);
+ x_325 = x_275;
 } else {
- lean_dec_ref(x_200);
- x_306 = lean_box(0);
+ lean_dec_ref(x_275);
+ x_325 = lean_box(0);
 }
-if (lean_is_scalar(x_306)) {
- x_307 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_325)) {
+ x_326 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_307 = x_306;
-}
-lean_ctor_set(x_307, 0, x_304);
-lean_ctor_set(x_307, 1, x_305);
-return x_307;
+ x_326 = x_325;
 }
+lean_ctor_set(x_326, 0, x_323);
+lean_ctor_set(x_326, 1, x_324);
+return x_326;
 }
 }
 else
 {
-lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; 
-lean_dec(x_192);
-lean_dec(x_25);
+lean_object* x_327; lean_object* x_328; 
+lean_dec(x_273);
+lean_dec(x_256);
+lean_dec(x_247);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_327 = lean_ctor_get(x_274, 0);
+lean_inc(x_327);
+lean_dec(x_274);
+x_328 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_266, x_1, x_327, x_263, x_267);
+return x_328;
+}
+}
+else
+{
+lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; 
+lean_dec(x_263);
+lean_dec(x_256);
+lean_dec(x_247);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_333 = lean_ctor_get(x_196, 0);
-lean_inc(x_333);
-x_334 = lean_ctor_get(x_196, 1);
-lean_inc(x_334);
-if (lean_is_exclusive(x_196)) {
- lean_ctor_release(x_196, 0);
- lean_ctor_release(x_196, 1);
- x_335 = x_196;
+x_329 = lean_ctor_get(x_265, 0);
+lean_inc(x_329);
+x_330 = lean_ctor_get(x_265, 1);
+lean_inc(x_330);
+if (lean_is_exclusive(x_265)) {
+ lean_ctor_release(x_265, 0);
+ lean_ctor_release(x_265, 1);
+ x_331 = x_265;
 } else {
- lean_dec_ref(x_196);
- x_335 = lean_box(0);
+ lean_dec_ref(x_265);
+ x_331 = lean_box(0);
 }
-if (lean_is_scalar(x_335)) {
- x_336 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_331)) {
+ x_332 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_336 = x_335;
+ x_332 = x_331;
 }
-lean_ctor_set(x_336, 0, x_333);
-lean_ctor_set(x_336, 1, x_334);
-return x_336;
+lean_ctor_set(x_332, 0, x_329);
+lean_ctor_set(x_332, 1, x_330);
+return x_332;
 }
 }
 }
 else
 {
-uint8_t x_337; 
-lean_dec(x_2);
-lean_dec(x_25);
+lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; 
+lean_dec(x_256);
+lean_dec(x_247);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_337 = !lean_is_exclusive(x_26);
-if (x_337 == 0)
-{
-return x_26;
-}
-else
-{
-lean_object* x_338; lean_object* x_339; lean_object* x_340; 
-x_338 = lean_ctor_get(x_26, 0);
-x_339 = lean_ctor_get(x_26, 1);
-lean_inc(x_339);
-lean_inc(x_338);
-lean_dec(x_26);
-x_340 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_340, 0, x_338);
-lean_ctor_set(x_340, 1, x_339);
-return x_340;
-}
-}
-}
-else
-{
-lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; 
-lean_dec(x_2);
-x_341 = lean_unsigned_to_nat(1u);
-x_342 = lean_nat_add(x_10, x_341);
-lean_dec(x_10);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_342);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_343 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_343, 0, x_7);
-lean_ctor_set(x_343, 1, x_8);
-lean_ctor_set(x_343, 2, x_9);
-lean_ctor_set(x_343, 3, x_342);
-lean_ctor_set(x_343, 4, x_11);
-lean_ctor_set(x_343, 5, x_12);
-lean_ctor_set(x_343, 6, x_13);
-lean_inc(x_343);
-x_344 = l___private_Init_Lean_Elab_Command_2__getState(x_343, x_6);
-if (lean_obj_tag(x_344) == 0)
-{
-lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; 
-x_345 = lean_ctor_get(x_344, 0);
-lean_inc(x_345);
-x_346 = lean_ctor_get(x_344, 1);
-lean_inc(x_346);
-lean_dec(x_344);
-x_347 = lean_ctor_get(x_345, 0);
-lean_inc(x_347);
-x_348 = lean_ctor_get(x_345, 1);
-lean_inc(x_348);
-x_349 = lean_ctor_get(x_345, 2);
-lean_inc(x_349);
-x_350 = lean_ctor_get(x_345, 3);
-lean_inc(x_350);
-x_351 = lean_ctor_get(x_345, 4);
-lean_inc(x_351);
-x_352 = lean_ctor_get(x_345, 5);
-lean_inc(x_352);
-if (lean_is_exclusive(x_345)) {
- lean_ctor_release(x_345, 0);
- lean_ctor_release(x_345, 1);
- lean_ctor_release(x_345, 2);
- lean_ctor_release(x_345, 3);
- lean_ctor_release(x_345, 4);
- lean_ctor_release(x_345, 5);
- x_353 = x_345;
-} else {
- lean_dec_ref(x_345);
- x_353 = lean_box(0);
-}
-x_354 = lean_nat_add(x_351, x_341);
-if (lean_is_scalar(x_353)) {
- x_355 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_355 = x_353;
-}
-lean_ctor_set(x_355, 0, x_347);
-lean_ctor_set(x_355, 1, x_348);
-lean_ctor_set(x_355, 2, x_349);
-lean_ctor_set(x_355, 3, x_350);
-lean_ctor_set(x_355, 4, x_354);
-lean_ctor_set(x_355, 5, x_352);
-x_356 = l___private_Init_Lean_Elab_Command_3__setState(x_355, x_343, x_346);
-if (lean_obj_tag(x_356) == 0)
-{
-lean_object* x_357; lean_object* x_358; lean_object* x_359; 
-x_357 = lean_ctor_get(x_356, 1);
-lean_inc(x_357);
-lean_dec(x_356);
-lean_inc(x_351);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_342);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_358 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_358, 0, x_7);
-lean_ctor_set(x_358, 1, x_8);
-lean_ctor_set(x_358, 2, x_9);
-lean_ctor_set(x_358, 3, x_342);
-lean_ctor_set(x_358, 4, x_11);
-lean_ctor_set(x_358, 5, x_12);
-lean_ctor_set(x_358, 6, x_351);
-if (lean_obj_tag(x_1) == 1)
-{
-lean_object* x_469; lean_object* x_470; lean_object* x_471; uint8_t x_472; 
-x_469 = lean_ctor_get(x_1, 0);
-lean_inc(x_469);
-x_470 = lean_ctor_get(x_1, 1);
-lean_inc(x_470);
-x_471 = l_Lean_nullKind;
-x_472 = lean_name_eq(x_469, x_471);
-lean_dec(x_469);
-if (x_472 == 0)
-{
-lean_object* x_473; 
-lean_dec(x_470);
+x_358 = lean_ctor_get(x_261, 0);
 lean_inc(x_358);
-x_473 = l_Lean_Elab_Command_getOptions(x_358, x_357);
-if (lean_obj_tag(x_473) == 0)
-{
-lean_object* x_474; lean_object* x_475; lean_object* x_476; uint8_t x_477; 
-x_474 = lean_ctor_get(x_473, 0);
-lean_inc(x_474);
-x_475 = lean_ctor_get(x_473, 1);
-lean_inc(x_475);
-lean_dec(x_473);
-x_476 = l_Lean_Elab_Command_elabCommand___main___closed__1;
-x_477 = l_Lean_checkTraceOption(x_474, x_476);
-lean_dec(x_474);
-if (x_477 == 0)
-{
-x_359 = x_475;
-goto block_468;
+x_359 = lean_ctor_get(x_261, 1);
+lean_inc(x_359);
+if (lean_is_exclusive(x_261)) {
+ lean_ctor_release(x_261, 0);
+ lean_ctor_release(x_261, 1);
+ x_360 = x_261;
+} else {
+ lean_dec_ref(x_261);
+ x_360 = lean_box(0);
+}
+if (lean_is_scalar(x_360)) {
+ x_361 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_361 = x_360;
+}
+lean_ctor_set(x_361, 0, x_358);
+lean_ctor_set(x_361, 1, x_359);
+return x_361;
+}
 }
 else
 {
-lean_object* x_478; lean_object* x_479; 
-lean_inc(x_1);
-x_478 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_478, 0, x_1);
-lean_inc(x_358);
-x_479 = l_Lean_Elab_Command_logTrace(x_476, x_1, x_478, x_358, x_475);
-if (lean_obj_tag(x_479) == 0)
-{
-lean_object* x_480; 
-x_480 = lean_ctor_get(x_479, 1);
-lean_inc(x_480);
-lean_dec(x_479);
-x_359 = x_480;
-goto block_468;
-}
-else
-{
-lean_object* x_481; lean_object* x_482; lean_object* x_483; lean_object* x_484; 
-lean_dec(x_358);
-lean_dec(x_351);
-lean_dec(x_342);
+lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; 
+lean_dec(x_248);
+lean_dec(x_247);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_481 = lean_ctor_get(x_479, 0);
-lean_inc(x_481);
-x_482 = lean_ctor_get(x_479, 1);
-lean_inc(x_482);
-if (lean_is_exclusive(x_479)) {
- lean_ctor_release(x_479, 0);
- lean_ctor_release(x_479, 1);
- x_483 = x_479;
-} else {
- lean_dec_ref(x_479);
- x_483 = lean_box(0);
-}
-if (lean_is_scalar(x_483)) {
- x_484 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_484 = x_483;
-}
-lean_ctor_set(x_484, 0, x_481);
-lean_ctor_set(x_484, 1, x_482);
-return x_484;
-}
-}
-}
-else
-{
-lean_object* x_485; lean_object* x_486; lean_object* x_487; lean_object* x_488; 
-lean_dec(x_358);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_485 = lean_ctor_get(x_473, 0);
-lean_inc(x_485);
-x_486 = lean_ctor_get(x_473, 1);
-lean_inc(x_486);
-if (lean_is_exclusive(x_473)) {
- lean_ctor_release(x_473, 0);
- lean_ctor_release(x_473, 1);
- x_487 = x_473;
-} else {
- lean_dec_ref(x_473);
- x_487 = lean_box(0);
-}
-if (lean_is_scalar(x_487)) {
- x_488 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_488 = x_487;
-}
-lean_ctor_set(x_488, 0, x_485);
-lean_ctor_set(x_488, 1, x_486);
-return x_488;
-}
-}
-else
-{
-lean_object* x_489; lean_object* x_490; 
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_489 = lean_unsigned_to_nat(0u);
-x_490 = l_Array_forMAux___main___at_Lean_Elab_Command_elabCommand___main___spec__7(x_470, x_489, x_358, x_357);
-lean_dec(x_470);
-return x_490;
-}
-}
-else
-{
-lean_object* x_491; lean_object* x_492; 
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_491 = l_Lean_Elab_Tactic_evalTactic___main___closed__3;
-x_492 = l_Lean_Elab_Command_throwError___rarg(x_1, x_491, x_358, x_357);
-lean_dec(x_1);
-return x_492;
-}
-block_468:
-{
-lean_object* x_360; 
-lean_inc(x_358);
-x_360 = l___private_Init_Lean_Elab_Command_2__getState(x_358, x_359);
-if (lean_obj_tag(x_360) == 0)
-{
-lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; 
-x_361 = lean_ctor_get(x_360, 0);
-lean_inc(x_361);
-x_362 = lean_ctor_get(x_360, 1);
+x_362 = lean_ctor_get(x_249, 0);
 lean_inc(x_362);
-lean_dec(x_360);
-x_363 = l_Lean_Elab_Command_commandElabAttribute;
-x_364 = lean_ctor_get(x_363, 1);
-lean_inc(x_364);
-x_365 = lean_ctor_get(x_361, 0);
-lean_inc(x_365);
-x_366 = l_Lean_PersistentEnvExtension_getState___rarg(x_364, x_365);
-lean_dec(x_365);
-lean_dec(x_364);
-x_367 = lean_ctor_get(x_366, 1);
-lean_inc(x_367);
-lean_dec(x_366);
-lean_inc(x_1);
-x_368 = l_Lean_Syntax_getKind(x_1);
-x_369 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__1(x_367, x_368);
-if (lean_obj_tag(x_369) == 0)
-{
-lean_object* x_370; 
-lean_dec(x_361);
-lean_inc(x_358);
-x_370 = l_Lean_Elab_Command_getEnv(x_358, x_362);
-if (lean_obj_tag(x_370) == 0)
-{
-lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_381; lean_object* x_382; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; 
-x_371 = lean_ctor_get(x_370, 0);
-lean_inc(x_371);
-x_372 = lean_ctor_get(x_370, 1);
-lean_inc(x_372);
-if (lean_is_exclusive(x_370)) {
- lean_ctor_release(x_370, 0);
- lean_ctor_release(x_370, 1);
- x_373 = x_370;
+x_363 = lean_ctor_get(x_249, 1);
+lean_inc(x_363);
+if (lean_is_exclusive(x_249)) {
+ lean_ctor_release(x_249, 0);
+ lean_ctor_release(x_249, 1);
+ x_364 = x_249;
 } else {
- lean_dec_ref(x_370);
- x_373 = lean_box(0);
+ lean_dec_ref(x_249);
+ x_364 = lean_box(0);
 }
-x_398 = l_Lean_Elab_Command_getCurrMacroScope(x_358, x_372);
-x_399 = lean_ctor_get(x_398, 0);
-lean_inc(x_399);
-x_400 = lean_ctor_get(x_398, 1);
-lean_inc(x_400);
-lean_dec(x_398);
-lean_inc(x_358);
-x_401 = l_Lean_Elab_Command_getEnv(x_358, x_400);
-if (lean_obj_tag(x_401) == 0)
-{
-lean_object* x_402; lean_object* x_403; lean_object* x_404; 
-x_402 = lean_ctor_get(x_401, 0);
-lean_inc(x_402);
-x_403 = lean_ctor_get(x_401, 1);
-lean_inc(x_403);
-lean_dec(x_401);
-lean_inc(x_358);
-x_404 = l___private_Init_Lean_Elab_Command_2__getState(x_358, x_403);
-if (lean_obj_tag(x_404) == 0)
-{
-lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; 
-x_405 = lean_ctor_get(x_404, 0);
-lean_inc(x_405);
-x_406 = lean_ctor_get(x_404, 1);
-lean_inc(x_406);
-lean_dec(x_404);
-x_407 = lean_ctor_get(x_405, 1);
-lean_inc(x_407);
-lean_dec(x_405);
-x_408 = lean_environment_main_module(x_402);
-x_409 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_409, 0, x_408);
-lean_ctor_set(x_409, 1, x_399);
-lean_inc(x_1);
-x_410 = l_Lean_Elab_getMacros(x_371, x_1, x_409, x_407);
-lean_dec(x_371);
-if (lean_obj_tag(x_410) == 0)
-{
-lean_object* x_411; lean_object* x_412; lean_object* x_413; 
-x_411 = lean_ctor_get(x_410, 0);
-lean_inc(x_411);
-x_412 = lean_ctor_get(x_410, 1);
-lean_inc(x_412);
-lean_dec(x_410);
-lean_inc(x_358);
-x_413 = l___private_Init_Lean_Elab_Command_2__getState(x_358, x_406);
-if (lean_obj_tag(x_413) == 0)
-{
-lean_object* x_414; lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; lean_object* x_423; 
-x_414 = lean_ctor_get(x_413, 0);
-lean_inc(x_414);
-x_415 = lean_ctor_get(x_413, 1);
-lean_inc(x_415);
-lean_dec(x_413);
-x_416 = lean_ctor_get(x_414, 0);
-lean_inc(x_416);
-x_417 = lean_ctor_get(x_414, 2);
-lean_inc(x_417);
-x_418 = lean_ctor_get(x_414, 3);
-lean_inc(x_418);
-x_419 = lean_ctor_get(x_414, 4);
-lean_inc(x_419);
-x_420 = lean_ctor_get(x_414, 5);
-lean_inc(x_420);
-if (lean_is_exclusive(x_414)) {
- lean_ctor_release(x_414, 0);
- lean_ctor_release(x_414, 1);
- lean_ctor_release(x_414, 2);
- lean_ctor_release(x_414, 3);
- lean_ctor_release(x_414, 4);
- lean_ctor_release(x_414, 5);
- x_421 = x_414;
+if (lean_is_scalar(x_364)) {
+ x_365 = lean_alloc_ctor(1, 2, 0);
 } else {
- lean_dec_ref(x_414);
- x_421 = lean_box(0);
+ x_365 = x_364;
 }
-if (lean_is_scalar(x_421)) {
- x_422 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_422 = x_421;
-}
-lean_ctor_set(x_422, 0, x_416);
-lean_ctor_set(x_422, 1, x_412);
-lean_ctor_set(x_422, 2, x_417);
-lean_ctor_set(x_422, 3, x_418);
-lean_ctor_set(x_422, 4, x_419);
-lean_ctor_set(x_422, 5, x_420);
-lean_inc(x_358);
-x_423 = l___private_Init_Lean_Elab_Command_3__setState(x_422, x_358, x_415);
-if (lean_obj_tag(x_423) == 0)
-{
-lean_object* x_424; 
-lean_dec(x_373);
-lean_dec(x_368);
-lean_dec(x_358);
-x_424 = lean_ctor_get(x_423, 1);
-lean_inc(x_424);
-lean_dec(x_423);
-x_374 = x_411;
-x_375 = x_424;
-goto block_380;
-}
-else
-{
-lean_object* x_425; lean_object* x_426; 
-lean_dec(x_411);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_425 = lean_ctor_get(x_423, 0);
-lean_inc(x_425);
-x_426 = lean_ctor_get(x_423, 1);
-lean_inc(x_426);
-lean_dec(x_423);
-x_381 = x_425;
-x_382 = x_426;
-goto block_397;
-}
-}
-else
-{
-lean_object* x_427; lean_object* x_428; 
-lean_dec(x_412);
-lean_dec(x_411);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_427 = lean_ctor_get(x_413, 0);
-lean_inc(x_427);
-x_428 = lean_ctor_get(x_413, 1);
-lean_inc(x_428);
-lean_dec(x_413);
-x_381 = x_427;
-x_382 = x_428;
-goto block_397;
-}
-}
-else
-{
-lean_object* x_429; 
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_429 = lean_ctor_get(x_410, 0);
-lean_inc(x_429);
-if (lean_obj_tag(x_429) == 0)
-{
-lean_object* x_430; lean_object* x_431; lean_object* x_432; 
-x_430 = lean_ctor_get(x_410, 1);
-lean_inc(x_430);
-lean_dec(x_410);
-x_431 = lean_ctor_get(x_429, 0);
-lean_inc(x_431);
-lean_dec(x_429);
-lean_inc(x_358);
-x_432 = l___private_Init_Lean_Elab_Command_2__getState(x_358, x_406);
-if (lean_obj_tag(x_432) == 0)
-{
-lean_object* x_433; lean_object* x_434; lean_object* x_435; lean_object* x_436; lean_object* x_437; lean_object* x_438; lean_object* x_439; lean_object* x_440; lean_object* x_441; lean_object* x_442; 
-x_433 = lean_ctor_get(x_432, 0);
-lean_inc(x_433);
-x_434 = lean_ctor_get(x_432, 1);
-lean_inc(x_434);
-lean_dec(x_432);
-x_435 = lean_ctor_get(x_433, 0);
-lean_inc(x_435);
-x_436 = lean_ctor_get(x_433, 2);
-lean_inc(x_436);
-x_437 = lean_ctor_get(x_433, 3);
-lean_inc(x_437);
-x_438 = lean_ctor_get(x_433, 4);
-lean_inc(x_438);
-x_439 = lean_ctor_get(x_433, 5);
-lean_inc(x_439);
-if (lean_is_exclusive(x_433)) {
- lean_ctor_release(x_433, 0);
- lean_ctor_release(x_433, 1);
- lean_ctor_release(x_433, 2);
- lean_ctor_release(x_433, 3);
- lean_ctor_release(x_433, 4);
- lean_ctor_release(x_433, 5);
- x_440 = x_433;
-} else {
- lean_dec_ref(x_433);
- x_440 = lean_box(0);
-}
-if (lean_is_scalar(x_440)) {
- x_441 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_441 = x_440;
-}
-lean_ctor_set(x_441, 0, x_435);
-lean_ctor_set(x_441, 1, x_430);
-lean_ctor_set(x_441, 2, x_436);
-lean_ctor_set(x_441, 3, x_437);
-lean_ctor_set(x_441, 4, x_438);
-lean_ctor_set(x_441, 5, x_439);
-lean_inc(x_358);
-x_442 = l___private_Init_Lean_Elab_Command_3__setState(x_441, x_358, x_434);
-if (lean_obj_tag(x_442) == 0)
-{
-lean_object* x_443; lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; lean_object* x_448; 
-x_443 = lean_ctor_get(x_442, 1);
-lean_inc(x_443);
-lean_dec(x_442);
-x_444 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_444, 0, x_431);
-x_445 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_445, 0, x_444);
-lean_inc(x_358);
-x_446 = l_Lean_Elab_Command_throwError___rarg(x_1, x_445, x_358, x_443);
-x_447 = lean_ctor_get(x_446, 0);
-lean_inc(x_447);
-x_448 = lean_ctor_get(x_446, 1);
-lean_inc(x_448);
-lean_dec(x_446);
-x_381 = x_447;
-x_382 = x_448;
-goto block_397;
-}
-else
-{
-lean_object* x_449; lean_object* x_450; 
-lean_dec(x_431);
-x_449 = lean_ctor_get(x_442, 0);
-lean_inc(x_449);
-x_450 = lean_ctor_get(x_442, 1);
-lean_inc(x_450);
-lean_dec(x_442);
-x_381 = x_449;
-x_382 = x_450;
-goto block_397;
-}
-}
-else
-{
-lean_object* x_451; lean_object* x_452; 
-lean_dec(x_431);
-lean_dec(x_430);
-x_451 = lean_ctor_get(x_432, 0);
-lean_inc(x_451);
-x_452 = lean_ctor_get(x_432, 1);
-lean_inc(x_452);
-lean_dec(x_432);
-x_381 = x_451;
-x_382 = x_452;
-goto block_397;
-}
-}
-else
-{
-lean_object* x_453; 
-lean_dec(x_410);
-x_453 = lean_box(1);
-x_381 = x_453;
-x_382 = x_406;
-goto block_397;
+lean_ctor_set(x_365, 0, x_362);
+lean_ctor_set(x_365, 1, x_363);
+return x_365;
 }
 }
 }
 else
 {
-lean_object* x_454; lean_object* x_455; 
-lean_dec(x_402);
-lean_dec(x_399);
-lean_dec(x_371);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_454 = lean_ctor_get(x_404, 0);
-lean_inc(x_454);
-x_455 = lean_ctor_get(x_404, 1);
-lean_inc(x_455);
-lean_dec(x_404);
-x_381 = x_454;
-x_382 = x_455;
-goto block_397;
-}
-}
-else
-{
-lean_object* x_456; lean_object* x_457; 
-lean_dec(x_399);
-lean_dec(x_371);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_456 = lean_ctor_get(x_401, 0);
-lean_inc(x_456);
-x_457 = lean_ctor_get(x_401, 1);
-lean_inc(x_457);
-lean_dec(x_401);
-x_381 = x_456;
-x_382 = x_457;
-goto block_397;
-}
-block_380:
-{
-lean_object* x_376; lean_object* x_377; lean_object* x_378; 
-lean_inc(x_374);
-x_376 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_376, 0, x_1);
-lean_ctor_set(x_376, 1, x_374);
-x_377 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_377, 0, x_376);
-lean_ctor_set(x_377, 1, x_12);
-x_378 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_378, 0, x_7);
-lean_ctor_set(x_378, 1, x_8);
-lean_ctor_set(x_378, 2, x_9);
-lean_ctor_set(x_378, 3, x_342);
-lean_ctor_set(x_378, 4, x_11);
-lean_ctor_set(x_378, 5, x_377);
-lean_ctor_set(x_378, 6, x_351);
-x_1 = x_374;
-x_2 = x_378;
-x_3 = x_375;
-goto _start;
-}
-block_397:
-{
-if (lean_obj_tag(x_381) == 0)
-{
-lean_object* x_383; 
-lean_dec(x_368);
-lean_dec(x_358);
-lean_dec(x_1);
-if (lean_is_scalar(x_373)) {
- x_383 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_383 = x_373;
- lean_ctor_set_tag(x_383, 1);
-}
-lean_ctor_set(x_383, 0, x_381);
-lean_ctor_set(x_383, 1, x_382);
-return x_383;
-}
-else
-{
-lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; 
-lean_dec(x_373);
-x_384 = l_Lean_Name_toString___closed__1;
-x_385 = l_Lean_Name_toStringWithSep___main(x_384, x_368);
-x_386 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_386, 0, x_385);
-x_387 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_387, 0, x_386);
-x_388 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
-x_389 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_389, 0, x_388);
-lean_ctor_set(x_389, 1, x_387);
-x_390 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
-x_391 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_391, 0, x_389);
-lean_ctor_set(x_391, 1, x_390);
-x_392 = l_Lean_Elab_Command_throwError___rarg(x_1, x_391, x_358, x_382);
-lean_dec(x_1);
-x_393 = lean_ctor_get(x_392, 0);
-lean_inc(x_393);
-x_394 = lean_ctor_get(x_392, 1);
-lean_inc(x_394);
-if (lean_is_exclusive(x_392)) {
- lean_ctor_release(x_392, 0);
- lean_ctor_release(x_392, 1);
- x_395 = x_392;
-} else {
- lean_dec_ref(x_392);
- x_395 = lean_box(0);
-}
-if (lean_is_scalar(x_395)) {
- x_396 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_396 = x_395;
-}
-lean_ctor_set(x_396, 0, x_393);
-lean_ctor_set(x_396, 1, x_394);
-return x_396;
-}
-}
-}
-else
-{
-lean_object* x_458; lean_object* x_459; lean_object* x_460; lean_object* x_461; 
-lean_dec(x_368);
-lean_dec(x_358);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_458 = lean_ctor_get(x_370, 0);
-lean_inc(x_458);
-x_459 = lean_ctor_get(x_370, 1);
-lean_inc(x_459);
-if (lean_is_exclusive(x_370)) {
- lean_ctor_release(x_370, 0);
- lean_ctor_release(x_370, 1);
- x_460 = x_370;
-} else {
- lean_dec_ref(x_370);
- x_460 = lean_box(0);
-}
-if (lean_is_scalar(x_460)) {
- x_461 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_461 = x_460;
-}
-lean_ctor_set(x_461, 0, x_458);
-lean_ctor_set(x_461, 1, x_459);
-return x_461;
-}
-}
-else
-{
-lean_object* x_462; lean_object* x_463; 
-lean_dec(x_368);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_462 = lean_ctor_get(x_369, 0);
-lean_inc(x_462);
-lean_dec(x_369);
-x_463 = l___private_Init_Lean_Elab_Command_5__elabCommandUsing___main(x_361, x_1, x_462, x_358, x_362);
-return x_463;
-}
-}
-else
-{
-lean_object* x_464; lean_object* x_465; lean_object* x_466; lean_object* x_467; 
-lean_dec(x_358);
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_464 = lean_ctor_get(x_360, 0);
-lean_inc(x_464);
-x_465 = lean_ctor_get(x_360, 1);
-lean_inc(x_465);
-if (lean_is_exclusive(x_360)) {
- lean_ctor_release(x_360, 0);
- lean_ctor_release(x_360, 1);
- x_466 = x_360;
-} else {
- lean_dec_ref(x_360);
- x_466 = lean_box(0);
-}
-if (lean_is_scalar(x_466)) {
- x_467 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_467 = x_466;
-}
-lean_ctor_set(x_467, 0, x_464);
-lean_ctor_set(x_467, 1, x_465);
-return x_467;
-}
-}
-}
-else
-{
-lean_object* x_493; lean_object* x_494; lean_object* x_495; lean_object* x_496; 
-lean_dec(x_351);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_493 = lean_ctor_get(x_356, 0);
-lean_inc(x_493);
-x_494 = lean_ctor_get(x_356, 1);
-lean_inc(x_494);
-if (lean_is_exclusive(x_356)) {
- lean_ctor_release(x_356, 0);
- lean_ctor_release(x_356, 1);
- x_495 = x_356;
-} else {
- lean_dec_ref(x_356);
- x_495 = lean_box(0);
-}
-if (lean_is_scalar(x_495)) {
- x_496 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_496 = x_495;
-}
-lean_ctor_set(x_496, 0, x_493);
-lean_ctor_set(x_496, 1, x_494);
-return x_496;
-}
-}
-else
-{
-lean_object* x_497; lean_object* x_498; lean_object* x_499; lean_object* x_500; 
-lean_dec(x_343);
-lean_dec(x_342);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_497 = lean_ctor_get(x_344, 0);
-lean_inc(x_497);
-x_498 = lean_ctor_get(x_344, 1);
-lean_inc(x_498);
-if (lean_is_exclusive(x_344)) {
- lean_ctor_release(x_344, 0);
- lean_ctor_release(x_344, 1);
- x_499 = x_344;
-} else {
- lean_dec_ref(x_344);
- x_499 = lean_box(0);
-}
-if (lean_is_scalar(x_499)) {
- x_500 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_500 = x_499;
-}
-lean_ctor_set(x_500, 0, x_497);
-lean_ctor_set(x_500, 1, x_498);
-return x_500;
-}
-}
-}
-else
-{
-lean_object* x_501; lean_object* x_502; uint8_t x_503; 
+lean_object* x_366; lean_object* x_367; uint8_t x_368; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -7729,51 +6791,51 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_501 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
-x_502 = l_Lean_Elab_Command_throwError___rarg(x_1, x_501, x_2, x_6);
+x_366 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
+x_367 = l_Lean_Elab_Command_throwError___rarg(x_1, x_366, x_2, x_6);
 lean_dec(x_1);
-x_503 = !lean_is_exclusive(x_502);
-if (x_503 == 0)
+x_368 = !lean_is_exclusive(x_367);
+if (x_368 == 0)
 {
-return x_502;
+return x_367;
 }
 else
 {
-lean_object* x_504; lean_object* x_505; lean_object* x_506; 
-x_504 = lean_ctor_get(x_502, 0);
-x_505 = lean_ctor_get(x_502, 1);
-lean_inc(x_505);
-lean_inc(x_504);
-lean_dec(x_502);
-x_506 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_506, 0, x_504);
-lean_ctor_set(x_506, 1, x_505);
-return x_506;
+lean_object* x_369; lean_object* x_370; lean_object* x_371; 
+x_369 = lean_ctor_get(x_367, 0);
+x_370 = lean_ctor_get(x_367, 1);
+lean_inc(x_370);
+lean_inc(x_369);
+lean_dec(x_367);
+x_371 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_371, 0, x_369);
+lean_ctor_set(x_371, 1, x_370);
+return x_371;
 }
 }
 }
 else
 {
-uint8_t x_507; 
+uint8_t x_372; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_507 = !lean_is_exclusive(x_4);
-if (x_507 == 0)
+x_372 = !lean_is_exclusive(x_4);
+if (x_372 == 0)
 {
 return x_4;
 }
 else
 {
-lean_object* x_508; lean_object* x_509; lean_object* x_510; 
-x_508 = lean_ctor_get(x_4, 0);
-x_509 = lean_ctor_get(x_4, 1);
-lean_inc(x_509);
-lean_inc(x_508);
+lean_object* x_373; lean_object* x_374; lean_object* x_375; 
+x_373 = lean_ctor_get(x_4, 0);
+x_374 = lean_ctor_get(x_4, 1);
+lean_inc(x_374);
+lean_inc(x_373);
 lean_dec(x_4);
-x_510 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_510, 0, x_508);
-lean_ctor_set(x_510, 1, x_509);
-return x_510;
+x_375 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_375, 0, x_373);
+lean_ctor_set(x_375, 1, x_374);
+return x_375;
 }
 }
 }
@@ -23859,12 +22921,6 @@ l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3 = _init_l_Lean_Elab_
 lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__3);
 l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4 = _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4();
 lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__4);
-l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5 = _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5();
-lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__5);
-l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6 = _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6();
-lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__6);
-l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7 = _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7();
-lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter___closed__7);
 l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter = _init_l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter();
 lean_mark_persistent(l_Lean_Elab_Command_Lean_Elab_MonadMacroAdapter);
 l_Lean_Elab_Command_elabCommand___main___closed__1 = _init_l_Lean_Elab_Command_elabCommand___main___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/SynthesizeSyntheticMVars.c b/stage0/stdlib/Init/Lean/Elab/SynthesizeSyntheticMVars.c
index 80125951e4..68df7587be 100644
--- a/stage0/stdlib/Init/Lean/Elab/SynthesizeSyntheticMVars.c
+++ b/stage0/stdlib/Init/Lean/Elab/SynthesizeSyntheticMVars.c
@@ -35,6 +35,7 @@ lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_5__synthesizeSy
 lean_object* l_Lean_mkMVar(lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_6__synthesizeSyntheticMVarsStep___closed__6;
 lean_object* l_Lean_Elab_Term_liftTacticElabM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_9__getSomeSynthethicMVarsRef___rarg___closed__1;
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
@@ -51,6 +52,7 @@ lean_object* l_Lean_Elab_Term_assignExprMVar(lean_object*, lean_object*, lean_ob
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_1__resumeElabTerm(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1(lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_3__synthesizePendingInstMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_7__synthesizeUsingDefault___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getOptions(lean_object*, lean_object*);
@@ -64,7 +66,6 @@ lean_object* l_ReaderT_bind___at_Lean_Elab_Tactic_monadLog___spec__2___rarg(lean
 lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_7__synthesizeUsingDefault___spec__1___lambda__1___closed__3;
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_6__synthesizeSyntheticMVarsStep___closed__7;
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_4__checkWithDefault(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMVarDecl___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_7__synthesizeUsingDefault(lean_object*, lean_object*);
 lean_object* l_List_forM___main___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_8__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3;
@@ -126,6 +127,7 @@ lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_SynthesizeSy
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_10__synthesizeSyntheticMVarsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_6__synthesizeSyntheticMVarsStep___closed__4;
 lean_object* l_List_forM___main___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_8__reportStuckSyntheticMVars___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_10__synthesizeSyntheticMVarsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_6__synthesizeSyntheticMVarsStep___spec__2___closed__3;
@@ -1534,6 +1536,22 @@ x_7 = l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_1__resumeElabTerm(x_1,
 return x_7;
 }
 }
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = lean_apply_1(x_1, x_3);
+return x_4;
+}
+}
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg___boxed), 3, 0);
+return x_2;
+}
+}
 lean_object* _init_l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___lambda__1___closed__1() {
 _start:
 {
@@ -1819,7 +1837,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_EStateM_MonadState___closed__2;
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed), 3, 1);
+x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -1844,6 +1862,15 @@ lean_dec(x_3);
 return x_11;
 }
 }
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_ReaderT_lift___at___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___spec__1___rarg(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* l___private_Init_Lean_Elab_SynthesizeSyntheticMVars_2__resumePostponed___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Lean/Elab/Tactic/Basic.c b/stage0/stdlib/Init/Lean/Elab/Tactic/Basic.c
index 4797e2dff3..1c88ae62c2 100644
--- a/stage0/stdlib/Init/Lean/Elab/Tactic/Basic.c
+++ b/stage0/stdlib/Init/Lean/Elab/Tactic/Basic.c
@@ -24,7 +24,6 @@ lean_object* l_Lean_Elab_Tactic_getLocalInsts___boxed(lean_object*, lean_object*
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_withMVarContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_contains___at_Lean_Elab_Tactic_addBuiltinTactic___spec__4(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7;
 lean_object* l_Lean_Elab_Tactic_evalTactic___main___closed__3;
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_Tactic_evalTactic___main___spec__2(lean_object*, lean_object*);
@@ -54,7 +53,6 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSkip(lean_object*, lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
 lean_object* l_Lean_Elab_Tactic_reportUnsolvedGoals(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_trace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Tactic_Basic_1__evalTacticUsing(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_focus(lean_object*);
@@ -128,7 +126,6 @@ lean_object* l_Lean_Elab_Tactic_tacticElabAttribute___closed__2;
 extern lean_object* l_Lean_AttributeImpl_inhabited___closed__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_collectMVars___closed__1;
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_registerBuiltinTacticAttr___closed__1;
 lean_object* l___private_Init_Lean_Elab_Tactic_Basic_3__getIntrosSize___main___boxed(lean_object*);
 lean_object* l_Lean_Elab_Tactic_getMainGoal___closed__2;
@@ -171,7 +168,6 @@ lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Tactic_evalTactic___main___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_dbgTrace___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Tactic_seq___elambda__1___closed__3;
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_addContext(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSeq___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_EStateM_Backtrackable;
@@ -193,7 +189,6 @@ lean_object* l_Lean_Elab_Tactic_monadLog___lambda__2(lean_object*, lean_object*,
 lean_object* l_Lean_Elab_Tactic_resetSynthInstanceCache___closed__1;
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalAssumption___closed__2;
 extern lean_object* l_Lean_Parser_Tactic_intro___elambda__1___closed__2;
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1(lean_object*);
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalOrelse(lean_object*);
 uint8_t l_Array_isEqvAux___main___at_Lean_Elab_Tactic_withMVarContext___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_Lean_Name_hash(lean_object*);
@@ -233,7 +228,6 @@ lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4;
 lean_object* l_Lean_Elab_Tactic_getMainModule___rarg(lean_object*);
 lean_object* l_Lean_Elab_Tactic_withLCtx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalTraceState(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8;
 uint8_t l_coeDecidableEq(uint8_t);
 lean_object* l_ReaderT_read___at_Lean_Elab_Tactic_monadLog___spec__1(lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
@@ -291,7 +285,6 @@ lean_object* l_Lean_Elab_goalsToMessageData(lean_object*);
 lean_object* l_Lean_Elab_Term_liftMetaM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_MetavarContext_isAnonymousMVar(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_registerBuiltinTacticAttr___lambda__1___closed__4;
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5;
 lean_object* l_Lean_Elab_Tactic_evalAssumption___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at_Lean_Elab_Tactic_evalTactic___main___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_declareBuiltinTactic___closed__4;
@@ -364,7 +357,6 @@ lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_liftTermElabM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getOptions(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_tacticElabAttribute___closed__5;
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6;
 lean_object* l_Lean_Elab_Tactic_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Tactic_evalTraceState___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getEnv___rarg(lean_object*);
@@ -406,7 +398,6 @@ lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalIntro___closed__2;
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalIntros___closed__2;
 lean_object* l_Lean_Elab_Tactic_monadLog___closed__11;
 lean_object* l_Lean_SMap_contains___at_Lean_Elab_Tactic_addBuiltinTactic___spec__1___boxed(lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Tactic_evalTraceState___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_collectMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalInstance_beq(lean_object*, lean_object*);
@@ -454,19 +445,16 @@ lean_object* l_Lean_Elab_Term_reportUnsolvedGoals___closed__2;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
 lean_object* l_Lean_Elab_Tactic_traceAtCmdPos(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_initAttr;
-extern lean_object* l_EStateM_MonadState___closed__2;
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getLCtx(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__1;
 lean_object* l_Lean_Elab_Tactic_expandTacticMacro(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getEnv___boxed(lean_object*);
 extern lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___elambda__1___closed__2;
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalParen___closed__2;
 lean_object* l_Lean_Elab_mkMessageAt___at_Lean_Elab_Tactic_evalTraceState___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalIntro___closed__1;
 lean_object* l_AssocList_contains___main___at_Lean_Elab_Tactic_addBuiltinTactic___spec__3___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_monadLog___closed__4;
 lean_object* l_Lean_Elab_Tactic_getMCtx(lean_object*);
 lean_object* l_Lean_Elab_Tactic_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -4352,290 +4340,15 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_withMacroExpansion___rarg),
 return x_2;
 }
 }
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = lean_apply_1(x_1, x_3);
-return x_4;
-}
-}
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed), 3, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_4 = lean_ctor_get(x_1, 0);
-x_5 = lean_ctor_get(x_4, 0);
-x_6 = lean_ctor_get(x_5, 3);
-lean_inc(x_6);
-x_7 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_7, 0, x_6);
-lean_ctor_set(x_7, 1, x_3);
-return x_7;
-}
-}
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_3, 0);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_4, 0);
-lean_inc(x_5);
-x_6 = !lean_is_exclusive(x_3);
-if (x_6 == 0)
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_ctor_get(x_3, 0);
-lean_dec(x_7);
-x_8 = !lean_is_exclusive(x_4);
-if (x_8 == 0)
-{
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_ctor_get(x_4, 0);
-lean_dec(x_9);
-x_10 = !lean_is_exclusive(x_5);
-if (x_10 == 0)
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_11 = lean_ctor_get(x_5, 3);
-lean_dec(x_11);
-lean_ctor_set(x_5, 3, x_1);
-x_12 = lean_box(0);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_14 = lean_ctor_get(x_5, 0);
-x_15 = lean_ctor_get(x_5, 1);
-x_16 = lean_ctor_get(x_5, 2);
-x_17 = lean_ctor_get(x_5, 4);
-x_18 = lean_ctor_get(x_5, 5);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_5);
-x_19 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_19, 0, x_14);
-lean_ctor_set(x_19, 1, x_15);
-lean_ctor_set(x_19, 2, x_16);
-lean_ctor_set(x_19, 3, x_1);
-lean_ctor_set(x_19, 4, x_17);
-lean_ctor_set(x_19, 5, x_18);
-lean_ctor_set(x_4, 0, x_19);
-x_20 = lean_box(0);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set(x_21, 1, x_3);
-return x_21;
-}
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_22 = lean_ctor_get(x_4, 1);
-x_23 = lean_ctor_get(x_4, 2);
-x_24 = lean_ctor_get(x_4, 3);
-x_25 = lean_ctor_get(x_4, 4);
-x_26 = lean_ctor_get(x_4, 5);
-lean_inc(x_26);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_4);
-x_27 = lean_ctor_get(x_5, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_5, 1);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_5, 2);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_5, 4);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_5, 5);
-lean_inc(x_31);
-if (lean_is_exclusive(x_5)) {
- lean_ctor_release(x_5, 0);
- lean_ctor_release(x_5, 1);
- lean_ctor_release(x_5, 2);
- lean_ctor_release(x_5, 3);
- lean_ctor_release(x_5, 4);
- lean_ctor_release(x_5, 5);
- x_32 = x_5;
-} else {
- lean_dec_ref(x_5);
- x_32 = lean_box(0);
-}
-if (lean_is_scalar(x_32)) {
- x_33 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_33 = x_32;
-}
-lean_ctor_set(x_33, 0, x_27);
-lean_ctor_set(x_33, 1, x_28);
-lean_ctor_set(x_33, 2, x_29);
-lean_ctor_set(x_33, 3, x_1);
-lean_ctor_set(x_33, 4, x_30);
-lean_ctor_set(x_33, 5, x_31);
-x_34 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_22);
-lean_ctor_set(x_34, 2, x_23);
-lean_ctor_set(x_34, 3, x_24);
-lean_ctor_set(x_34, 4, x_25);
-lean_ctor_set(x_34, 5, x_26);
-lean_ctor_set(x_3, 0, x_34);
-x_35 = lean_box(0);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_3);
-return x_36;
-}
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_37 = lean_ctor_get(x_3, 1);
-lean_inc(x_37);
-lean_dec(x_3);
-x_38 = lean_ctor_get(x_4, 1);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_4, 2);
-lean_inc(x_39);
-x_40 = lean_ctor_get(x_4, 3);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_4, 4);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_4, 5);
-lean_inc(x_42);
-if (lean_is_exclusive(x_4)) {
- lean_ctor_release(x_4, 0);
- lean_ctor_release(x_4, 1);
- lean_ctor_release(x_4, 2);
- lean_ctor_release(x_4, 3);
- lean_ctor_release(x_4, 4);
- lean_ctor_release(x_4, 5);
- x_43 = x_4;
-} else {
- lean_dec_ref(x_4);
- x_43 = lean_box(0);
-}
-x_44 = lean_ctor_get(x_5, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_5, 1);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_5, 2);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_5, 4);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_5, 5);
-lean_inc(x_48);
-if (lean_is_exclusive(x_5)) {
- lean_ctor_release(x_5, 0);
- lean_ctor_release(x_5, 1);
- lean_ctor_release(x_5, 2);
- lean_ctor_release(x_5, 3);
- lean_ctor_release(x_5, 4);
- lean_ctor_release(x_5, 5);
- x_49 = x_5;
-} else {
- lean_dec_ref(x_5);
- x_49 = lean_box(0);
-}
-if (lean_is_scalar(x_49)) {
- x_50 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_50 = x_49;
-}
-lean_ctor_set(x_50, 0, x_44);
-lean_ctor_set(x_50, 1, x_45);
-lean_ctor_set(x_50, 2, x_46);
-lean_ctor_set(x_50, 3, x_1);
-lean_ctor_set(x_50, 4, x_47);
-lean_ctor_set(x_50, 5, x_48);
-if (lean_is_scalar(x_43)) {
- x_51 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_51 = x_43;
-}
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_38);
-lean_ctor_set(x_51, 2, x_39);
-lean_ctor_set(x_51, 3, x_40);
-lean_ctor_set(x_51, 4, x_41);
-lean_ctor_set(x_51, 5, x_42);
-x_52 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_52, 0, x_51);
-lean_ctor_set(x_52, 1, x_37);
-x_53 = lean_box(0);
-x_54 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_54, 0, x_53);
-lean_ctor_set(x_54, 1, x_52);
-return x_54;
-}
-}
-}
 lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_EStateM_MonadState___closed__2;
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed), 3, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__2() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1___boxed), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__1;
-x_2 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__2;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Tactic_monadLog___spec__2___rarg), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_getEnv___boxed), 1, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2___boxed), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6() {
+lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -4643,7 +4356,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_throwError), 1, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7() {
+lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -4651,62 +4364,30 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_throwUnsupportedSyntax), 1,
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8() {
+lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_1 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__1;
 x_2 = l_Lean_Elab_Tactic_monadQuotation___closed__1;
-x_3 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3;
-x_4 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5;
-x_5 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6;
-x_6 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7;
-x_7 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_7, 0, x_1);
-lean_ctor_set(x_7, 1, x_2);
-lean_ctor_set(x_7, 2, x_3);
-lean_ctor_set(x_7, 3, x_4);
-lean_ctor_set(x_7, 4, x_5);
-lean_ctor_set(x_7, 5, x_6);
-return x_7;
+x_3 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__2;
+x_4 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3;
+x_5 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_5, 0, x_1);
+lean_ctor_set(x_5, 1, x_2);
+lean_ctor_set(x_5, 2, x_3);
+lean_ctor_set(x_5, 3, x_4);
+return x_5;
 }
 }
 lean_object* _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8;
+x_1 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4;
 return x_1;
 }
 }
-lean_object* l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_ReaderT_lift___at_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___spec__1___rarg(x_1, x_2, x_3);
-lean_dec(x_2);
-return x_4;
-}
-}
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__1(x_1, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_4;
-}
-}
-lean_object* l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___lambda__2(x_1, x_2, x_3);
-lean_dec(x_2);
-return x_4;
-}
-}
 lean_object* l___private_Init_Lean_Elab_Tactic_Basic_2__expandTacticMacroFns___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -4735,7 +4416,7 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 x_16 = lean_ctor_get(x_3, 0);
 lean_inc(x_16);
 x_17 = lean_ctor_get(x_3, 1);
@@ -4753,853 +4434,194 @@ x_37 = lean_ctor_get(x_35, 1);
 lean_inc(x_37);
 lean_dec(x_35);
 x_38 = l_Lean_Elab_Tactic_getEnv___rarg(x_37);
-x_39 = lean_ctor_get(x_38, 1);
+x_39 = lean_ctor_get(x_38, 0);
 lean_inc(x_39);
-x_40 = lean_ctor_get(x_39, 0);
+x_40 = lean_ctor_get(x_38, 1);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_38, 0);
-lean_inc(x_42);
 lean_dec(x_38);
-x_43 = lean_ctor_get(x_39, 1);
-lean_inc(x_43);
-x_44 = !lean_is_exclusive(x_40);
-if (x_44 == 0)
+x_41 = lean_environment_main_module(x_39);
+x_42 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_36);
+lean_inc(x_2);
+x_43 = lean_apply_2(x_16, x_2, x_42);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-x_45 = lean_ctor_get(x_40, 1);
-x_46 = lean_ctor_get(x_40, 2);
-x_47 = lean_ctor_get(x_40, 3);
-x_48 = lean_ctor_get(x_40, 4);
-x_49 = lean_ctor_get(x_40, 5);
-x_50 = lean_ctor_get(x_40, 0);
-lean_dec(x_50);
-x_51 = !lean_is_exclusive(x_41);
+lean_object* x_44; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+lean_dec(x_43);
+if (lean_obj_tag(x_44) == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+lean_dec(x_44);
+x_46 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_46, 0, x_45);
+x_47 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_47, 0, x_46);
+lean_inc(x_4);
+lean_inc(x_2);
+x_48 = l_Lean_Elab_Tactic_throwError___rarg(x_2, x_47, x_4, x_40);
+if (lean_obj_tag(x_48) == 0)
+{
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_48, 1);
+lean_inc(x_50);
+lean_dec(x_48);
+x_21 = x_49;
+x_22 = x_50;
+goto block_34;
+}
+else
+{
+uint8_t x_51; 
+x_51 = !lean_is_exclusive(x_48);
 if (x_51 == 0)
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_52 = lean_ctor_get(x_41, 0);
-x_53 = lean_ctor_get(x_41, 1);
-x_54 = lean_ctor_get(x_41, 2);
-x_55 = lean_ctor_get(x_41, 3);
-x_56 = lean_ctor_get(x_41, 4);
-x_57 = lean_ctor_get(x_41, 5);
-x_58 = lean_environment_main_module(x_42);
-x_59 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_36);
-lean_inc(x_2);
-x_60 = lean_apply_3(x_16, x_2, x_59, x_55);
-if (lean_obj_tag(x_60) == 0)
-{
-uint8_t x_61; 
-x_61 = !lean_is_exclusive(x_39);
-if (x_61 == 0)
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_62 = lean_ctor_get(x_39, 1);
-lean_dec(x_62);
-x_63 = lean_ctor_get(x_39, 0);
-lean_dec(x_63);
-x_64 = lean_ctor_get(x_60, 0);
-lean_inc(x_64);
-x_65 = lean_ctor_get(x_60, 1);
-lean_inc(x_65);
-lean_dec(x_60);
-lean_ctor_set(x_41, 3, x_65);
-x_21 = x_64;
-x_22 = x_39;
-goto block_34;
-}
-else
-{
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-lean_dec(x_39);
-x_66 = lean_ctor_get(x_60, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_60, 1);
-lean_inc(x_67);
-lean_dec(x_60);
-lean_ctor_set(x_41, 3, x_67);
-x_68 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_68, 0, x_40);
-lean_ctor_set(x_68, 1, x_43);
-x_21 = x_66;
-x_22 = x_68;
-goto block_34;
-}
-}
-else
-{
-lean_object* x_69; 
-x_69 = lean_ctor_get(x_60, 0);
-lean_inc(x_69);
-if (lean_obj_tag(x_69) == 0)
-{
-uint8_t x_70; 
-x_70 = !lean_is_exclusive(x_39);
-if (x_70 == 0)
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_71 = lean_ctor_get(x_39, 1);
-lean_dec(x_71);
-x_72 = lean_ctor_get(x_39, 0);
-lean_dec(x_72);
-x_73 = lean_ctor_get(x_60, 1);
-lean_inc(x_73);
-lean_dec(x_60);
-x_74 = lean_ctor_get(x_69, 0);
-lean_inc(x_74);
-lean_dec(x_69);
-lean_ctor_set(x_41, 3, x_73);
-x_75 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_75, 0, x_74);
-x_76 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_76, 0, x_75);
-lean_inc(x_4);
-lean_inc(x_2);
-x_77 = l_Lean_Elab_Tactic_throwError___rarg(x_2, x_76, x_4, x_39);
-if (lean_obj_tag(x_77) == 0)
-{
-lean_object* x_78; lean_object* x_79; 
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_ctor_get(x_77, 1);
-lean_inc(x_79);
-lean_dec(x_77);
-x_21 = x_78;
-x_22 = x_79;
-goto block_34;
-}
-else
-{
-uint8_t x_80; 
-x_80 = !lean_is_exclusive(x_77);
-if (x_80 == 0)
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_77, 0);
-x_82 = lean_ctor_get(x_77, 1);
-x_83 = l_Lean_Elab_Tactic_restore(x_82, x_20);
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_48, 0);
+x_53 = lean_ctor_get(x_48, 1);
+x_54 = l_Lean_Elab_Tactic_restore(x_53, x_20);
 lean_dec(x_20);
 if (lean_obj_tag(x_17) == 0)
 {
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-lean_ctor_set(x_77, 1, x_83);
-return x_77;
+lean_ctor_set(x_48, 1, x_54);
+return x_48;
 }
 else
 {
-lean_free_object(x_77);
-lean_dec(x_81);
-x_3 = x_17;
-x_5 = x_83;
-goto _start;
-}
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_77, 0);
-x_86 = lean_ctor_get(x_77, 1);
-lean_inc(x_86);
-lean_inc(x_85);
-lean_dec(x_77);
-x_87 = l_Lean_Elab_Tactic_restore(x_86, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_88; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_85);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
-}
-else
-{
-lean_dec(x_85);
-x_3 = x_17;
-x_5 = x_87;
-goto _start;
-}
-}
-}
-}
-else
-{
-lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-lean_dec(x_39);
-x_90 = lean_ctor_get(x_60, 1);
-lean_inc(x_90);
-lean_dec(x_60);
-x_91 = lean_ctor_get(x_69, 0);
-lean_inc(x_91);
-lean_dec(x_69);
-lean_ctor_set(x_41, 3, x_90);
-x_92 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_92, 0, x_40);
-lean_ctor_set(x_92, 1, x_43);
-x_93 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_93, 0, x_91);
-x_94 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_94, 0, x_93);
-lean_inc(x_4);
-lean_inc(x_2);
-x_95 = l_Lean_Elab_Tactic_throwError___rarg(x_2, x_94, x_4, x_92);
-if (lean_obj_tag(x_95) == 0)
-{
-lean_object* x_96; lean_object* x_97; 
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-lean_dec(x_95);
-x_21 = x_96;
-x_22 = x_97;
-goto block_34;
-}
-else
-{
-lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_98 = lean_ctor_get(x_95, 0);
-lean_inc(x_98);
-x_99 = lean_ctor_get(x_95, 1);
-lean_inc(x_99);
-if (lean_is_exclusive(x_95)) {
- lean_ctor_release(x_95, 0);
- lean_ctor_release(x_95, 1);
- x_100 = x_95;
-} else {
- lean_dec_ref(x_95);
- x_100 = lean_box(0);
-}
-x_101 = l_Lean_Elab_Tactic_restore(x_99, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_102; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_is_scalar(x_100)) {
- x_102 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_102 = x_100;
-}
-lean_ctor_set(x_102, 0, x_98);
-lean_ctor_set(x_102, 1, x_101);
-return x_102;
-}
-else
-{
-lean_dec(x_100);
-lean_dec(x_98);
-x_3 = x_17;
-x_5 = x_101;
-goto _start;
-}
-}
-}
-}
-else
-{
-lean_object* x_104; 
-lean_dec(x_60);
-lean_free_object(x_41);
-lean_dec(x_57);
-lean_dec(x_56);
-lean_dec(x_54);
-lean_dec(x_53);
+lean_free_object(x_48);
 lean_dec(x_52);
-lean_free_object(x_40);
-lean_dec(x_49);
+x_3 = x_17;
+x_5 = x_54;
+goto _start;
+}
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_48, 0);
+x_57 = lean_ctor_get(x_48, 1);
+lean_inc(x_57);
+lean_inc(x_56);
 lean_dec(x_48);
-lean_dec(x_47);
-lean_dec(x_46);
-lean_dec(x_45);
+x_58 = l_Lean_Elab_Tactic_restore(x_57, x_20);
+lean_dec(x_20);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_59; 
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_59 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_59, 0, x_56);
+lean_ctor_set(x_59, 1, x_58);
+return x_59;
+}
+else
+{
+lean_dec(x_56);
+x_3 = x_17;
+x_5 = x_58;
+goto _start;
+}
+}
+}
+}
+else
+{
+lean_object* x_61; 
+lean_inc(x_4);
+x_61 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_4, x_40);
+if (lean_obj_tag(x_61) == 0)
+{
+lean_object* x_62; lean_object* x_63; 
+x_62 = lean_ctor_get(x_61, 0);
+lean_inc(x_62);
+x_63 = lean_ctor_get(x_61, 1);
+lean_inc(x_63);
+lean_dec(x_61);
+x_21 = x_62;
+x_22 = x_63;
+goto block_34;
+}
+else
+{
+uint8_t x_64; 
+x_64 = !lean_is_exclusive(x_61);
+if (x_64 == 0)
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_61, 0);
+x_66 = lean_ctor_get(x_61, 1);
+x_67 = l_Lean_Elab_Tactic_restore(x_66, x_20);
+lean_dec(x_20);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+lean_ctor_set(x_61, 1, x_67);
+return x_61;
+}
+else
+{
+lean_free_object(x_61);
+lean_dec(x_65);
+x_3 = x_17;
+x_5 = x_67;
+goto _start;
+}
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_61, 0);
+x_70 = lean_ctor_get(x_61, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_61);
+x_71 = l_Lean_Elab_Tactic_restore(x_70, x_20);
+lean_dec(x_20);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_72; 
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_69);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
+}
+else
+{
+lean_dec(x_69);
+x_3 = x_17;
+x_5 = x_71;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_74; 
+x_74 = lean_ctor_get(x_43, 0);
+lean_inc(x_74);
 lean_dec(x_43);
-lean_inc(x_4);
-x_104 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_4, x_39);
-if (lean_obj_tag(x_104) == 0)
-{
-lean_object* x_105; lean_object* x_106; 
-x_105 = lean_ctor_get(x_104, 0);
-lean_inc(x_105);
-x_106 = lean_ctor_get(x_104, 1);
-lean_inc(x_106);
-lean_dec(x_104);
-x_21 = x_105;
-x_22 = x_106;
+x_21 = x_74;
+x_22 = x_40;
 goto block_34;
 }
-else
-{
-uint8_t x_107; 
-x_107 = !lean_is_exclusive(x_104);
-if (x_107 == 0)
-{
-lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_108 = lean_ctor_get(x_104, 0);
-x_109 = lean_ctor_get(x_104, 1);
-x_110 = l_Lean_Elab_Tactic_restore(x_109, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-lean_ctor_set(x_104, 1, x_110);
-return x_104;
-}
-else
-{
-lean_free_object(x_104);
-lean_dec(x_108);
-x_3 = x_17;
-x_5 = x_110;
-goto _start;
-}
-}
-else
-{
-lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_112 = lean_ctor_get(x_104, 0);
-x_113 = lean_ctor_get(x_104, 1);
-lean_inc(x_113);
-lean_inc(x_112);
-lean_dec(x_104);
-x_114 = l_Lean_Elab_Tactic_restore(x_113, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_115; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_115 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_115, 0, x_112);
-lean_ctor_set(x_115, 1, x_114);
-return x_115;
-}
-else
-{
-lean_dec(x_112);
-x_3 = x_17;
-x_5 = x_114;
-goto _start;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-x_117 = lean_ctor_get(x_41, 0);
-x_118 = lean_ctor_get(x_41, 1);
-x_119 = lean_ctor_get(x_41, 2);
-x_120 = lean_ctor_get(x_41, 3);
-x_121 = lean_ctor_get(x_41, 4);
-x_122 = lean_ctor_get(x_41, 5);
-lean_inc(x_122);
-lean_inc(x_121);
-lean_inc(x_120);
-lean_inc(x_119);
-lean_inc(x_118);
-lean_inc(x_117);
-lean_dec(x_41);
-x_123 = lean_environment_main_module(x_42);
-x_124 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_36);
-lean_inc(x_2);
-x_125 = lean_apply_3(x_16, x_2, x_124, x_120);
-if (lean_obj_tag(x_125) == 0)
-{
-lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_126 = x_39;
-} else {
- lean_dec_ref(x_39);
- x_126 = lean_box(0);
-}
-x_127 = lean_ctor_get(x_125, 0);
-lean_inc(x_127);
-x_128 = lean_ctor_get(x_125, 1);
-lean_inc(x_128);
-lean_dec(x_125);
-x_129 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_129, 0, x_117);
-lean_ctor_set(x_129, 1, x_118);
-lean_ctor_set(x_129, 2, x_119);
-lean_ctor_set(x_129, 3, x_128);
-lean_ctor_set(x_129, 4, x_121);
-lean_ctor_set(x_129, 5, x_122);
-lean_ctor_set(x_40, 0, x_129);
-if (lean_is_scalar(x_126)) {
- x_130 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_130 = x_126;
-}
-lean_ctor_set(x_130, 0, x_40);
-lean_ctor_set(x_130, 1, x_43);
-x_21 = x_127;
-x_22 = x_130;
-goto block_34;
-}
-else
-{
-lean_object* x_131; 
-x_131 = lean_ctor_get(x_125, 0);
-lean_inc(x_131);
-if (lean_obj_tag(x_131) == 0)
-{
-lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_132 = x_39;
-} else {
- lean_dec_ref(x_39);
- x_132 = lean_box(0);
-}
-x_133 = lean_ctor_get(x_125, 1);
-lean_inc(x_133);
-lean_dec(x_125);
-x_134 = lean_ctor_get(x_131, 0);
-lean_inc(x_134);
-lean_dec(x_131);
-x_135 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_135, 0, x_117);
-lean_ctor_set(x_135, 1, x_118);
-lean_ctor_set(x_135, 2, x_119);
-lean_ctor_set(x_135, 3, x_133);
-lean_ctor_set(x_135, 4, x_121);
-lean_ctor_set(x_135, 5, x_122);
-lean_ctor_set(x_40, 0, x_135);
-if (lean_is_scalar(x_132)) {
- x_136 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_136 = x_132;
-}
-lean_ctor_set(x_136, 0, x_40);
-lean_ctor_set(x_136, 1, x_43);
-x_137 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_137, 0, x_134);
-x_138 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_138, 0, x_137);
-lean_inc(x_4);
-lean_inc(x_2);
-x_139 = l_Lean_Elab_Tactic_throwError___rarg(x_2, x_138, x_4, x_136);
-if (lean_obj_tag(x_139) == 0)
-{
-lean_object* x_140; lean_object* x_141; 
-x_140 = lean_ctor_get(x_139, 0);
-lean_inc(x_140);
-x_141 = lean_ctor_get(x_139, 1);
-lean_inc(x_141);
-lean_dec(x_139);
-x_21 = x_140;
-x_22 = x_141;
-goto block_34;
-}
-else
-{
-lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
-x_142 = lean_ctor_get(x_139, 0);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_139, 1);
-lean_inc(x_143);
-if (lean_is_exclusive(x_139)) {
- lean_ctor_release(x_139, 0);
- lean_ctor_release(x_139, 1);
- x_144 = x_139;
-} else {
- lean_dec_ref(x_139);
- x_144 = lean_box(0);
-}
-x_145 = l_Lean_Elab_Tactic_restore(x_143, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_146; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_is_scalar(x_144)) {
- x_146 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_146 = x_144;
-}
-lean_ctor_set(x_146, 0, x_142);
-lean_ctor_set(x_146, 1, x_145);
-return x_146;
-}
-else
-{
-lean_dec(x_144);
-lean_dec(x_142);
-x_3 = x_17;
-x_5 = x_145;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_148; 
-lean_dec(x_125);
-lean_dec(x_122);
-lean_dec(x_121);
-lean_dec(x_119);
-lean_dec(x_118);
-lean_dec(x_117);
-lean_free_object(x_40);
-lean_dec(x_49);
-lean_dec(x_48);
-lean_dec(x_47);
-lean_dec(x_46);
-lean_dec(x_45);
-lean_dec(x_43);
-lean_inc(x_4);
-x_148 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_4, x_39);
-if (lean_obj_tag(x_148) == 0)
-{
-lean_object* x_149; lean_object* x_150; 
-x_149 = lean_ctor_get(x_148, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_148, 1);
-lean_inc(x_150);
-lean_dec(x_148);
-x_21 = x_149;
-x_22 = x_150;
-goto block_34;
-}
-else
-{
-lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; 
-x_151 = lean_ctor_get(x_148, 0);
-lean_inc(x_151);
-x_152 = lean_ctor_get(x_148, 1);
-lean_inc(x_152);
-if (lean_is_exclusive(x_148)) {
- lean_ctor_release(x_148, 0);
- lean_ctor_release(x_148, 1);
- x_153 = x_148;
-} else {
- lean_dec_ref(x_148);
- x_153 = lean_box(0);
-}
-x_154 = l_Lean_Elab_Tactic_restore(x_152, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_155; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_is_scalar(x_153)) {
- x_155 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_155 = x_153;
-}
-lean_ctor_set(x_155, 0, x_151);
-lean_ctor_set(x_155, 1, x_154);
-return x_155;
-}
-else
-{
-lean_dec(x_153);
-lean_dec(x_151);
-x_3 = x_17;
-x_5 = x_154;
-goto _start;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-x_157 = lean_ctor_get(x_40, 1);
-x_158 = lean_ctor_get(x_40, 2);
-x_159 = lean_ctor_get(x_40, 3);
-x_160 = lean_ctor_get(x_40, 4);
-x_161 = lean_ctor_get(x_40, 5);
-lean_inc(x_161);
-lean_inc(x_160);
-lean_inc(x_159);
-lean_inc(x_158);
-lean_inc(x_157);
-lean_dec(x_40);
-x_162 = lean_ctor_get(x_41, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_41, 1);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_41, 2);
-lean_inc(x_164);
-x_165 = lean_ctor_get(x_41, 3);
-lean_inc(x_165);
-x_166 = lean_ctor_get(x_41, 4);
-lean_inc(x_166);
-x_167 = lean_ctor_get(x_41, 5);
-lean_inc(x_167);
-if (lean_is_exclusive(x_41)) {
- lean_ctor_release(x_41, 0);
- lean_ctor_release(x_41, 1);
- lean_ctor_release(x_41, 2);
- lean_ctor_release(x_41, 3);
- lean_ctor_release(x_41, 4);
- lean_ctor_release(x_41, 5);
- x_168 = x_41;
-} else {
- lean_dec_ref(x_41);
- x_168 = lean_box(0);
-}
-x_169 = lean_environment_main_module(x_42);
-x_170 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_36);
-lean_inc(x_2);
-x_171 = lean_apply_3(x_16, x_2, x_170, x_165);
-if (lean_obj_tag(x_171) == 0)
-{
-lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; 
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_172 = x_39;
-} else {
- lean_dec_ref(x_39);
- x_172 = lean_box(0);
-}
-x_173 = lean_ctor_get(x_171, 0);
-lean_inc(x_173);
-x_174 = lean_ctor_get(x_171, 1);
-lean_inc(x_174);
-lean_dec(x_171);
-if (lean_is_scalar(x_168)) {
- x_175 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_175 = x_168;
-}
-lean_ctor_set(x_175, 0, x_162);
-lean_ctor_set(x_175, 1, x_163);
-lean_ctor_set(x_175, 2, x_164);
-lean_ctor_set(x_175, 3, x_174);
-lean_ctor_set(x_175, 4, x_166);
-lean_ctor_set(x_175, 5, x_167);
-x_176 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_176, 0, x_175);
-lean_ctor_set(x_176, 1, x_157);
-lean_ctor_set(x_176, 2, x_158);
-lean_ctor_set(x_176, 3, x_159);
-lean_ctor_set(x_176, 4, x_160);
-lean_ctor_set(x_176, 5, x_161);
-if (lean_is_scalar(x_172)) {
- x_177 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_177 = x_172;
-}
-lean_ctor_set(x_177, 0, x_176);
-lean_ctor_set(x_177, 1, x_43);
-x_21 = x_173;
-x_22 = x_177;
-goto block_34;
-}
-else
-{
-lean_object* x_178; 
-x_178 = lean_ctor_get(x_171, 0);
-lean_inc(x_178);
-if (lean_obj_tag(x_178) == 0)
-{
-lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_179 = x_39;
-} else {
- lean_dec_ref(x_39);
- x_179 = lean_box(0);
-}
-x_180 = lean_ctor_get(x_171, 1);
-lean_inc(x_180);
-lean_dec(x_171);
-x_181 = lean_ctor_get(x_178, 0);
-lean_inc(x_181);
-lean_dec(x_178);
-if (lean_is_scalar(x_168)) {
- x_182 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_182 = x_168;
-}
-lean_ctor_set(x_182, 0, x_162);
-lean_ctor_set(x_182, 1, x_163);
-lean_ctor_set(x_182, 2, x_164);
-lean_ctor_set(x_182, 3, x_180);
-lean_ctor_set(x_182, 4, x_166);
-lean_ctor_set(x_182, 5, x_167);
-x_183 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_183, 0, x_182);
-lean_ctor_set(x_183, 1, x_157);
-lean_ctor_set(x_183, 2, x_158);
-lean_ctor_set(x_183, 3, x_159);
-lean_ctor_set(x_183, 4, x_160);
-lean_ctor_set(x_183, 5, x_161);
-if (lean_is_scalar(x_179)) {
- x_184 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_184 = x_179;
-}
-lean_ctor_set(x_184, 0, x_183);
-lean_ctor_set(x_184, 1, x_43);
-x_185 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_185, 0, x_181);
-x_186 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_186, 0, x_185);
-lean_inc(x_4);
-lean_inc(x_2);
-x_187 = l_Lean_Elab_Tactic_throwError___rarg(x_2, x_186, x_4, x_184);
-if (lean_obj_tag(x_187) == 0)
-{
-lean_object* x_188; lean_object* x_189; 
-x_188 = lean_ctor_get(x_187, 0);
-lean_inc(x_188);
-x_189 = lean_ctor_get(x_187, 1);
-lean_inc(x_189);
-lean_dec(x_187);
-x_21 = x_188;
-x_22 = x_189;
-goto block_34;
-}
-else
-{
-lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; 
-x_190 = lean_ctor_get(x_187, 0);
-lean_inc(x_190);
-x_191 = lean_ctor_get(x_187, 1);
-lean_inc(x_191);
-if (lean_is_exclusive(x_187)) {
- lean_ctor_release(x_187, 0);
- lean_ctor_release(x_187, 1);
- x_192 = x_187;
-} else {
- lean_dec_ref(x_187);
- x_192 = lean_box(0);
-}
-x_193 = l_Lean_Elab_Tactic_restore(x_191, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_194; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_is_scalar(x_192)) {
- x_194 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_194 = x_192;
-}
-lean_ctor_set(x_194, 0, x_190);
-lean_ctor_set(x_194, 1, x_193);
-return x_194;
-}
-else
-{
-lean_dec(x_192);
-lean_dec(x_190);
-x_3 = x_17;
-x_5 = x_193;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_196; 
-lean_dec(x_171);
-lean_dec(x_168);
-lean_dec(x_167);
-lean_dec(x_166);
-lean_dec(x_164);
-lean_dec(x_163);
-lean_dec(x_162);
-lean_dec(x_161);
-lean_dec(x_160);
-lean_dec(x_159);
-lean_dec(x_158);
-lean_dec(x_157);
-lean_dec(x_43);
-lean_inc(x_4);
-x_196 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_4, x_39);
-if (lean_obj_tag(x_196) == 0)
-{
-lean_object* x_197; lean_object* x_198; 
-x_197 = lean_ctor_get(x_196, 0);
-lean_inc(x_197);
-x_198 = lean_ctor_get(x_196, 1);
-lean_inc(x_198);
-lean_dec(x_196);
-x_21 = x_197;
-x_22 = x_198;
-goto block_34;
-}
-else
-{
-lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
-x_199 = lean_ctor_get(x_196, 0);
-lean_inc(x_199);
-x_200 = lean_ctor_get(x_196, 1);
-lean_inc(x_200);
-if (lean_is_exclusive(x_196)) {
- lean_ctor_release(x_196, 0);
- lean_ctor_release(x_196, 1);
- x_201 = x_196;
-} else {
- lean_dec_ref(x_196);
- x_201 = lean_box(0);
-}
-x_202 = l_Lean_Elab_Tactic_restore(x_200, x_20);
-lean_dec(x_20);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_203; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_is_scalar(x_201)) {
- x_203 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_203 = x_201;
-}
-lean_ctor_set(x_203, 0, x_199);
-lean_ctor_set(x_203, 1, x_202);
-return x_203;
-}
-else
-{
-lean_dec(x_201);
-lean_dec(x_199);
-x_3 = x_17;
-x_5 = x_202;
-goto _start;
-}
-}
-}
-}
-}
 block_34:
 {
 lean_object* x_23; 
@@ -5971,7 +4993,7 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 x_15 = lean_ctor_get(x_2, 0);
 lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
@@ -5989,844 +5011,190 @@ x_36 = lean_ctor_get(x_34, 1);
 lean_inc(x_36);
 lean_dec(x_34);
 x_37 = l_Lean_Elab_Tactic_getEnv___rarg(x_36);
-x_38 = lean_ctor_get(x_37, 1);
+x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
-x_39 = lean_ctor_get(x_38, 0);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_37, 0);
-lean_inc(x_41);
 lean_dec(x_37);
-x_42 = lean_ctor_get(x_38, 1);
-lean_inc(x_42);
-x_43 = !lean_is_exclusive(x_39);
-if (x_43 == 0)
+x_40 = lean_environment_main_module(x_38);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_35);
+lean_inc(x_1);
+x_42 = lean_apply_2(x_15, x_1, x_41);
+if (lean_obj_tag(x_42) == 0)
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
-x_44 = lean_ctor_get(x_39, 1);
-x_45 = lean_ctor_get(x_39, 2);
-x_46 = lean_ctor_get(x_39, 3);
-x_47 = lean_ctor_get(x_39, 4);
-x_48 = lean_ctor_get(x_39, 5);
-x_49 = lean_ctor_get(x_39, 0);
-lean_dec(x_49);
-x_50 = !lean_is_exclusive(x_40);
+lean_object* x_43; 
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+lean_dec(x_42);
+if (lean_obj_tag(x_43) == 0)
+{
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_45, 0, x_44);
+x_46 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_inc(x_3);
+lean_inc(x_1);
+x_47 = l_Lean_Elab_Tactic_throwError___rarg(x_1, x_46, x_3, x_39);
+if (lean_obj_tag(x_47) == 0)
+{
+lean_object* x_48; lean_object* x_49; 
+x_48 = lean_ctor_get(x_47, 0);
+lean_inc(x_48);
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+lean_dec(x_47);
+x_20 = x_48;
+x_21 = x_49;
+goto block_33;
+}
+else
+{
+uint8_t x_50; 
+x_50 = !lean_is_exclusive(x_47);
 if (x_50 == 0)
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_51 = lean_ctor_get(x_40, 0);
-x_52 = lean_ctor_get(x_40, 1);
-x_53 = lean_ctor_get(x_40, 2);
-x_54 = lean_ctor_get(x_40, 3);
-x_55 = lean_ctor_get(x_40, 4);
-x_56 = lean_ctor_get(x_40, 5);
-x_57 = lean_environment_main_module(x_41);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_35);
-lean_inc(x_1);
-x_59 = lean_apply_3(x_15, x_1, x_58, x_54);
-if (lean_obj_tag(x_59) == 0)
-{
-uint8_t x_60; 
-x_60 = !lean_is_exclusive(x_38);
-if (x_60 == 0)
-{
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_61 = lean_ctor_get(x_38, 1);
-lean_dec(x_61);
-x_62 = lean_ctor_get(x_38, 0);
-lean_dec(x_62);
-x_63 = lean_ctor_get(x_59, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_59, 1);
-lean_inc(x_64);
-lean_dec(x_59);
-lean_ctor_set(x_40, 3, x_64);
-x_20 = x_63;
-x_21 = x_38;
-goto block_33;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_dec(x_38);
-x_65 = lean_ctor_get(x_59, 0);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_59, 1);
-lean_inc(x_66);
-lean_dec(x_59);
-lean_ctor_set(x_40, 3, x_66);
-x_67 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_67, 0, x_39);
-lean_ctor_set(x_67, 1, x_42);
-x_20 = x_65;
-x_21 = x_67;
-goto block_33;
-}
-}
-else
-{
-lean_object* x_68; 
-x_68 = lean_ctor_get(x_59, 0);
-lean_inc(x_68);
-if (lean_obj_tag(x_68) == 0)
-{
-uint8_t x_69; 
-x_69 = !lean_is_exclusive(x_38);
-if (x_69 == 0)
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_70 = lean_ctor_get(x_38, 1);
-lean_dec(x_70);
-x_71 = lean_ctor_get(x_38, 0);
-lean_dec(x_71);
-x_72 = lean_ctor_get(x_59, 1);
-lean_inc(x_72);
-lean_dec(x_59);
-x_73 = lean_ctor_get(x_68, 0);
-lean_inc(x_73);
-lean_dec(x_68);
-lean_ctor_set(x_40, 3, x_72);
-x_74 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_74, 0, x_73);
-x_75 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_75, 0, x_74);
-lean_inc(x_3);
-lean_inc(x_1);
-x_76 = l_Lean_Elab_Tactic_throwError___rarg(x_1, x_75, x_3, x_38);
-if (lean_obj_tag(x_76) == 0)
-{
-lean_object* x_77; lean_object* x_78; 
-x_77 = lean_ctor_get(x_76, 0);
-lean_inc(x_77);
-x_78 = lean_ctor_get(x_76, 1);
-lean_inc(x_78);
-lean_dec(x_76);
-x_20 = x_77;
-x_21 = x_78;
-goto block_33;
-}
-else
-{
-uint8_t x_79; 
-x_79 = !lean_is_exclusive(x_76);
-if (x_79 == 0)
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_76, 0);
-x_81 = lean_ctor_get(x_76, 1);
-x_82 = l_Lean_Elab_Tactic_restore(x_81, x_19);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_47, 0);
+x_52 = lean_ctor_get(x_47, 1);
+x_53 = l_Lean_Elab_Tactic_restore(x_52, x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_16) == 0)
 {
 lean_dec(x_3);
 lean_dec(x_1);
-lean_ctor_set(x_76, 1, x_82);
-return x_76;
+lean_ctor_set(x_47, 1, x_53);
+return x_47;
 }
 else
 {
-lean_free_object(x_76);
-lean_dec(x_80);
-x_2 = x_16;
-x_4 = x_82;
-goto _start;
-}
-}
-else
-{
-lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_84 = lean_ctor_get(x_76, 0);
-x_85 = lean_ctor_get(x_76, 1);
-lean_inc(x_85);
-lean_inc(x_84);
-lean_dec(x_76);
-x_86 = l_Lean_Elab_Tactic_restore(x_85, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_87; 
-lean_dec(x_3);
-lean_dec(x_1);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_84);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
-}
-else
-{
-lean_dec(x_84);
-x_2 = x_16;
-x_4 = x_86;
-goto _start;
-}
-}
-}
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-lean_dec(x_38);
-x_89 = lean_ctor_get(x_59, 1);
-lean_inc(x_89);
-lean_dec(x_59);
-x_90 = lean_ctor_get(x_68, 0);
-lean_inc(x_90);
-lean_dec(x_68);
-lean_ctor_set(x_40, 3, x_89);
-x_91 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_91, 0, x_39);
-lean_ctor_set(x_91, 1, x_42);
-x_92 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_92, 0, x_90);
-x_93 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_93, 0, x_92);
-lean_inc(x_3);
-lean_inc(x_1);
-x_94 = l_Lean_Elab_Tactic_throwError___rarg(x_1, x_93, x_3, x_91);
-if (lean_obj_tag(x_94) == 0)
-{
-lean_object* x_95; lean_object* x_96; 
-x_95 = lean_ctor_get(x_94, 0);
-lean_inc(x_95);
-x_96 = lean_ctor_get(x_94, 1);
-lean_inc(x_96);
-lean_dec(x_94);
-x_20 = x_95;
-x_21 = x_96;
-goto block_33;
-}
-else
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_97 = lean_ctor_get(x_94, 0);
-lean_inc(x_97);
-x_98 = lean_ctor_get(x_94, 1);
-lean_inc(x_98);
-if (lean_is_exclusive(x_94)) {
- lean_ctor_release(x_94, 0);
- lean_ctor_release(x_94, 1);
- x_99 = x_94;
-} else {
- lean_dec_ref(x_94);
- x_99 = lean_box(0);
-}
-x_100 = l_Lean_Elab_Tactic_restore(x_98, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_101; 
-lean_dec(x_3);
-lean_dec(x_1);
-if (lean_is_scalar(x_99)) {
- x_101 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_101 = x_99;
-}
-lean_ctor_set(x_101, 0, x_97);
-lean_ctor_set(x_101, 1, x_100);
-return x_101;
-}
-else
-{
-lean_dec(x_99);
-lean_dec(x_97);
-x_2 = x_16;
-x_4 = x_100;
-goto _start;
-}
-}
-}
-}
-else
-{
-lean_object* x_103; 
-lean_dec(x_59);
-lean_free_object(x_40);
-lean_dec(x_56);
-lean_dec(x_55);
-lean_dec(x_53);
-lean_dec(x_52);
+lean_free_object(x_47);
 lean_dec(x_51);
-lean_free_object(x_39);
-lean_dec(x_48);
+x_2 = x_16;
+x_4 = x_53;
+goto _start;
+}
+}
+else
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_47, 0);
+x_56 = lean_ctor_get(x_47, 1);
+lean_inc(x_56);
+lean_inc(x_55);
 lean_dec(x_47);
-lean_dec(x_46);
-lean_dec(x_45);
-lean_dec(x_44);
+x_57 = l_Lean_Elab_Tactic_restore(x_56, x_19);
+lean_dec(x_19);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_object* x_58; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_58 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_58, 0, x_55);
+lean_ctor_set(x_58, 1, x_57);
+return x_58;
+}
+else
+{
+lean_dec(x_55);
+x_2 = x_16;
+x_4 = x_57;
+goto _start;
+}
+}
+}
+}
+else
+{
+lean_object* x_60; 
+lean_inc(x_3);
+x_60 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_3, x_39);
+if (lean_obj_tag(x_60) == 0)
+{
+lean_object* x_61; lean_object* x_62; 
+x_61 = lean_ctor_get(x_60, 0);
+lean_inc(x_61);
+x_62 = lean_ctor_get(x_60, 1);
+lean_inc(x_62);
+lean_dec(x_60);
+x_20 = x_61;
+x_21 = x_62;
+goto block_33;
+}
+else
+{
+uint8_t x_63; 
+x_63 = !lean_is_exclusive(x_60);
+if (x_63 == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_60, 0);
+x_65 = lean_ctor_get(x_60, 1);
+x_66 = l_Lean_Elab_Tactic_restore(x_65, x_19);
+lean_dec(x_19);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_dec(x_3);
+lean_dec(x_1);
+lean_ctor_set(x_60, 1, x_66);
+return x_60;
+}
+else
+{
+lean_free_object(x_60);
+lean_dec(x_64);
+x_2 = x_16;
+x_4 = x_66;
+goto _start;
+}
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_60, 0);
+x_69 = lean_ctor_get(x_60, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_60);
+x_70 = l_Lean_Elab_Tactic_restore(x_69, x_19);
+lean_dec(x_19);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_object* x_71; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_68);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+else
+{
+lean_dec(x_68);
+x_2 = x_16;
+x_4 = x_70;
+goto _start;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_73; 
+x_73 = lean_ctor_get(x_42, 0);
+lean_inc(x_73);
 lean_dec(x_42);
-lean_inc(x_3);
-x_103 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_3, x_38);
-if (lean_obj_tag(x_103) == 0)
-{
-lean_object* x_104; lean_object* x_105; 
-x_104 = lean_ctor_get(x_103, 0);
-lean_inc(x_104);
-x_105 = lean_ctor_get(x_103, 1);
-lean_inc(x_105);
-lean_dec(x_103);
-x_20 = x_104;
-x_21 = x_105;
+x_20 = x_73;
+x_21 = x_39;
 goto block_33;
 }
-else
-{
-uint8_t x_106; 
-x_106 = !lean_is_exclusive(x_103);
-if (x_106 == 0)
-{
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_103, 0);
-x_108 = lean_ctor_get(x_103, 1);
-x_109 = l_Lean_Elab_Tactic_restore(x_108, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_dec(x_3);
-lean_dec(x_1);
-lean_ctor_set(x_103, 1, x_109);
-return x_103;
-}
-else
-{
-lean_free_object(x_103);
-lean_dec(x_107);
-x_2 = x_16;
-x_4 = x_109;
-goto _start;
-}
-}
-else
-{
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_103, 0);
-x_112 = lean_ctor_get(x_103, 1);
-lean_inc(x_112);
-lean_inc(x_111);
-lean_dec(x_103);
-x_113 = l_Lean_Elab_Tactic_restore(x_112, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_114; 
-lean_dec(x_3);
-lean_dec(x_1);
-x_114 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_114, 0, x_111);
-lean_ctor_set(x_114, 1, x_113);
-return x_114;
-}
-else
-{
-lean_dec(x_111);
-x_2 = x_16;
-x_4 = x_113;
-goto _start;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
-x_116 = lean_ctor_get(x_40, 0);
-x_117 = lean_ctor_get(x_40, 1);
-x_118 = lean_ctor_get(x_40, 2);
-x_119 = lean_ctor_get(x_40, 3);
-x_120 = lean_ctor_get(x_40, 4);
-x_121 = lean_ctor_get(x_40, 5);
-lean_inc(x_121);
-lean_inc(x_120);
-lean_inc(x_119);
-lean_inc(x_118);
-lean_inc(x_117);
-lean_inc(x_116);
-lean_dec(x_40);
-x_122 = lean_environment_main_module(x_41);
-x_123 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_123, 0, x_122);
-lean_ctor_set(x_123, 1, x_35);
-lean_inc(x_1);
-x_124 = lean_apply_3(x_15, x_1, x_123, x_119);
-if (lean_obj_tag(x_124) == 0)
-{
-lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
-if (lean_is_exclusive(x_38)) {
- lean_ctor_release(x_38, 0);
- lean_ctor_release(x_38, 1);
- x_125 = x_38;
-} else {
- lean_dec_ref(x_38);
- x_125 = lean_box(0);
-}
-x_126 = lean_ctor_get(x_124, 0);
-lean_inc(x_126);
-x_127 = lean_ctor_get(x_124, 1);
-lean_inc(x_127);
-lean_dec(x_124);
-x_128 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_128, 0, x_116);
-lean_ctor_set(x_128, 1, x_117);
-lean_ctor_set(x_128, 2, x_118);
-lean_ctor_set(x_128, 3, x_127);
-lean_ctor_set(x_128, 4, x_120);
-lean_ctor_set(x_128, 5, x_121);
-lean_ctor_set(x_39, 0, x_128);
-if (lean_is_scalar(x_125)) {
- x_129 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_129 = x_125;
-}
-lean_ctor_set(x_129, 0, x_39);
-lean_ctor_set(x_129, 1, x_42);
-x_20 = x_126;
-x_21 = x_129;
-goto block_33;
-}
-else
-{
-lean_object* x_130; 
-x_130 = lean_ctor_get(x_124, 0);
-lean_inc(x_130);
-if (lean_obj_tag(x_130) == 0)
-{
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-if (lean_is_exclusive(x_38)) {
- lean_ctor_release(x_38, 0);
- lean_ctor_release(x_38, 1);
- x_131 = x_38;
-} else {
- lean_dec_ref(x_38);
- x_131 = lean_box(0);
-}
-x_132 = lean_ctor_get(x_124, 1);
-lean_inc(x_132);
-lean_dec(x_124);
-x_133 = lean_ctor_get(x_130, 0);
-lean_inc(x_133);
-lean_dec(x_130);
-x_134 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_134, 0, x_116);
-lean_ctor_set(x_134, 1, x_117);
-lean_ctor_set(x_134, 2, x_118);
-lean_ctor_set(x_134, 3, x_132);
-lean_ctor_set(x_134, 4, x_120);
-lean_ctor_set(x_134, 5, x_121);
-lean_ctor_set(x_39, 0, x_134);
-if (lean_is_scalar(x_131)) {
- x_135 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_135 = x_131;
-}
-lean_ctor_set(x_135, 0, x_39);
-lean_ctor_set(x_135, 1, x_42);
-x_136 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_136, 0, x_133);
-x_137 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_137, 0, x_136);
-lean_inc(x_3);
-lean_inc(x_1);
-x_138 = l_Lean_Elab_Tactic_throwError___rarg(x_1, x_137, x_3, x_135);
-if (lean_obj_tag(x_138) == 0)
-{
-lean_object* x_139; lean_object* x_140; 
-x_139 = lean_ctor_get(x_138, 0);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_138, 1);
-lean_inc(x_140);
-lean_dec(x_138);
-x_20 = x_139;
-x_21 = x_140;
-goto block_33;
-}
-else
-{
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_141 = lean_ctor_get(x_138, 0);
-lean_inc(x_141);
-x_142 = lean_ctor_get(x_138, 1);
-lean_inc(x_142);
-if (lean_is_exclusive(x_138)) {
- lean_ctor_release(x_138, 0);
- lean_ctor_release(x_138, 1);
- x_143 = x_138;
-} else {
- lean_dec_ref(x_138);
- x_143 = lean_box(0);
-}
-x_144 = l_Lean_Elab_Tactic_restore(x_142, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_145; 
-lean_dec(x_3);
-lean_dec(x_1);
-if (lean_is_scalar(x_143)) {
- x_145 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_145 = x_143;
-}
-lean_ctor_set(x_145, 0, x_141);
-lean_ctor_set(x_145, 1, x_144);
-return x_145;
-}
-else
-{
-lean_dec(x_143);
-lean_dec(x_141);
-x_2 = x_16;
-x_4 = x_144;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_147; 
-lean_dec(x_124);
-lean_dec(x_121);
-lean_dec(x_120);
-lean_dec(x_118);
-lean_dec(x_117);
-lean_dec(x_116);
-lean_free_object(x_39);
-lean_dec(x_48);
-lean_dec(x_47);
-lean_dec(x_46);
-lean_dec(x_45);
-lean_dec(x_44);
-lean_dec(x_42);
-lean_inc(x_3);
-x_147 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_3, x_38);
-if (lean_obj_tag(x_147) == 0)
-{
-lean_object* x_148; lean_object* x_149; 
-x_148 = lean_ctor_get(x_147, 0);
-lean_inc(x_148);
-x_149 = lean_ctor_get(x_147, 1);
-lean_inc(x_149);
-lean_dec(x_147);
-x_20 = x_148;
-x_21 = x_149;
-goto block_33;
-}
-else
-{
-lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
-x_150 = lean_ctor_get(x_147, 0);
-lean_inc(x_150);
-x_151 = lean_ctor_get(x_147, 1);
-lean_inc(x_151);
-if (lean_is_exclusive(x_147)) {
- lean_ctor_release(x_147, 0);
- lean_ctor_release(x_147, 1);
- x_152 = x_147;
-} else {
- lean_dec_ref(x_147);
- x_152 = lean_box(0);
-}
-x_153 = l_Lean_Elab_Tactic_restore(x_151, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_154; 
-lean_dec(x_3);
-lean_dec(x_1);
-if (lean_is_scalar(x_152)) {
- x_154 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_154 = x_152;
-}
-lean_ctor_set(x_154, 0, x_150);
-lean_ctor_set(x_154, 1, x_153);
-return x_154;
-}
-else
-{
-lean_dec(x_152);
-lean_dec(x_150);
-x_2 = x_16;
-x_4 = x_153;
-goto _start;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-x_156 = lean_ctor_get(x_39, 1);
-x_157 = lean_ctor_get(x_39, 2);
-x_158 = lean_ctor_get(x_39, 3);
-x_159 = lean_ctor_get(x_39, 4);
-x_160 = lean_ctor_get(x_39, 5);
-lean_inc(x_160);
-lean_inc(x_159);
-lean_inc(x_158);
-lean_inc(x_157);
-lean_inc(x_156);
-lean_dec(x_39);
-x_161 = lean_ctor_get(x_40, 0);
-lean_inc(x_161);
-x_162 = lean_ctor_get(x_40, 1);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_40, 2);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_40, 3);
-lean_inc(x_164);
-x_165 = lean_ctor_get(x_40, 4);
-lean_inc(x_165);
-x_166 = lean_ctor_get(x_40, 5);
-lean_inc(x_166);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- lean_ctor_release(x_40, 1);
- lean_ctor_release(x_40, 2);
- lean_ctor_release(x_40, 3);
- lean_ctor_release(x_40, 4);
- lean_ctor_release(x_40, 5);
- x_167 = x_40;
-} else {
- lean_dec_ref(x_40);
- x_167 = lean_box(0);
-}
-x_168 = lean_environment_main_module(x_41);
-x_169 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_169, 0, x_168);
-lean_ctor_set(x_169, 1, x_35);
-lean_inc(x_1);
-x_170 = lean_apply_3(x_15, x_1, x_169, x_164);
-if (lean_obj_tag(x_170) == 0)
-{
-lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; 
-if (lean_is_exclusive(x_38)) {
- lean_ctor_release(x_38, 0);
- lean_ctor_release(x_38, 1);
- x_171 = x_38;
-} else {
- lean_dec_ref(x_38);
- x_171 = lean_box(0);
-}
-x_172 = lean_ctor_get(x_170, 0);
-lean_inc(x_172);
-x_173 = lean_ctor_get(x_170, 1);
-lean_inc(x_173);
-lean_dec(x_170);
-if (lean_is_scalar(x_167)) {
- x_174 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_174 = x_167;
-}
-lean_ctor_set(x_174, 0, x_161);
-lean_ctor_set(x_174, 1, x_162);
-lean_ctor_set(x_174, 2, x_163);
-lean_ctor_set(x_174, 3, x_173);
-lean_ctor_set(x_174, 4, x_165);
-lean_ctor_set(x_174, 5, x_166);
-x_175 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_175, 0, x_174);
-lean_ctor_set(x_175, 1, x_156);
-lean_ctor_set(x_175, 2, x_157);
-lean_ctor_set(x_175, 3, x_158);
-lean_ctor_set(x_175, 4, x_159);
-lean_ctor_set(x_175, 5, x_160);
-if (lean_is_scalar(x_171)) {
- x_176 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_176 = x_171;
-}
-lean_ctor_set(x_176, 0, x_175);
-lean_ctor_set(x_176, 1, x_42);
-x_20 = x_172;
-x_21 = x_176;
-goto block_33;
-}
-else
-{
-lean_object* x_177; 
-x_177 = lean_ctor_get(x_170, 0);
-lean_inc(x_177);
-if (lean_obj_tag(x_177) == 0)
-{
-lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
-if (lean_is_exclusive(x_38)) {
- lean_ctor_release(x_38, 0);
- lean_ctor_release(x_38, 1);
- x_178 = x_38;
-} else {
- lean_dec_ref(x_38);
- x_178 = lean_box(0);
-}
-x_179 = lean_ctor_get(x_170, 1);
-lean_inc(x_179);
-lean_dec(x_170);
-x_180 = lean_ctor_get(x_177, 0);
-lean_inc(x_180);
-lean_dec(x_177);
-if (lean_is_scalar(x_167)) {
- x_181 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_181 = x_167;
-}
-lean_ctor_set(x_181, 0, x_161);
-lean_ctor_set(x_181, 1, x_162);
-lean_ctor_set(x_181, 2, x_163);
-lean_ctor_set(x_181, 3, x_179);
-lean_ctor_set(x_181, 4, x_165);
-lean_ctor_set(x_181, 5, x_166);
-x_182 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_182, 0, x_181);
-lean_ctor_set(x_182, 1, x_156);
-lean_ctor_set(x_182, 2, x_157);
-lean_ctor_set(x_182, 3, x_158);
-lean_ctor_set(x_182, 4, x_159);
-lean_ctor_set(x_182, 5, x_160);
-if (lean_is_scalar(x_178)) {
- x_183 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_183 = x_178;
-}
-lean_ctor_set(x_183, 0, x_182);
-lean_ctor_set(x_183, 1, x_42);
-x_184 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_184, 0, x_180);
-x_185 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_185, 0, x_184);
-lean_inc(x_3);
-lean_inc(x_1);
-x_186 = l_Lean_Elab_Tactic_throwError___rarg(x_1, x_185, x_3, x_183);
-if (lean_obj_tag(x_186) == 0)
-{
-lean_object* x_187; lean_object* x_188; 
-x_187 = lean_ctor_get(x_186, 0);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_186, 1);
-lean_inc(x_188);
-lean_dec(x_186);
-x_20 = x_187;
-x_21 = x_188;
-goto block_33;
-}
-else
-{
-lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-x_189 = lean_ctor_get(x_186, 0);
-lean_inc(x_189);
-x_190 = lean_ctor_get(x_186, 1);
-lean_inc(x_190);
-if (lean_is_exclusive(x_186)) {
- lean_ctor_release(x_186, 0);
- lean_ctor_release(x_186, 1);
- x_191 = x_186;
-} else {
- lean_dec_ref(x_186);
- x_191 = lean_box(0);
-}
-x_192 = l_Lean_Elab_Tactic_restore(x_190, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_193; 
-lean_dec(x_3);
-lean_dec(x_1);
-if (lean_is_scalar(x_191)) {
- x_193 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_193 = x_191;
-}
-lean_ctor_set(x_193, 0, x_189);
-lean_ctor_set(x_193, 1, x_192);
-return x_193;
-}
-else
-{
-lean_dec(x_191);
-lean_dec(x_189);
-x_2 = x_16;
-x_4 = x_192;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_195; 
-lean_dec(x_170);
-lean_dec(x_167);
-lean_dec(x_166);
-lean_dec(x_165);
-lean_dec(x_163);
-lean_dec(x_162);
-lean_dec(x_161);
-lean_dec(x_160);
-lean_dec(x_159);
-lean_dec(x_158);
-lean_dec(x_157);
-lean_dec(x_156);
-lean_dec(x_42);
-lean_inc(x_3);
-x_195 = l_Lean_Elab_Tactic_throwUnsupportedSyntax___rarg(x_3, x_38);
-if (lean_obj_tag(x_195) == 0)
-{
-lean_object* x_196; lean_object* x_197; 
-x_196 = lean_ctor_get(x_195, 0);
-lean_inc(x_196);
-x_197 = lean_ctor_get(x_195, 1);
-lean_inc(x_197);
-lean_dec(x_195);
-x_20 = x_196;
-x_21 = x_197;
-goto block_33;
-}
-else
-{
-lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
-x_198 = lean_ctor_get(x_195, 0);
-lean_inc(x_198);
-x_199 = lean_ctor_get(x_195, 1);
-lean_inc(x_199);
-if (lean_is_exclusive(x_195)) {
- lean_ctor_release(x_195, 0);
- lean_ctor_release(x_195, 1);
- x_200 = x_195;
-} else {
- lean_dec_ref(x_195);
- x_200 = lean_box(0);
-}
-x_201 = l_Lean_Elab_Tactic_restore(x_199, x_19);
-lean_dec(x_19);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_202; 
-lean_dec(x_3);
-lean_dec(x_1);
-if (lean_is_scalar(x_200)) {
- x_202 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_202 = x_200;
-}
-lean_ctor_set(x_202, 0, x_198);
-lean_ctor_set(x_202, 1, x_201);
-return x_202;
-}
-else
-{
-lean_dec(x_200);
-lean_dec(x_198);
-x_2 = x_16;
-x_4 = x_201;
-goto _start;
-}
-}
-}
-}
-}
 block_33:
 {
 lean_object* x_22; 
@@ -16858,14 +15226,6 @@ l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3 = _init_l_Lean_Elab_T
 lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__3);
 l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4 = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4();
 lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__4);
-l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5 = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5();
-lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__5);
-l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6 = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6();
-lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__6);
-l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7 = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7();
-lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__7);
-l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8 = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8();
-lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter___closed__8);
 l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter = _init_l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter();
 lean_mark_persistent(l_Lean_Elab_Tactic_Lean_Elab_MonadMacroAdapter);
 l_Lean_Elab_Tactic_evalTactic___main___closed__1 = _init_l_Lean_Elab_Tactic_evalTactic___main___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/Term.c b/stage0/stdlib/Init/Lean/Elab/Term.c
index 2216855531..596f705f1f 100644
--- a/stage0/stdlib/Init/Lean/Elab/Term.c
+++ b/stage0/stdlib/Init/Lean/Elab/Term.c
@@ -215,7 +215,6 @@ extern lean_object* l_Lean_LocalContext_Inhabited___closed__1;
 lean_object* l_Lean_Elab_Term_resolveName___closed__5;
 lean_object* l_Lean_Elab_Term_mkFreshExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_LVal_hasToString(lean_object*);
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7;
 extern lean_object* l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_trace___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -257,7 +256,6 @@ lean_object* l_Lean_SMap_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec_
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__5___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withIncRecDepth___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_elabListLit___closed__2;
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName___boxed(lean_object*);
 extern lean_object* l_Lean_Meta_dbgTrace___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_mkConst___closed__6;
@@ -270,7 +268,6 @@ lean_object* l___private_Init_Lean_Elab_Term_2__fromMetaException___boxed(lean_o
 lean_object* l_Lean_Elab_Term_elabParen___closed__4;
 lean_object* l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_elabLevel(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_termIdToAntiquot___closed__4;
 lean_object* l_Lean_Elab_Term_monadLog___closed__1;
 lean_object* l_Lean_Syntax_isCharLit_x3f(lean_object*);
@@ -340,7 +337,6 @@ lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_8__elabTermUsing(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_7__postponeElabTerm(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMVarDecl___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_setTraceState___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
@@ -369,7 +365,7 @@ lean_object* l_Nat_repr(lean_object*);
 lean_object* l_Lean_Elab_Term_State_inhabited___closed__2;
 extern lean_object* l_Char_HasRepr___closed__1;
 lean_object* l_Lean_Elab_Term_withNode___rarg___closed__2;
-lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_6__exceptionToSorry___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit___closed__3;
 lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__3;
@@ -485,7 +481,6 @@ lean_object* l_Lean_Elab_Term_elabRawNumLit(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Elab_Term_elabTermAux___main___closed__3;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_Term_9__mkPairsAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProp___closed__1;
 extern lean_object* l_Lean_Parser_Term_cdot___elambda__1___closed__2;
@@ -519,7 +514,6 @@ lean_object* l_Lean_Elab_Term_getDeclName_x3f___boxed(lean_object*, lean_object*
 lean_object* l_Lean_Elab_Term_isDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabRawNumLit___closed__1;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__10;
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5;
 lean_object* l_Lean_ConstantInfo_lparams(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNamedHole(lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName(lean_object*);
@@ -607,7 +601,6 @@ extern lean_object* l_Lean_EnvExtension_setState___closed__1;
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabQuotedName___closed__2;
 lean_object* l_Lean_Elab_Term_tryPostponeIfMVar___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Term_whnfCore(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_monadLog___lambda__4___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Util_1__mkPanicMessage___closed__2;
@@ -732,7 +725,6 @@ lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_
 lean_object* l_Lean_Elab_Term_resetSynthInstanceCache___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel___closed__2;
 lean_object* l_Lean_Elab_Term_decLevel___closed__1;
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermAux___main___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBadCDot___closed__1;
 lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__1;
@@ -757,13 +749,11 @@ uint8_t l_Array_isEqvAux___main___at_Lean_Elab_Term_withMVarContext___spec__1(le
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBadCDot___closed__2;
 lean_object* l_Lean_Elab_Term_elabRawCharLit___closed__4;
 extern lean_object* l_Lean_levelOne;
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Message_toString(lean_object*);
 lean_object* l_Lean_mkAppB(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_char___elambda__1___closed__2;
 lean_object* l_Array_anyRangeMAux___main___at_Lean_Elab_Term_expandCDot_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8;
 lean_object* l_Lean_Elab_Term_trace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_contains___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__3___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__2;
@@ -791,7 +781,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNum___closed__3;
 lean_object* l___private_Init_Lean_Elab_Term_9__mkPairsAux___main___closed__5;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
 extern lean_object* l_Lean_initAttr;
-extern lean_object* l_EStateM_MonadState___closed__2;
 extern lean_object* l_Lean_Parser_Term_arrayLit___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_getOptions___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_containsAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__5___boxed(lean_object*, lean_object*, lean_object*);
@@ -826,7 +815,6 @@ lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ensureHasTypeAux___closed__2;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6;
 lean_object* l_Lean_Elab_Term_decLevel___closed__6;
 lean_object* _init_l_Lean_Elab_Term_State_inhabited___closed__1() {
 _start:
@@ -11593,197 +11581,15 @@ x_9 = l___private_Init_Lean_Elab_Term_8__elabTermUsing(x_1, x_2, x_3, x_8, x_5,
 return x_9;
 }
 }
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = lean_apply_1(x_1, x_3);
-return x_4;
-}
-}
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed), 3, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_1, 0);
-x_5 = lean_ctor_get(x_4, 3);
-lean_inc(x_5);
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_5);
-lean_ctor_set(x_6, 1, x_3);
-return x_6;
-}
-}
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; uint8_t x_6; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = !lean_is_exclusive(x_5);
-if (x_6 == 0)
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_7 = lean_ctor_get(x_5, 3);
-lean_dec(x_7);
-lean_ctor_set(x_5, 3, x_1);
-x_8 = lean_box(0);
-x_9 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_9, 0, x_8);
-lean_ctor_set(x_9, 1, x_3);
-return x_9;
-}
-else
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_10 = lean_ctor_get(x_5, 0);
-x_11 = lean_ctor_get(x_5, 1);
-x_12 = lean_ctor_get(x_5, 2);
-x_13 = lean_ctor_get(x_5, 4);
-x_14 = lean_ctor_get(x_5, 5);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_5);
-x_15 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_12);
-lean_ctor_set(x_15, 3, x_1);
-lean_ctor_set(x_15, 4, x_13);
-lean_ctor_set(x_15, 5, x_14);
-lean_ctor_set(x_3, 0, x_15);
-x_16 = lean_box(0);
-x_17 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_17, 0, x_16);
-lean_ctor_set(x_17, 1, x_3);
-return x_17;
-}
-}
-else
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_18 = lean_ctor_get(x_3, 0);
-x_19 = lean_ctor_get(x_3, 1);
-x_20 = lean_ctor_get(x_3, 2);
-x_21 = lean_ctor_get(x_3, 3);
-x_22 = lean_ctor_get(x_3, 4);
-x_23 = lean_ctor_get(x_3, 5);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_dec(x_3);
-x_24 = lean_ctor_get(x_18, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_18, 1);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_18, 2);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_18, 4);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_18, 5);
-lean_inc(x_28);
-if (lean_is_exclusive(x_18)) {
- lean_ctor_release(x_18, 0);
- lean_ctor_release(x_18, 1);
- lean_ctor_release(x_18, 2);
- lean_ctor_release(x_18, 3);
- lean_ctor_release(x_18, 4);
- lean_ctor_release(x_18, 5);
- x_29 = x_18;
-} else {
- lean_dec_ref(x_18);
- x_29 = lean_box(0);
-}
-if (lean_is_scalar(x_29)) {
- x_30 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_30 = x_29;
-}
-lean_ctor_set(x_30, 0, x_24);
-lean_ctor_set(x_30, 1, x_25);
-lean_ctor_set(x_30, 2, x_26);
-lean_ctor_set(x_30, 3, x_1);
-lean_ctor_set(x_30, 4, x_27);
-lean_ctor_set(x_30, 5, x_28);
-x_31 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_19);
-lean_ctor_set(x_31, 2, x_20);
-lean_ctor_set(x_31, 3, x_21);
-lean_ctor_set(x_31, 4, x_22);
-lean_ctor_set(x_31, 5, x_23);
-x_32 = lean_box(0);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_31);
-return x_33;
-}
-}
-}
 lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_EStateM_MonadState___closed__2;
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed), 3, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__2() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1___boxed), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__1;
-x_2 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__2;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_monadLog___spec__2___rarg), 4, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_getEnv___boxed), 1, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2___boxed), 3, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6() {
+lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -11791,7 +11597,7 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_throwError), 1, 0);
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7() {
+lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -11799,62 +11605,30 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_throwUnsupportedSyntax___boxed
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8() {
+lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_1 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__1;
 x_2 = l_Lean_Elab_Term_monadQuotation___closed__1;
-x_3 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3;
-x_4 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5;
-x_5 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6;
-x_6 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7;
-x_7 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_7, 0, x_1);
-lean_ctor_set(x_7, 1, x_2);
-lean_ctor_set(x_7, 2, x_3);
-lean_ctor_set(x_7, 3, x_4);
-lean_ctor_set(x_7, 4, x_5);
-lean_ctor_set(x_7, 5, x_6);
-return x_7;
+x_3 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__2;
+x_4 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3;
+x_5 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_5, 0, x_1);
+lean_ctor_set(x_5, 1, x_2);
+lean_ctor_set(x_5, 2, x_3);
+lean_ctor_set(x_5, 3, x_4);
+return x_5;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8;
+x_1 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4;
 return x_1;
 }
 }
-lean_object* l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_ReaderT_lift___at_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___spec__1___rarg(x_1, x_2, x_3);
-lean_dec(x_2);
-return x_4;
-}
-}
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__1(x_1, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_4;
-}
-}
-lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; 
-x_4 = l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___lambda__2(x_1, x_2, x_3);
-lean_dec(x_2);
-return x_4;
-}
-}
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Term_elabTermAux___main___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -12144,7 +11918,7 @@ lean_ctor_set(x_5, 5, x_9);
 x_10 = !lean_is_exclusive(x_4);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_290; lean_object* x_291; uint8_t x_292; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_201; lean_object* x_202; uint8_t x_203; 
 x_11 = lean_ctor_get(x_4, 0);
 x_12 = lean_ctor_get(x_4, 1);
 x_13 = lean_ctor_get(x_4, 2);
@@ -12169,22 +11943,22 @@ lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_ctor_set(x_4, 9, x_7);
-x_290 = lean_ctor_get(x_11, 3);
-lean_inc(x_290);
-x_291 = lean_ctor_get(x_11, 4);
-lean_inc(x_291);
-x_292 = lean_nat_dec_eq(x_290, x_291);
-lean_dec(x_291);
-lean_dec(x_290);
-if (x_292 == 0)
+x_201 = lean_ctor_get(x_11, 3);
+lean_inc(x_201);
+x_202 = lean_ctor_get(x_11, 4);
+lean_inc(x_202);
+x_203 = lean_nat_dec_eq(x_201, x_202);
+lean_dec(x_202);
+lean_dec(x_201);
+if (x_203 == 0)
 {
 lean_dec(x_4);
 x_23 = x_5;
-goto block_289;
+goto block_200;
 }
 else
 {
-lean_object* x_293; lean_object* x_294; uint8_t x_295; 
+lean_object* x_204; lean_object* x_205; uint8_t x_206; 
 lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
@@ -12196,35 +11970,35 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_7);
 lean_dec(x_1);
-x_293 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
-x_294 = l_Lean_Elab_Term_throwError___rarg(x_3, x_293, x_4, x_5);
+x_204 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
+x_205 = l_Lean_Elab_Term_throwError___rarg(x_3, x_204, x_4, x_5);
 lean_dec(x_3);
-x_295 = !lean_is_exclusive(x_294);
-if (x_295 == 0)
+x_206 = !lean_is_exclusive(x_205);
+if (x_206 == 0)
 {
-return x_294;
+return x_205;
 }
 else
 {
-lean_object* x_296; lean_object* x_297; lean_object* x_298; 
-x_296 = lean_ctor_get(x_294, 0);
-x_297 = lean_ctor_get(x_294, 1);
-lean_inc(x_297);
-lean_inc(x_296);
-lean_dec(x_294);
-x_298 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_298, 0, x_296);
-lean_ctor_set(x_298, 1, x_297);
-return x_298;
+lean_object* x_207; lean_object* x_208; lean_object* x_209; 
+x_207 = lean_ctor_get(x_205, 0);
+x_208 = lean_ctor_get(x_205, 1);
+lean_inc(x_208);
+lean_inc(x_207);
+lean_dec(x_205);
+x_209 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_209, 0, x_207);
+lean_ctor_set(x_209, 1, x_208);
+return x_209;
 }
 }
-block_289:
+block_200:
 {
 uint8_t x_24; 
 x_24 = !lean_is_exclusive(x_11);
 if (x_24 == 0)
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_157; 
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_89; 
 x_25 = lean_ctor_get(x_11, 3);
 x_26 = lean_nat_add(x_25, x_8);
 lean_dec(x_25);
@@ -12254,38 +12028,38 @@ lean_ctor_set_uint8(x_27, sizeof(void*)*10, x_20);
 lean_ctor_set_uint8(x_27, sizeof(void*)*10 + 1, x_21);
 if (lean_obj_tag(x_3) == 1)
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; uint8_t x_173; 
-x_169 = l_Lean_Elab_Term_getOptions(x_27, x_23);
-x_170 = lean_ctor_get(x_169, 0);
-lean_inc(x_170);
-x_171 = lean_ctor_get(x_169, 1);
-lean_inc(x_171);
-lean_dec(x_169);
-x_172 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
-x_173 = l_Lean_checkTraceOption(x_170, x_172);
-lean_dec(x_170);
-if (x_173 == 0)
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; 
+x_101 = l_Lean_Elab_Term_getOptions(x_27, x_23);
+x_102 = lean_ctor_get(x_101, 0);
+lean_inc(x_102);
+x_103 = lean_ctor_get(x_101, 1);
+lean_inc(x_103);
+lean_dec(x_101);
+x_104 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
+x_105 = l_Lean_checkTraceOption(x_102, x_104);
+lean_dec(x_102);
+if (x_105 == 0)
 {
-x_28 = x_171;
-goto block_156;
+x_28 = x_103;
+goto block_88;
 }
 else
 {
-lean_object* x_174; lean_object* x_175; lean_object* x_176; 
+lean_object* x_106; lean_object* x_107; lean_object* x_108; 
 lean_inc(x_3);
-x_174 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_174, 0, x_3);
-x_175 = l_Lean_Elab_Term_logTrace(x_172, x_3, x_174, x_27, x_171);
-x_176 = lean_ctor_get(x_175, 1);
-lean_inc(x_176);
-lean_dec(x_175);
-x_28 = x_176;
-goto block_156;
+x_106 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_106, 0, x_3);
+x_107 = l_Lean_Elab_Term_logTrace(x_104, x_3, x_106, x_27, x_103);
+x_108 = lean_ctor_get(x_107, 1);
+lean_inc(x_108);
+lean_dec(x_107);
+x_28 = x_108;
+goto block_88;
 }
 }
 else
 {
-lean_object* x_177; 
+lean_object* x_109; 
 lean_dec(x_11);
 lean_dec(x_19);
 lean_dec(x_18);
@@ -12297,11 +12071,11 @@ lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_7);
 lean_dec(x_1);
-x_177 = lean_box(0);
-x_157 = x_177;
-goto block_168;
+x_109 = lean_box(0);
+x_89 = x_109;
+goto block_100;
 }
-block_156:
+block_88:
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 x_29 = l_Lean_Elab_Term_termElabAttribute;
@@ -12323,7 +12097,7 @@ x_35 = l_Lean_Syntax_getKind(x_3);
 x_36 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_34, x_35);
 if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_48; lean_object* x_49; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; 
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_48; lean_object* x_49; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
 x_37 = l_Lean_Elab_Term_getEnv___rarg(x_28);
 x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
@@ -12344,375 +12118,82 @@ x_68 = lean_ctor_get(x_66, 1);
 lean_inc(x_68);
 lean_dec(x_66);
 x_69 = l_Lean_Elab_Term_getEnv___rarg(x_68);
-x_70 = lean_ctor_get(x_69, 1);
+x_70 = lean_ctor_get(x_69, 0);
 lean_inc(x_70);
-x_71 = lean_ctor_get(x_70, 0);
+x_71 = lean_ctor_get(x_69, 1);
 lean_inc(x_71);
-x_72 = lean_ctor_get(x_69, 0);
-lean_inc(x_72);
 lean_dec(x_69);
-x_73 = lean_ctor_get(x_70, 1);
-lean_inc(x_73);
-x_74 = lean_ctor_get(x_70, 2);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_70, 3);
+x_72 = lean_environment_main_module(x_70);
+x_73 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_67);
+lean_inc(x_3);
+x_74 = l_Lean_Elab_getMacros(x_38, x_3, x_73);
+lean_dec(x_38);
+if (lean_obj_tag(x_74) == 0)
+{
+lean_object* x_75; 
+lean_dec(x_11);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_7);
+lean_dec(x_1);
+x_75 = lean_ctor_get(x_74, 0);
 lean_inc(x_75);
-x_76 = lean_ctor_get(x_70, 4);
+lean_dec(x_74);
+if (lean_obj_tag(x_75) == 0)
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_76 = lean_ctor_get(x_75, 0);
 lean_inc(x_76);
-x_77 = lean_ctor_get(x_70, 5);
-lean_inc(x_77);
-x_78 = !lean_is_exclusive(x_71);
-if (x_78 == 0)
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_79 = lean_ctor_get(x_71, 0);
-x_80 = lean_ctor_get(x_71, 1);
-x_81 = lean_ctor_get(x_71, 2);
-x_82 = lean_ctor_get(x_71, 3);
-x_83 = lean_ctor_get(x_71, 4);
-x_84 = lean_ctor_get(x_71, 5);
-x_85 = lean_environment_main_module(x_72);
-x_86 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_86, 0, x_85);
-lean_ctor_set(x_86, 1, x_67);
-lean_inc(x_3);
-x_87 = l_Lean_Elab_getMacros(x_38, x_3, x_86, x_82);
-lean_dec(x_38);
-if (lean_obj_tag(x_87) == 0)
-{
-uint8_t x_88; 
-lean_dec(x_40);
-lean_dec(x_35);
-lean_dec(x_27);
-x_88 = !lean_is_exclusive(x_70);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_89 = lean_ctor_get(x_70, 5);
-lean_dec(x_89);
-x_90 = lean_ctor_get(x_70, 4);
-lean_dec(x_90);
-x_91 = lean_ctor_get(x_70, 3);
-lean_dec(x_91);
-x_92 = lean_ctor_get(x_70, 2);
-lean_dec(x_92);
-x_93 = lean_ctor_get(x_70, 1);
-lean_dec(x_93);
-x_94 = lean_ctor_get(x_70, 0);
-lean_dec(x_94);
-x_95 = lean_ctor_get(x_87, 0);
-lean_inc(x_95);
-x_96 = lean_ctor_get(x_87, 1);
-lean_inc(x_96);
-lean_dec(x_87);
-lean_ctor_set(x_71, 3, x_96);
-x_41 = x_95;
-x_42 = x_70;
-goto block_47;
-}
-else
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-lean_dec(x_70);
-x_97 = lean_ctor_get(x_87, 0);
-lean_inc(x_97);
-x_98 = lean_ctor_get(x_87, 1);
-lean_inc(x_98);
-lean_dec(x_87);
-lean_ctor_set(x_71, 3, x_98);
-x_99 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_99, 0, x_71);
-lean_ctor_set(x_99, 1, x_73);
-lean_ctor_set(x_99, 2, x_74);
-lean_ctor_set(x_99, 3, x_75);
-lean_ctor_set(x_99, 4, x_76);
-lean_ctor_set(x_99, 5, x_77);
-x_41 = x_97;
-x_42 = x_99;
-goto block_47;
-}
-}
-else
-{
-lean_object* x_100; 
-lean_dec(x_11);
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_1);
-x_100 = lean_ctor_get(x_87, 0);
-lean_inc(x_100);
-if (lean_obj_tag(x_100) == 0)
-{
-uint8_t x_101; 
-x_101 = !lean_is_exclusive(x_70);
-if (x_101 == 0)
-{
-lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_102 = lean_ctor_get(x_70, 5);
-lean_dec(x_102);
-x_103 = lean_ctor_get(x_70, 4);
-lean_dec(x_103);
-x_104 = lean_ctor_get(x_70, 3);
-lean_dec(x_104);
-x_105 = lean_ctor_get(x_70, 2);
-lean_dec(x_105);
-x_106 = lean_ctor_get(x_70, 1);
-lean_dec(x_106);
-x_107 = lean_ctor_get(x_70, 0);
-lean_dec(x_107);
-x_108 = lean_ctor_get(x_87, 1);
-lean_inc(x_108);
-lean_dec(x_87);
-x_109 = lean_ctor_get(x_100, 0);
-lean_inc(x_109);
-lean_dec(x_100);
-lean_ctor_set(x_71, 3, x_108);
-x_110 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_110, 0, x_109);
-x_111 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_111, 0, x_110);
+lean_dec(x_75);
+x_77 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_77, 0, x_76);
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
 lean_inc(x_27);
-x_112 = l_Lean_Elab_Term_throwError___rarg(x_3, x_111, x_27, x_70);
-x_113 = lean_ctor_get(x_112, 0);
-lean_inc(x_113);
-x_114 = lean_ctor_get(x_112, 1);
-lean_inc(x_114);
-lean_dec(x_112);
-x_48 = x_113;
-x_49 = x_114;
-goto block_65;
-}
-else
-{
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-lean_dec(x_70);
-x_115 = lean_ctor_get(x_87, 1);
-lean_inc(x_115);
-lean_dec(x_87);
-x_116 = lean_ctor_get(x_100, 0);
-lean_inc(x_116);
-lean_dec(x_100);
-lean_ctor_set(x_71, 3, x_115);
-x_117 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_117, 0, x_71);
-lean_ctor_set(x_117, 1, x_73);
-lean_ctor_set(x_117, 2, x_74);
-lean_ctor_set(x_117, 3, x_75);
-lean_ctor_set(x_117, 4, x_76);
-lean_ctor_set(x_117, 5, x_77);
-x_118 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_118, 0, x_116);
-x_119 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_119, 0, x_118);
-lean_inc(x_27);
-x_120 = l_Lean_Elab_Term_throwError___rarg(x_3, x_119, x_27, x_117);
-x_121 = lean_ctor_get(x_120, 0);
-lean_inc(x_121);
-x_122 = lean_ctor_get(x_120, 1);
-lean_inc(x_122);
-lean_dec(x_120);
-x_48 = x_121;
-x_49 = x_122;
-goto block_65;
-}
-}
-else
-{
-lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-lean_dec(x_87);
-lean_free_object(x_71);
-lean_dec(x_84);
-lean_dec(x_83);
-lean_dec(x_81);
-lean_dec(x_80);
+x_79 = l_Lean_Elab_Term_throwError___rarg(x_3, x_78, x_27, x_71);
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
 lean_dec(x_79);
-lean_dec(x_77);
-lean_dec(x_76);
-lean_dec(x_75);
-lean_dec(x_74);
-lean_dec(x_73);
-x_123 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_70);
-x_124 = lean_ctor_get(x_123, 0);
-lean_inc(x_124);
-x_125 = lean_ctor_get(x_123, 1);
-lean_inc(x_125);
-lean_dec(x_123);
-x_48 = x_124;
-x_49 = x_125;
+x_48 = x_80;
+x_49 = x_81;
 goto block_65;
 }
+else
+{
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_82 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_71);
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+lean_dec(x_82);
+x_48 = x_83;
+x_49 = x_84;
+goto block_65;
 }
 }
 else
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
-x_126 = lean_ctor_get(x_71, 0);
-x_127 = lean_ctor_get(x_71, 1);
-x_128 = lean_ctor_get(x_71, 2);
-x_129 = lean_ctor_get(x_71, 3);
-x_130 = lean_ctor_get(x_71, 4);
-x_131 = lean_ctor_get(x_71, 5);
-lean_inc(x_131);
-lean_inc(x_130);
-lean_inc(x_129);
-lean_inc(x_128);
-lean_inc(x_127);
-lean_inc(x_126);
-lean_dec(x_71);
-x_132 = lean_environment_main_module(x_72);
-x_133 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_133, 0, x_132);
-lean_ctor_set(x_133, 1, x_67);
-lean_inc(x_3);
-x_134 = l_Lean_Elab_getMacros(x_38, x_3, x_133, x_129);
-lean_dec(x_38);
-if (lean_obj_tag(x_134) == 0)
-{
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+lean_object* x_85; 
 lean_dec(x_40);
 lean_dec(x_35);
 lean_dec(x_27);
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- lean_ctor_release(x_70, 2);
- lean_ctor_release(x_70, 3);
- lean_ctor_release(x_70, 4);
- lean_ctor_release(x_70, 5);
- x_135 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_135 = lean_box(0);
-}
-x_136 = lean_ctor_get(x_134, 0);
-lean_inc(x_136);
-x_137 = lean_ctor_get(x_134, 1);
-lean_inc(x_137);
-lean_dec(x_134);
-x_138 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_138, 0, x_126);
-lean_ctor_set(x_138, 1, x_127);
-lean_ctor_set(x_138, 2, x_128);
-lean_ctor_set(x_138, 3, x_137);
-lean_ctor_set(x_138, 4, x_130);
-lean_ctor_set(x_138, 5, x_131);
-if (lean_is_scalar(x_135)) {
- x_139 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_139 = x_135;
-}
-lean_ctor_set(x_139, 0, x_138);
-lean_ctor_set(x_139, 1, x_73);
-lean_ctor_set(x_139, 2, x_74);
-lean_ctor_set(x_139, 3, x_75);
-lean_ctor_set(x_139, 4, x_76);
-lean_ctor_set(x_139, 5, x_77);
-x_41 = x_136;
-x_42 = x_139;
-goto block_47;
-}
-else
-{
-lean_object* x_140; 
-lean_dec(x_11);
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_1);
-x_140 = lean_ctor_get(x_134, 0);
-lean_inc(x_140);
-if (lean_obj_tag(x_140) == 0)
-{
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- lean_ctor_release(x_70, 2);
- lean_ctor_release(x_70, 3);
- lean_ctor_release(x_70, 4);
- lean_ctor_release(x_70, 5);
- x_141 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_141 = lean_box(0);
-}
-x_142 = lean_ctor_get(x_134, 1);
-lean_inc(x_142);
-lean_dec(x_134);
-x_143 = lean_ctor_get(x_140, 0);
-lean_inc(x_143);
-lean_dec(x_140);
-x_144 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_144, 0, x_126);
-lean_ctor_set(x_144, 1, x_127);
-lean_ctor_set(x_144, 2, x_128);
-lean_ctor_set(x_144, 3, x_142);
-lean_ctor_set(x_144, 4, x_130);
-lean_ctor_set(x_144, 5, x_131);
-if (lean_is_scalar(x_141)) {
- x_145 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_145 = x_141;
-}
-lean_ctor_set(x_145, 0, x_144);
-lean_ctor_set(x_145, 1, x_73);
-lean_ctor_set(x_145, 2, x_74);
-lean_ctor_set(x_145, 3, x_75);
-lean_ctor_set(x_145, 4, x_76);
-lean_ctor_set(x_145, 5, x_77);
-x_146 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_146, 0, x_143);
-x_147 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_147, 0, x_146);
-lean_inc(x_27);
-x_148 = l_Lean_Elab_Term_throwError___rarg(x_3, x_147, x_27, x_145);
-x_149 = lean_ctor_get(x_148, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_148, 1);
-lean_inc(x_150);
-lean_dec(x_148);
-x_48 = x_149;
-x_49 = x_150;
-goto block_65;
-}
-else
-{
-lean_object* x_151; lean_object* x_152; lean_object* x_153; 
-lean_dec(x_134);
-lean_dec(x_131);
-lean_dec(x_130);
-lean_dec(x_128);
-lean_dec(x_127);
-lean_dec(x_126);
-lean_dec(x_77);
-lean_dec(x_76);
-lean_dec(x_75);
+x_85 = lean_ctor_get(x_74, 0);
+lean_inc(x_85);
 lean_dec(x_74);
-lean_dec(x_73);
-x_151 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_70);
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc(x_152);
-x_153 = lean_ctor_get(x_151, 1);
-lean_inc(x_153);
-lean_dec(x_151);
-x_48 = x_152;
-x_49 = x_153;
-goto block_65;
-}
-}
+x_41 = x_85;
+x_42 = x_71;
+goto block_47;
 }
 block_47:
 {
@@ -12808,7 +12289,7 @@ return x_64;
 }
 else
 {
-lean_object* x_154; lean_object* x_155; 
+lean_object* x_86; lean_object* x_87; 
 lean_dec(x_35);
 lean_dec(x_11);
 lean_dec(x_19);
@@ -12820,59 +12301,59 @@ lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_7);
-x_154 = lean_ctor_get(x_36, 0);
-lean_inc(x_154);
+x_86 = lean_ctor_get(x_36, 0);
+lean_inc(x_86);
 lean_dec(x_36);
 lean_inc(x_28);
-x_155 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_28, x_3, x_1, x_2, x_154, x_27, x_28);
-return x_155;
+x_87 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_28, x_3, x_1, x_2, x_86, x_27, x_28);
+return x_87;
 }
 }
-block_168:
+block_100:
 {
-lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; 
-lean_dec(x_157);
-x_158 = lean_box(0);
-x_159 = lean_unsigned_to_nat(0u);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+lean_dec(x_89);
+x_90 = lean_box(0);
+x_91 = lean_unsigned_to_nat(0u);
 lean_inc(x_3);
-x_160 = l_Lean_Syntax_formatStxAux___main(x_158, x_159, x_3);
-x_161 = l_Lean_Options_empty;
-x_162 = l_Lean_Format_pretty(x_160, x_161);
-x_163 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_163, 0, x_162);
-x_164 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_164, 0, x_163);
-x_165 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_166 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_166, 0, x_165);
-lean_ctor_set(x_166, 1, x_164);
-x_167 = l_Lean_Elab_Term_throwError___rarg(x_3, x_166, x_27, x_23);
+x_92 = l_Lean_Syntax_formatStxAux___main(x_90, x_91, x_3);
+x_93 = l_Lean_Options_empty;
+x_94 = l_Lean_Format_pretty(x_92, x_93);
+x_95 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_95, 0, x_94);
+x_96 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_96, 0, x_95);
+x_97 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_98 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_98, 0, x_97);
+lean_ctor_set(x_98, 1, x_96);
+x_99 = l_Lean_Elab_Term_throwError___rarg(x_3, x_98, x_27, x_23);
 lean_dec(x_3);
-return x_167;
+return x_99;
 }
 }
 else
 {
-lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_268; 
-x_178 = lean_ctor_get(x_11, 0);
-x_179 = lean_ctor_get(x_11, 1);
-x_180 = lean_ctor_get(x_11, 2);
-x_181 = lean_ctor_get(x_11, 3);
-x_182 = lean_ctor_get(x_11, 4);
-lean_inc(x_182);
-lean_inc(x_181);
-lean_inc(x_180);
-lean_inc(x_179);
-lean_inc(x_178);
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_179; 
+x_110 = lean_ctor_get(x_11, 0);
+x_111 = lean_ctor_get(x_11, 1);
+x_112 = lean_ctor_get(x_11, 2);
+x_113 = lean_ctor_get(x_11, 3);
+x_114 = lean_ctor_get(x_11, 4);
+lean_inc(x_114);
+lean_inc(x_113);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_inc(x_110);
 lean_dec(x_11);
-x_183 = lean_nat_add(x_181, x_8);
-lean_dec(x_181);
-x_184 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_184, 0, x_178);
-lean_ctor_set(x_184, 1, x_179);
-lean_ctor_set(x_184, 2, x_180);
-lean_ctor_set(x_184, 3, x_183);
-lean_ctor_set(x_184, 4, x_182);
+x_115 = lean_nat_add(x_113, x_8);
+lean_dec(x_113);
+x_116 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_116, 0, x_110);
+lean_ctor_set(x_116, 1, x_111);
+lean_ctor_set(x_116, 2, x_112);
+lean_ctor_set(x_116, 3, x_115);
+lean_ctor_set(x_116, 4, x_114);
 lean_inc(x_7);
 lean_inc(x_19);
 lean_inc(x_18);
@@ -12882,213 +12363,55 @@ lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_184);
-x_185 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_185, 0, x_184);
-lean_ctor_set(x_185, 1, x_12);
-lean_ctor_set(x_185, 2, x_13);
-lean_ctor_set(x_185, 3, x_14);
-lean_ctor_set(x_185, 4, x_15);
-lean_ctor_set(x_185, 5, x_16);
-lean_ctor_set(x_185, 6, x_17);
-lean_ctor_set(x_185, 7, x_18);
-lean_ctor_set(x_185, 8, x_19);
-lean_ctor_set(x_185, 9, x_7);
-lean_ctor_set_uint8(x_185, sizeof(void*)*10, x_20);
-lean_ctor_set_uint8(x_185, sizeof(void*)*10 + 1, x_21);
+lean_inc(x_116);
+x_117 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_117, 0, x_116);
+lean_ctor_set(x_117, 1, x_12);
+lean_ctor_set(x_117, 2, x_13);
+lean_ctor_set(x_117, 3, x_14);
+lean_ctor_set(x_117, 4, x_15);
+lean_ctor_set(x_117, 5, x_16);
+lean_ctor_set(x_117, 6, x_17);
+lean_ctor_set(x_117, 7, x_18);
+lean_ctor_set(x_117, 8, x_19);
+lean_ctor_set(x_117, 9, x_7);
+lean_ctor_set_uint8(x_117, sizeof(void*)*10, x_20);
+lean_ctor_set_uint8(x_117, sizeof(void*)*10 + 1, x_21);
 if (lean_obj_tag(x_3) == 1)
 {
-lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; uint8_t x_284; 
-x_280 = l_Lean_Elab_Term_getOptions(x_185, x_23);
-x_281 = lean_ctor_get(x_280, 0);
-lean_inc(x_281);
-x_282 = lean_ctor_get(x_280, 1);
-lean_inc(x_282);
-lean_dec(x_280);
-x_283 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
-x_284 = l_Lean_checkTraceOption(x_281, x_283);
-lean_dec(x_281);
-if (x_284 == 0)
-{
-x_186 = x_282;
-goto block_267;
-}
-else
-{
-lean_object* x_285; lean_object* x_286; lean_object* x_287; 
-lean_inc(x_3);
-x_285 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_285, 0, x_3);
-x_286 = l_Lean_Elab_Term_logTrace(x_283, x_3, x_285, x_185, x_282);
-x_287 = lean_ctor_get(x_286, 1);
-lean_inc(x_287);
-lean_dec(x_286);
-x_186 = x_287;
-goto block_267;
-}
-}
-else
-{
-lean_object* x_288; 
-lean_dec(x_184);
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_1);
-x_288 = lean_box(0);
-x_268 = x_288;
-goto block_279;
-}
-block_267:
-{
-lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-x_187 = l_Lean_Elab_Term_termElabAttribute;
-x_188 = lean_ctor_get(x_187, 1);
-lean_inc(x_188);
-x_189 = lean_ctor_get(x_186, 0);
-lean_inc(x_189);
-x_190 = lean_ctor_get(x_189, 0);
-lean_inc(x_190);
-lean_dec(x_189);
-x_191 = l_Lean_PersistentEnvExtension_getState___rarg(x_188, x_190);
-lean_dec(x_190);
-lean_dec(x_188);
-x_192 = lean_ctor_get(x_191, 1);
+lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; uint8_t x_195; 
+x_191 = l_Lean_Elab_Term_getOptions(x_117, x_23);
+x_192 = lean_ctor_get(x_191, 0);
 lean_inc(x_192);
+x_193 = lean_ctor_get(x_191, 1);
+lean_inc(x_193);
 lean_dec(x_191);
-lean_inc(x_3);
-x_193 = l_Lean_Syntax_getKind(x_3);
-x_194 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_192, x_193);
-if (lean_obj_tag(x_194) == 0)
+x_194 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
+x_195 = l_Lean_checkTraceOption(x_192, x_194);
+lean_dec(x_192);
+if (x_195 == 0)
 {
-lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_206; lean_object* x_207; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; 
-x_195 = l_Lean_Elab_Term_getEnv___rarg(x_186);
-x_196 = lean_ctor_get(x_195, 0);
-lean_inc(x_196);
-x_197 = lean_ctor_get(x_195, 1);
-lean_inc(x_197);
-if (lean_is_exclusive(x_195)) {
- lean_ctor_release(x_195, 0);
- lean_ctor_release(x_195, 1);
- x_198 = x_195;
-} else {
- lean_dec_ref(x_195);
- x_198 = lean_box(0);
-}
-x_224 = l_Lean_Elab_Term_getCurrMacroScope(x_185, x_197);
-x_225 = lean_ctor_get(x_224, 0);
-lean_inc(x_225);
-x_226 = lean_ctor_get(x_224, 1);
-lean_inc(x_226);
-lean_dec(x_224);
-x_227 = l_Lean_Elab_Term_getEnv___rarg(x_226);
-x_228 = lean_ctor_get(x_227, 1);
-lean_inc(x_228);
-x_229 = lean_ctor_get(x_228, 0);
-lean_inc(x_229);
-x_230 = lean_ctor_get(x_227, 0);
-lean_inc(x_230);
-lean_dec(x_227);
-x_231 = lean_ctor_get(x_228, 1);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_228, 2);
-lean_inc(x_232);
-x_233 = lean_ctor_get(x_228, 3);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_228, 4);
-lean_inc(x_234);
-x_235 = lean_ctor_get(x_228, 5);
-lean_inc(x_235);
-x_236 = lean_ctor_get(x_229, 0);
-lean_inc(x_236);
-x_237 = lean_ctor_get(x_229, 1);
-lean_inc(x_237);
-x_238 = lean_ctor_get(x_229, 2);
-lean_inc(x_238);
-x_239 = lean_ctor_get(x_229, 3);
-lean_inc(x_239);
-x_240 = lean_ctor_get(x_229, 4);
-lean_inc(x_240);
-x_241 = lean_ctor_get(x_229, 5);
-lean_inc(x_241);
-if (lean_is_exclusive(x_229)) {
- lean_ctor_release(x_229, 0);
- lean_ctor_release(x_229, 1);
- lean_ctor_release(x_229, 2);
- lean_ctor_release(x_229, 3);
- lean_ctor_release(x_229, 4);
- lean_ctor_release(x_229, 5);
- x_242 = x_229;
-} else {
- lean_dec_ref(x_229);
- x_242 = lean_box(0);
-}
-x_243 = lean_environment_main_module(x_230);
-x_244 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_244, 0, x_243);
-lean_ctor_set(x_244, 1, x_225);
-lean_inc(x_3);
-x_245 = l_Lean_Elab_getMacros(x_196, x_3, x_244, x_239);
-lean_dec(x_196);
-if (lean_obj_tag(x_245) == 0)
-{
-lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; 
-lean_dec(x_198);
-lean_dec(x_193);
-lean_dec(x_185);
-if (lean_is_exclusive(x_228)) {
- lean_ctor_release(x_228, 0);
- lean_ctor_release(x_228, 1);
- lean_ctor_release(x_228, 2);
- lean_ctor_release(x_228, 3);
- lean_ctor_release(x_228, 4);
- lean_ctor_release(x_228, 5);
- x_246 = x_228;
-} else {
- lean_dec_ref(x_228);
- x_246 = lean_box(0);
-}
-x_247 = lean_ctor_get(x_245, 0);
-lean_inc(x_247);
-x_248 = lean_ctor_get(x_245, 1);
-lean_inc(x_248);
-lean_dec(x_245);
-if (lean_is_scalar(x_242)) {
- x_249 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_249 = x_242;
-}
-lean_ctor_set(x_249, 0, x_236);
-lean_ctor_set(x_249, 1, x_237);
-lean_ctor_set(x_249, 2, x_238);
-lean_ctor_set(x_249, 3, x_248);
-lean_ctor_set(x_249, 4, x_240);
-lean_ctor_set(x_249, 5, x_241);
-if (lean_is_scalar(x_246)) {
- x_250 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_250 = x_246;
-}
-lean_ctor_set(x_250, 0, x_249);
-lean_ctor_set(x_250, 1, x_231);
-lean_ctor_set(x_250, 2, x_232);
-lean_ctor_set(x_250, 3, x_233);
-lean_ctor_set(x_250, 4, x_234);
-lean_ctor_set(x_250, 5, x_235);
-x_199 = x_247;
-x_200 = x_250;
-goto block_205;
+x_118 = x_193;
+goto block_178;
 }
 else
 {
-lean_object* x_251; 
-lean_dec(x_184);
+lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+lean_inc(x_3);
+x_196 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_196, 0, x_3);
+x_197 = l_Lean_Elab_Term_logTrace(x_194, x_3, x_196, x_117, x_193);
+x_198 = lean_ctor_get(x_197, 1);
+lean_inc(x_198);
+lean_dec(x_197);
+x_118 = x_198;
+goto block_178;
+}
+}
+else
+{
+lean_object* x_199; 
+lean_dec(x_116);
 lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
@@ -13099,191 +12422,229 @@ lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_7);
 lean_dec(x_1);
-x_251 = lean_ctor_get(x_245, 0);
-lean_inc(x_251);
-if (lean_obj_tag(x_251) == 0)
+x_199 = lean_box(0);
+x_179 = x_199;
+goto block_190;
+}
+block_178:
 {
-lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; 
-if (lean_is_exclusive(x_228)) {
- lean_ctor_release(x_228, 0);
- lean_ctor_release(x_228, 1);
- lean_ctor_release(x_228, 2);
- lean_ctor_release(x_228, 3);
- lean_ctor_release(x_228, 4);
- lean_ctor_release(x_228, 5);
- x_252 = x_228;
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+x_119 = l_Lean_Elab_Term_termElabAttribute;
+x_120 = lean_ctor_get(x_119, 1);
+lean_inc(x_120);
+x_121 = lean_ctor_get(x_118, 0);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_121, 0);
+lean_inc(x_122);
+lean_dec(x_121);
+x_123 = l_Lean_PersistentEnvExtension_getState___rarg(x_120, x_122);
+lean_dec(x_122);
+lean_dec(x_120);
+x_124 = lean_ctor_get(x_123, 1);
+lean_inc(x_124);
+lean_dec(x_123);
+lean_inc(x_3);
+x_125 = l_Lean_Syntax_getKind(x_3);
+x_126 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_124, x_125);
+if (lean_obj_tag(x_126) == 0)
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_138; lean_object* x_139; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_127 = l_Lean_Elab_Term_getEnv___rarg(x_118);
+x_128 = lean_ctor_get(x_127, 0);
+lean_inc(x_128);
+x_129 = lean_ctor_get(x_127, 1);
+lean_inc(x_129);
+if (lean_is_exclusive(x_127)) {
+ lean_ctor_release(x_127, 0);
+ lean_ctor_release(x_127, 1);
+ x_130 = x_127;
 } else {
- lean_dec_ref(x_228);
- x_252 = lean_box(0);
+ lean_dec_ref(x_127);
+ x_130 = lean_box(0);
 }
-x_253 = lean_ctor_get(x_245, 1);
-lean_inc(x_253);
-lean_dec(x_245);
-x_254 = lean_ctor_get(x_251, 0);
-lean_inc(x_254);
-lean_dec(x_251);
-if (lean_is_scalar(x_242)) {
- x_255 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_255 = x_242;
-}
-lean_ctor_set(x_255, 0, x_236);
-lean_ctor_set(x_255, 1, x_237);
-lean_ctor_set(x_255, 2, x_238);
-lean_ctor_set(x_255, 3, x_253);
-lean_ctor_set(x_255, 4, x_240);
-lean_ctor_set(x_255, 5, x_241);
-if (lean_is_scalar(x_252)) {
- x_256 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_256 = x_252;
-}
-lean_ctor_set(x_256, 0, x_255);
-lean_ctor_set(x_256, 1, x_231);
-lean_ctor_set(x_256, 2, x_232);
-lean_ctor_set(x_256, 3, x_233);
-lean_ctor_set(x_256, 4, x_234);
-lean_ctor_set(x_256, 5, x_235);
-x_257 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_257, 0, x_254);
-x_258 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_258, 0, x_257);
-lean_inc(x_185);
-x_259 = l_Lean_Elab_Term_throwError___rarg(x_3, x_258, x_185, x_256);
-x_260 = lean_ctor_get(x_259, 0);
-lean_inc(x_260);
-x_261 = lean_ctor_get(x_259, 1);
-lean_inc(x_261);
-lean_dec(x_259);
-x_206 = x_260;
-x_207 = x_261;
-goto block_223;
+x_156 = l_Lean_Elab_Term_getCurrMacroScope(x_117, x_129);
+x_157 = lean_ctor_get(x_156, 0);
+lean_inc(x_157);
+x_158 = lean_ctor_get(x_156, 1);
+lean_inc(x_158);
+lean_dec(x_156);
+x_159 = l_Lean_Elab_Term_getEnv___rarg(x_158);
+x_160 = lean_ctor_get(x_159, 0);
+lean_inc(x_160);
+x_161 = lean_ctor_get(x_159, 1);
+lean_inc(x_161);
+lean_dec(x_159);
+x_162 = lean_environment_main_module(x_160);
+x_163 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_163, 0, x_162);
+lean_ctor_set(x_163, 1, x_157);
+lean_inc(x_3);
+x_164 = l_Lean_Elab_getMacros(x_128, x_3, x_163);
+lean_dec(x_128);
+if (lean_obj_tag(x_164) == 0)
+{
+lean_object* x_165; 
+lean_dec(x_116);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_17);
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_7);
+lean_dec(x_1);
+x_165 = lean_ctor_get(x_164, 0);
+lean_inc(x_165);
+lean_dec(x_164);
+if (lean_obj_tag(x_165) == 0)
+{
+lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
+x_166 = lean_ctor_get(x_165, 0);
+lean_inc(x_166);
+lean_dec(x_165);
+x_167 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_167, 0, x_166);
+x_168 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_168, 0, x_167);
+lean_inc(x_117);
+x_169 = l_Lean_Elab_Term_throwError___rarg(x_3, x_168, x_117, x_161);
+x_170 = lean_ctor_get(x_169, 0);
+lean_inc(x_170);
+x_171 = lean_ctor_get(x_169, 1);
+lean_inc(x_171);
+lean_dec(x_169);
+x_138 = x_170;
+x_139 = x_171;
+goto block_155;
 }
 else
 {
-lean_object* x_262; lean_object* x_263; lean_object* x_264; 
-lean_dec(x_245);
-lean_dec(x_242);
-lean_dec(x_241);
-lean_dec(x_240);
-lean_dec(x_238);
-lean_dec(x_237);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
-lean_dec(x_232);
-lean_dec(x_231);
-x_262 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_228);
-x_263 = lean_ctor_get(x_262, 0);
-lean_inc(x_263);
-x_264 = lean_ctor_get(x_262, 1);
-lean_inc(x_264);
-lean_dec(x_262);
-x_206 = x_263;
-x_207 = x_264;
-goto block_223;
+lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_172 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_161);
+x_173 = lean_ctor_get(x_172, 0);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_172, 1);
+lean_inc(x_174);
+lean_dec(x_172);
+x_138 = x_173;
+x_139 = x_174;
+goto block_155;
 }
 }
-block_205:
+else
 {
-lean_object* x_201; lean_object* x_202; lean_object* x_203; 
-lean_inc(x_199);
-x_201 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_201, 0, x_3);
-lean_ctor_set(x_201, 1, x_199);
-x_202 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_202, 0, x_201);
-lean_ctor_set(x_202, 1, x_19);
-x_203 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_203, 0, x_184);
-lean_ctor_set(x_203, 1, x_12);
-lean_ctor_set(x_203, 2, x_13);
-lean_ctor_set(x_203, 3, x_14);
-lean_ctor_set(x_203, 4, x_15);
-lean_ctor_set(x_203, 5, x_16);
-lean_ctor_set(x_203, 6, x_17);
-lean_ctor_set(x_203, 7, x_18);
-lean_ctor_set(x_203, 8, x_202);
-lean_ctor_set(x_203, 9, x_7);
-lean_ctor_set_uint8(x_203, sizeof(void*)*10, x_20);
-lean_ctor_set_uint8(x_203, sizeof(void*)*10 + 1, x_21);
-x_3 = x_199;
-x_4 = x_203;
-x_5 = x_200;
+lean_object* x_175; 
+lean_dec(x_130);
+lean_dec(x_125);
+lean_dec(x_117);
+x_175 = lean_ctor_get(x_164, 0);
+lean_inc(x_175);
+lean_dec(x_164);
+x_131 = x_175;
+x_132 = x_161;
+goto block_137;
+}
+block_137:
+{
+lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+lean_inc(x_131);
+x_133 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_133, 0, x_3);
+lean_ctor_set(x_133, 1, x_131);
+x_134 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_134, 0, x_133);
+lean_ctor_set(x_134, 1, x_19);
+x_135 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_135, 0, x_116);
+lean_ctor_set(x_135, 1, x_12);
+lean_ctor_set(x_135, 2, x_13);
+lean_ctor_set(x_135, 3, x_14);
+lean_ctor_set(x_135, 4, x_15);
+lean_ctor_set(x_135, 5, x_16);
+lean_ctor_set(x_135, 6, x_17);
+lean_ctor_set(x_135, 7, x_18);
+lean_ctor_set(x_135, 8, x_134);
+lean_ctor_set(x_135, 9, x_7);
+lean_ctor_set_uint8(x_135, sizeof(void*)*10, x_20);
+lean_ctor_set_uint8(x_135, sizeof(void*)*10 + 1, x_21);
+x_3 = x_131;
+x_4 = x_135;
+x_5 = x_132;
 goto _start;
 }
-block_223:
+block_155:
 {
-lean_object* x_208; 
-x_208 = lean_ctor_get(x_206, 0);
-lean_inc(x_208);
-if (lean_obj_tag(x_208) == 0)
+lean_object* x_140; 
+x_140 = lean_ctor_get(x_138, 0);
+lean_inc(x_140);
+if (lean_obj_tag(x_140) == 0)
 {
-lean_object* x_209; 
-lean_dec(x_208);
-lean_dec(x_193);
-lean_dec(x_185);
+lean_object* x_141; 
+lean_dec(x_140);
+lean_dec(x_125);
+lean_dec(x_117);
 lean_dec(x_3);
-if (lean_is_scalar(x_198)) {
- x_209 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_130)) {
+ x_141 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_209 = x_198;
- lean_ctor_set_tag(x_209, 1);
+ x_141 = x_130;
+ lean_ctor_set_tag(x_141, 1);
 }
-lean_ctor_set(x_209, 0, x_206);
-lean_ctor_set(x_209, 1, x_207);
-return x_209;
+lean_ctor_set(x_141, 0, x_138);
+lean_ctor_set(x_141, 1, x_139);
+return x_141;
 }
 else
 {
-lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
-lean_dec(x_206);
-lean_dec(x_198);
-x_210 = l_Lean_Name_toString___closed__1;
-x_211 = l_Lean_Name_toStringWithSep___main(x_210, x_193);
-x_212 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_212, 0, x_211);
-x_213 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_213, 0, x_212);
-x_214 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
-x_215 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_215, 0, x_214);
-lean_ctor_set(x_215, 1, x_213);
-x_216 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
-x_217 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_217, 0, x_215);
-lean_ctor_set(x_217, 1, x_216);
-x_218 = l_Lean_Elab_Term_throwError___rarg(x_3, x_217, x_185, x_207);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; 
+lean_dec(x_138);
+lean_dec(x_130);
+x_142 = l_Lean_Name_toString___closed__1;
+x_143 = l_Lean_Name_toStringWithSep___main(x_142, x_125);
+x_144 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_144, 0, x_143);
+x_145 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_145, 0, x_144);
+x_146 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
+x_147 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_147, 0, x_146);
+lean_ctor_set(x_147, 1, x_145);
+x_148 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
+x_149 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_149, 0, x_147);
+lean_ctor_set(x_149, 1, x_148);
+x_150 = l_Lean_Elab_Term_throwError___rarg(x_3, x_149, x_117, x_139);
 lean_dec(x_3);
-x_219 = lean_ctor_get(x_218, 0);
-lean_inc(x_219);
-x_220 = lean_ctor_get(x_218, 1);
-lean_inc(x_220);
-if (lean_is_exclusive(x_218)) {
- lean_ctor_release(x_218, 0);
- lean_ctor_release(x_218, 1);
- x_221 = x_218;
+x_151 = lean_ctor_get(x_150, 0);
+lean_inc(x_151);
+x_152 = lean_ctor_get(x_150, 1);
+lean_inc(x_152);
+if (lean_is_exclusive(x_150)) {
+ lean_ctor_release(x_150, 0);
+ lean_ctor_release(x_150, 1);
+ x_153 = x_150;
 } else {
- lean_dec_ref(x_218);
- x_221 = lean_box(0);
+ lean_dec_ref(x_150);
+ x_153 = lean_box(0);
 }
-if (lean_is_scalar(x_221)) {
- x_222 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_153)) {
+ x_154 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_222 = x_221;
+ x_154 = x_153;
 }
-lean_ctor_set(x_222, 0, x_219);
-lean_ctor_set(x_222, 1, x_220);
-return x_222;
+lean_ctor_set(x_154, 0, x_151);
+lean_ctor_set(x_154, 1, x_152);
+return x_154;
 }
 }
 }
 else
 {
-lean_object* x_265; lean_object* x_266; 
-lean_dec(x_193);
-lean_dec(x_184);
+lean_object* x_176; lean_object* x_177; 
+lean_dec(x_125);
+lean_dec(x_116);
 lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
@@ -13293,671 +12654,551 @@ lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_7);
-x_265 = lean_ctor_get(x_194, 0);
-lean_inc(x_265);
-lean_dec(x_194);
-lean_inc(x_186);
-x_266 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_186, x_3, x_1, x_2, x_265, x_185, x_186);
-return x_266;
+x_176 = lean_ctor_get(x_126, 0);
+lean_inc(x_176);
+lean_dec(x_126);
+lean_inc(x_118);
+x_177 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_118, x_3, x_1, x_2, x_176, x_117, x_118);
+return x_177;
 }
 }
-block_279:
+block_190:
 {
-lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; 
-lean_dec(x_268);
-x_269 = lean_box(0);
-x_270 = lean_unsigned_to_nat(0u);
+lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; 
+lean_dec(x_179);
+x_180 = lean_box(0);
+x_181 = lean_unsigned_to_nat(0u);
 lean_inc(x_3);
-x_271 = l_Lean_Syntax_formatStxAux___main(x_269, x_270, x_3);
-x_272 = l_Lean_Options_empty;
-x_273 = l_Lean_Format_pretty(x_271, x_272);
-x_274 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_274, 0, x_273);
-x_275 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_275, 0, x_274);
-x_276 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_277 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_277, 0, x_276);
-lean_ctor_set(x_277, 1, x_275);
-x_278 = l_Lean_Elab_Term_throwError___rarg(x_3, x_277, x_185, x_23);
+x_182 = l_Lean_Syntax_formatStxAux___main(x_180, x_181, x_3);
+x_183 = l_Lean_Options_empty;
+x_184 = l_Lean_Format_pretty(x_182, x_183);
+x_185 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_185, 0, x_184);
+x_186 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_186, 0, x_185);
+x_187 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_188 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_188, 0, x_187);
+lean_ctor_set(x_188, 1, x_186);
+x_189 = l_Lean_Elab_Term_throwError___rarg(x_3, x_188, x_117, x_23);
 lean_dec(x_3);
-return x_278;
+return x_189;
 }
 }
 }
 }
 else
 {
-lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; uint8_t x_308; uint8_t x_309; lean_object* x_310; lean_object* x_311; lean_object* x_425; lean_object* x_426; uint8_t x_427; 
-x_299 = lean_ctor_get(x_4, 0);
-x_300 = lean_ctor_get(x_4, 1);
-x_301 = lean_ctor_get(x_4, 2);
-x_302 = lean_ctor_get(x_4, 3);
-x_303 = lean_ctor_get(x_4, 4);
-x_304 = lean_ctor_get(x_4, 5);
-x_305 = lean_ctor_get(x_4, 6);
-x_306 = lean_ctor_get(x_4, 7);
-x_307 = lean_ctor_get(x_4, 8);
-x_308 = lean_ctor_get_uint8(x_4, sizeof(void*)*10);
-x_309 = lean_ctor_get_uint8(x_4, sizeof(void*)*10 + 1);
-lean_inc(x_307);
-lean_inc(x_306);
-lean_inc(x_305);
-lean_inc(x_304);
-lean_inc(x_303);
-lean_inc(x_302);
-lean_inc(x_301);
-lean_inc(x_300);
-lean_inc(x_299);
+lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; uint8_t x_219; uint8_t x_220; lean_object* x_221; lean_object* x_222; lean_object* x_315; lean_object* x_316; uint8_t x_317; 
+x_210 = lean_ctor_get(x_4, 0);
+x_211 = lean_ctor_get(x_4, 1);
+x_212 = lean_ctor_get(x_4, 2);
+x_213 = lean_ctor_get(x_4, 3);
+x_214 = lean_ctor_get(x_4, 4);
+x_215 = lean_ctor_get(x_4, 5);
+x_216 = lean_ctor_get(x_4, 6);
+x_217 = lean_ctor_get(x_4, 7);
+x_218 = lean_ctor_get(x_4, 8);
+x_219 = lean_ctor_get_uint8(x_4, sizeof(void*)*10);
+x_220 = lean_ctor_get_uint8(x_4, sizeof(void*)*10 + 1);
+lean_inc(x_218);
+lean_inc(x_217);
+lean_inc(x_216);
+lean_inc(x_215);
+lean_inc(x_214);
+lean_inc(x_213);
+lean_inc(x_212);
+lean_inc(x_211);
+lean_inc(x_210);
 lean_dec(x_4);
 lean_inc(x_7);
-lean_inc(x_307);
-lean_inc(x_306);
-lean_inc(x_305);
-lean_inc(x_304);
-lean_inc(x_303);
-lean_inc(x_302);
-lean_inc(x_301);
-lean_inc(x_300);
-lean_inc(x_299);
-x_310 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_310, 0, x_299);
-lean_ctor_set(x_310, 1, x_300);
-lean_ctor_set(x_310, 2, x_301);
-lean_ctor_set(x_310, 3, x_302);
-lean_ctor_set(x_310, 4, x_303);
-lean_ctor_set(x_310, 5, x_304);
-lean_ctor_set(x_310, 6, x_305);
-lean_ctor_set(x_310, 7, x_306);
-lean_ctor_set(x_310, 8, x_307);
-lean_ctor_set(x_310, 9, x_7);
-lean_ctor_set_uint8(x_310, sizeof(void*)*10, x_308);
-lean_ctor_set_uint8(x_310, sizeof(void*)*10 + 1, x_309);
-x_425 = lean_ctor_get(x_299, 3);
-lean_inc(x_425);
-x_426 = lean_ctor_get(x_299, 4);
-lean_inc(x_426);
-x_427 = lean_nat_dec_eq(x_425, x_426);
-lean_dec(x_426);
-lean_dec(x_425);
-if (x_427 == 0)
+lean_inc(x_218);
+lean_inc(x_217);
+lean_inc(x_216);
+lean_inc(x_215);
+lean_inc(x_214);
+lean_inc(x_213);
+lean_inc(x_212);
+lean_inc(x_211);
+lean_inc(x_210);
+x_221 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_221, 0, x_210);
+lean_ctor_set(x_221, 1, x_211);
+lean_ctor_set(x_221, 2, x_212);
+lean_ctor_set(x_221, 3, x_213);
+lean_ctor_set(x_221, 4, x_214);
+lean_ctor_set(x_221, 5, x_215);
+lean_ctor_set(x_221, 6, x_216);
+lean_ctor_set(x_221, 7, x_217);
+lean_ctor_set(x_221, 8, x_218);
+lean_ctor_set(x_221, 9, x_7);
+lean_ctor_set_uint8(x_221, sizeof(void*)*10, x_219);
+lean_ctor_set_uint8(x_221, sizeof(void*)*10 + 1, x_220);
+x_315 = lean_ctor_get(x_210, 3);
+lean_inc(x_315);
+x_316 = lean_ctor_get(x_210, 4);
+lean_inc(x_316);
+x_317 = lean_nat_dec_eq(x_315, x_316);
+lean_dec(x_316);
+lean_dec(x_315);
+if (x_317 == 0)
 {
-lean_dec(x_310);
-x_311 = x_5;
-goto block_424;
+lean_dec(x_221);
+x_222 = x_5;
+goto block_314;
 }
 else
 {
-lean_object* x_428; lean_object* x_429; lean_object* x_430; lean_object* x_431; lean_object* x_432; lean_object* x_433; 
-lean_dec(x_307);
-lean_dec(x_306);
-lean_dec(x_305);
-lean_dec(x_304);
-lean_dec(x_303);
-lean_dec(x_302);
-lean_dec(x_301);
-lean_dec(x_300);
-lean_dec(x_299);
+lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; 
+lean_dec(x_218);
+lean_dec(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec(x_211);
+lean_dec(x_210);
 lean_dec(x_7);
 lean_dec(x_1);
-x_428 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
-x_429 = l_Lean_Elab_Term_throwError___rarg(x_3, x_428, x_310, x_5);
+x_318 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
+x_319 = l_Lean_Elab_Term_throwError___rarg(x_3, x_318, x_221, x_5);
 lean_dec(x_3);
-x_430 = lean_ctor_get(x_429, 0);
-lean_inc(x_430);
-x_431 = lean_ctor_get(x_429, 1);
-lean_inc(x_431);
-if (lean_is_exclusive(x_429)) {
- lean_ctor_release(x_429, 0);
- lean_ctor_release(x_429, 1);
- x_432 = x_429;
+x_320 = lean_ctor_get(x_319, 0);
+lean_inc(x_320);
+x_321 = lean_ctor_get(x_319, 1);
+lean_inc(x_321);
+if (lean_is_exclusive(x_319)) {
+ lean_ctor_release(x_319, 0);
+ lean_ctor_release(x_319, 1);
+ x_322 = x_319;
 } else {
- lean_dec_ref(x_429);
- x_432 = lean_box(0);
+ lean_dec_ref(x_319);
+ x_322 = lean_box(0);
 }
-if (lean_is_scalar(x_432)) {
- x_433 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_322)) {
+ x_323 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_433 = x_432;
+ x_323 = x_322;
 }
-lean_ctor_set(x_433, 0, x_430);
-lean_ctor_set(x_433, 1, x_431);
-return x_433;
+lean_ctor_set(x_323, 0, x_320);
+lean_ctor_set(x_323, 1, x_321);
+return x_323;
 }
-block_424:
+block_314:
 {
-lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_403; 
-x_312 = lean_ctor_get(x_299, 0);
-lean_inc(x_312);
-x_313 = lean_ctor_get(x_299, 1);
-lean_inc(x_313);
-x_314 = lean_ctor_get(x_299, 2);
-lean_inc(x_314);
-x_315 = lean_ctor_get(x_299, 3);
-lean_inc(x_315);
-x_316 = lean_ctor_get(x_299, 4);
-lean_inc(x_316);
-if (lean_is_exclusive(x_299)) {
- lean_ctor_release(x_299, 0);
- lean_ctor_release(x_299, 1);
- lean_ctor_release(x_299, 2);
- lean_ctor_release(x_299, 3);
- lean_ctor_release(x_299, 4);
- x_317 = x_299;
+lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_293; 
+x_223 = lean_ctor_get(x_210, 0);
+lean_inc(x_223);
+x_224 = lean_ctor_get(x_210, 1);
+lean_inc(x_224);
+x_225 = lean_ctor_get(x_210, 2);
+lean_inc(x_225);
+x_226 = lean_ctor_get(x_210, 3);
+lean_inc(x_226);
+x_227 = lean_ctor_get(x_210, 4);
+lean_inc(x_227);
+if (lean_is_exclusive(x_210)) {
+ lean_ctor_release(x_210, 0);
+ lean_ctor_release(x_210, 1);
+ lean_ctor_release(x_210, 2);
+ lean_ctor_release(x_210, 3);
+ lean_ctor_release(x_210, 4);
+ x_228 = x_210;
 } else {
- lean_dec_ref(x_299);
- x_317 = lean_box(0);
+ lean_dec_ref(x_210);
+ x_228 = lean_box(0);
 }
-x_318 = lean_nat_add(x_315, x_8);
-lean_dec(x_315);
-if (lean_is_scalar(x_317)) {
- x_319 = lean_alloc_ctor(0, 5, 0);
+x_229 = lean_nat_add(x_226, x_8);
+lean_dec(x_226);
+if (lean_is_scalar(x_228)) {
+ x_230 = lean_alloc_ctor(0, 5, 0);
 } else {
- x_319 = x_317;
+ x_230 = x_228;
 }
-lean_ctor_set(x_319, 0, x_312);
-lean_ctor_set(x_319, 1, x_313);
-lean_ctor_set(x_319, 2, x_314);
-lean_ctor_set(x_319, 3, x_318);
-lean_ctor_set(x_319, 4, x_316);
+lean_ctor_set(x_230, 0, x_223);
+lean_ctor_set(x_230, 1, x_224);
+lean_ctor_set(x_230, 2, x_225);
+lean_ctor_set(x_230, 3, x_229);
+lean_ctor_set(x_230, 4, x_227);
 lean_inc(x_7);
-lean_inc(x_307);
-lean_inc(x_306);
-lean_inc(x_305);
-lean_inc(x_304);
-lean_inc(x_303);
-lean_inc(x_302);
-lean_inc(x_301);
-lean_inc(x_300);
-lean_inc(x_319);
-x_320 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_320, 0, x_319);
-lean_ctor_set(x_320, 1, x_300);
-lean_ctor_set(x_320, 2, x_301);
-lean_ctor_set(x_320, 3, x_302);
-lean_ctor_set(x_320, 4, x_303);
-lean_ctor_set(x_320, 5, x_304);
-lean_ctor_set(x_320, 6, x_305);
-lean_ctor_set(x_320, 7, x_306);
-lean_ctor_set(x_320, 8, x_307);
-lean_ctor_set(x_320, 9, x_7);
-lean_ctor_set_uint8(x_320, sizeof(void*)*10, x_308);
-lean_ctor_set_uint8(x_320, sizeof(void*)*10 + 1, x_309);
+lean_inc(x_218);
+lean_inc(x_217);
+lean_inc(x_216);
+lean_inc(x_215);
+lean_inc(x_214);
+lean_inc(x_213);
+lean_inc(x_212);
+lean_inc(x_211);
+lean_inc(x_230);
+x_231 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_231, 0, x_230);
+lean_ctor_set(x_231, 1, x_211);
+lean_ctor_set(x_231, 2, x_212);
+lean_ctor_set(x_231, 3, x_213);
+lean_ctor_set(x_231, 4, x_214);
+lean_ctor_set(x_231, 5, x_215);
+lean_ctor_set(x_231, 6, x_216);
+lean_ctor_set(x_231, 7, x_217);
+lean_ctor_set(x_231, 8, x_218);
+lean_ctor_set(x_231, 9, x_7);
+lean_ctor_set_uint8(x_231, sizeof(void*)*10, x_219);
+lean_ctor_set_uint8(x_231, sizeof(void*)*10 + 1, x_220);
 if (lean_obj_tag(x_3) == 1)
 {
-lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; uint8_t x_419; 
-x_415 = l_Lean_Elab_Term_getOptions(x_320, x_311);
-x_416 = lean_ctor_get(x_415, 0);
-lean_inc(x_416);
-x_417 = lean_ctor_get(x_415, 1);
-lean_inc(x_417);
-lean_dec(x_415);
-x_418 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
-x_419 = l_Lean_checkTraceOption(x_416, x_418);
-lean_dec(x_416);
-if (x_419 == 0)
-{
-x_321 = x_417;
-goto block_402;
-}
-else
-{
-lean_object* x_420; lean_object* x_421; lean_object* x_422; 
-lean_inc(x_3);
-x_420 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_420, 0, x_3);
-x_421 = l_Lean_Elab_Term_logTrace(x_418, x_3, x_420, x_320, x_417);
-x_422 = lean_ctor_get(x_421, 1);
-lean_inc(x_422);
-lean_dec(x_421);
-x_321 = x_422;
-goto block_402;
-}
-}
-else
-{
-lean_object* x_423; 
-lean_dec(x_319);
-lean_dec(x_307);
-lean_dec(x_306);
+lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; uint8_t x_309; 
+x_305 = l_Lean_Elab_Term_getOptions(x_231, x_222);
+x_306 = lean_ctor_get(x_305, 0);
+lean_inc(x_306);
+x_307 = lean_ctor_get(x_305, 1);
+lean_inc(x_307);
 lean_dec(x_305);
-lean_dec(x_304);
-lean_dec(x_303);
-lean_dec(x_302);
-lean_dec(x_301);
-lean_dec(x_300);
+x_308 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
+x_309 = l_Lean_checkTraceOption(x_306, x_308);
+lean_dec(x_306);
+if (x_309 == 0)
+{
+x_232 = x_307;
+goto block_292;
+}
+else
+{
+lean_object* x_310; lean_object* x_311; lean_object* x_312; 
+lean_inc(x_3);
+x_310 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_310, 0, x_3);
+x_311 = l_Lean_Elab_Term_logTrace(x_308, x_3, x_310, x_231, x_307);
+x_312 = lean_ctor_get(x_311, 1);
+lean_inc(x_312);
+lean_dec(x_311);
+x_232 = x_312;
+goto block_292;
+}
+}
+else
+{
+lean_object* x_313; 
+lean_dec(x_230);
+lean_dec(x_218);
+lean_dec(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec(x_211);
 lean_dec(x_7);
 lean_dec(x_1);
-x_423 = lean_box(0);
-x_403 = x_423;
-goto block_414;
+x_313 = lean_box(0);
+x_293 = x_313;
+goto block_304;
 }
-block_402:
+block_292:
 {
-lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; 
-x_322 = l_Lean_Elab_Term_termElabAttribute;
-x_323 = lean_ctor_get(x_322, 1);
-lean_inc(x_323);
-x_324 = lean_ctor_get(x_321, 0);
-lean_inc(x_324);
-x_325 = lean_ctor_get(x_324, 0);
-lean_inc(x_325);
-lean_dec(x_324);
-x_326 = l_Lean_PersistentEnvExtension_getState___rarg(x_323, x_325);
-lean_dec(x_325);
-lean_dec(x_323);
-x_327 = lean_ctor_get(x_326, 1);
-lean_inc(x_327);
-lean_dec(x_326);
+lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; 
+x_233 = l_Lean_Elab_Term_termElabAttribute;
+x_234 = lean_ctor_get(x_233, 1);
+lean_inc(x_234);
+x_235 = lean_ctor_get(x_232, 0);
+lean_inc(x_235);
+x_236 = lean_ctor_get(x_235, 0);
+lean_inc(x_236);
+lean_dec(x_235);
+x_237 = l_Lean_PersistentEnvExtension_getState___rarg(x_234, x_236);
+lean_dec(x_236);
+lean_dec(x_234);
+x_238 = lean_ctor_get(x_237, 1);
+lean_inc(x_238);
+lean_dec(x_237);
 lean_inc(x_3);
-x_328 = l_Lean_Syntax_getKind(x_3);
-x_329 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_327, x_328);
-if (lean_obj_tag(x_329) == 0)
+x_239 = l_Lean_Syntax_getKind(x_3);
+x_240 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_238, x_239);
+if (lean_obj_tag(x_240) == 0)
 {
-lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_341; lean_object* x_342; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; 
-x_330 = l_Lean_Elab_Term_getEnv___rarg(x_321);
-x_331 = lean_ctor_get(x_330, 0);
-lean_inc(x_331);
-x_332 = lean_ctor_get(x_330, 1);
-lean_inc(x_332);
-if (lean_is_exclusive(x_330)) {
- lean_ctor_release(x_330, 0);
- lean_ctor_release(x_330, 1);
- x_333 = x_330;
+lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_252; lean_object* x_253; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; 
+x_241 = l_Lean_Elab_Term_getEnv___rarg(x_232);
+x_242 = lean_ctor_get(x_241, 0);
+lean_inc(x_242);
+x_243 = lean_ctor_get(x_241, 1);
+lean_inc(x_243);
+if (lean_is_exclusive(x_241)) {
+ lean_ctor_release(x_241, 0);
+ lean_ctor_release(x_241, 1);
+ x_244 = x_241;
 } else {
- lean_dec_ref(x_330);
- x_333 = lean_box(0);
+ lean_dec_ref(x_241);
+ x_244 = lean_box(0);
 }
-x_359 = l_Lean_Elab_Term_getCurrMacroScope(x_320, x_332);
-x_360 = lean_ctor_get(x_359, 0);
-lean_inc(x_360);
-x_361 = lean_ctor_get(x_359, 1);
-lean_inc(x_361);
-lean_dec(x_359);
-x_362 = l_Lean_Elab_Term_getEnv___rarg(x_361);
-x_363 = lean_ctor_get(x_362, 1);
-lean_inc(x_363);
-x_364 = lean_ctor_get(x_363, 0);
-lean_inc(x_364);
-x_365 = lean_ctor_get(x_362, 0);
-lean_inc(x_365);
-lean_dec(x_362);
-x_366 = lean_ctor_get(x_363, 1);
-lean_inc(x_366);
-x_367 = lean_ctor_get(x_363, 2);
-lean_inc(x_367);
-x_368 = lean_ctor_get(x_363, 3);
-lean_inc(x_368);
-x_369 = lean_ctor_get(x_363, 4);
-lean_inc(x_369);
-x_370 = lean_ctor_get(x_363, 5);
-lean_inc(x_370);
-x_371 = lean_ctor_get(x_364, 0);
-lean_inc(x_371);
-x_372 = lean_ctor_get(x_364, 1);
-lean_inc(x_372);
-x_373 = lean_ctor_get(x_364, 2);
-lean_inc(x_373);
-x_374 = lean_ctor_get(x_364, 3);
-lean_inc(x_374);
-x_375 = lean_ctor_get(x_364, 4);
-lean_inc(x_375);
-x_376 = lean_ctor_get(x_364, 5);
-lean_inc(x_376);
-if (lean_is_exclusive(x_364)) {
- lean_ctor_release(x_364, 0);
- lean_ctor_release(x_364, 1);
- lean_ctor_release(x_364, 2);
- lean_ctor_release(x_364, 3);
- lean_ctor_release(x_364, 4);
- lean_ctor_release(x_364, 5);
- x_377 = x_364;
-} else {
- lean_dec_ref(x_364);
- x_377 = lean_box(0);
-}
-x_378 = lean_environment_main_module(x_365);
-x_379 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_379, 0, x_378);
-lean_ctor_set(x_379, 1, x_360);
+x_270 = l_Lean_Elab_Term_getCurrMacroScope(x_231, x_243);
+x_271 = lean_ctor_get(x_270, 0);
+lean_inc(x_271);
+x_272 = lean_ctor_get(x_270, 1);
+lean_inc(x_272);
+lean_dec(x_270);
+x_273 = l_Lean_Elab_Term_getEnv___rarg(x_272);
+x_274 = lean_ctor_get(x_273, 0);
+lean_inc(x_274);
+x_275 = lean_ctor_get(x_273, 1);
+lean_inc(x_275);
+lean_dec(x_273);
+x_276 = lean_environment_main_module(x_274);
+x_277 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_277, 0, x_276);
+lean_ctor_set(x_277, 1, x_271);
 lean_inc(x_3);
-x_380 = l_Lean_Elab_getMacros(x_331, x_3, x_379, x_374);
-lean_dec(x_331);
-if (lean_obj_tag(x_380) == 0)
+x_278 = l_Lean_Elab_getMacros(x_242, x_3, x_277);
+lean_dec(x_242);
+if (lean_obj_tag(x_278) == 0)
 {
-lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; 
-lean_dec(x_333);
-lean_dec(x_328);
-lean_dec(x_320);
-if (lean_is_exclusive(x_363)) {
- lean_ctor_release(x_363, 0);
- lean_ctor_release(x_363, 1);
- lean_ctor_release(x_363, 2);
- lean_ctor_release(x_363, 3);
- lean_ctor_release(x_363, 4);
- lean_ctor_release(x_363, 5);
- x_381 = x_363;
-} else {
- lean_dec_ref(x_363);
- x_381 = lean_box(0);
-}
-x_382 = lean_ctor_get(x_380, 0);
-lean_inc(x_382);
-x_383 = lean_ctor_get(x_380, 1);
-lean_inc(x_383);
-lean_dec(x_380);
-if (lean_is_scalar(x_377)) {
- x_384 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_384 = x_377;
-}
-lean_ctor_set(x_384, 0, x_371);
-lean_ctor_set(x_384, 1, x_372);
-lean_ctor_set(x_384, 2, x_373);
-lean_ctor_set(x_384, 3, x_383);
-lean_ctor_set(x_384, 4, x_375);
-lean_ctor_set(x_384, 5, x_376);
-if (lean_is_scalar(x_381)) {
- x_385 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_385 = x_381;
-}
-lean_ctor_set(x_385, 0, x_384);
-lean_ctor_set(x_385, 1, x_366);
-lean_ctor_set(x_385, 2, x_367);
-lean_ctor_set(x_385, 3, x_368);
-lean_ctor_set(x_385, 4, x_369);
-lean_ctor_set(x_385, 5, x_370);
-x_334 = x_382;
-x_335 = x_385;
-goto block_340;
-}
-else
-{
-lean_object* x_386; 
-lean_dec(x_319);
-lean_dec(x_307);
-lean_dec(x_306);
-lean_dec(x_305);
-lean_dec(x_304);
-lean_dec(x_303);
-lean_dec(x_302);
-lean_dec(x_301);
-lean_dec(x_300);
+lean_object* x_279; 
+lean_dec(x_230);
+lean_dec(x_218);
+lean_dec(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec(x_211);
 lean_dec(x_7);
 lean_dec(x_1);
-x_386 = lean_ctor_get(x_380, 0);
-lean_inc(x_386);
-if (lean_obj_tag(x_386) == 0)
+x_279 = lean_ctor_get(x_278, 0);
+lean_inc(x_279);
+lean_dec(x_278);
+if (lean_obj_tag(x_279) == 0)
 {
-lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; 
-if (lean_is_exclusive(x_363)) {
- lean_ctor_release(x_363, 0);
- lean_ctor_release(x_363, 1);
- lean_ctor_release(x_363, 2);
- lean_ctor_release(x_363, 3);
- lean_ctor_release(x_363, 4);
- lean_ctor_release(x_363, 5);
- x_387 = x_363;
-} else {
- lean_dec_ref(x_363);
- x_387 = lean_box(0);
-}
-x_388 = lean_ctor_get(x_380, 1);
-lean_inc(x_388);
-lean_dec(x_380);
-x_389 = lean_ctor_get(x_386, 0);
-lean_inc(x_389);
-lean_dec(x_386);
-if (lean_is_scalar(x_377)) {
- x_390 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_390 = x_377;
-}
-lean_ctor_set(x_390, 0, x_371);
-lean_ctor_set(x_390, 1, x_372);
-lean_ctor_set(x_390, 2, x_373);
-lean_ctor_set(x_390, 3, x_388);
-lean_ctor_set(x_390, 4, x_375);
-lean_ctor_set(x_390, 5, x_376);
-if (lean_is_scalar(x_387)) {
- x_391 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_391 = x_387;
-}
-lean_ctor_set(x_391, 0, x_390);
-lean_ctor_set(x_391, 1, x_366);
-lean_ctor_set(x_391, 2, x_367);
-lean_ctor_set(x_391, 3, x_368);
-lean_ctor_set(x_391, 4, x_369);
-lean_ctor_set(x_391, 5, x_370);
-x_392 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_392, 0, x_389);
-x_393 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_393, 0, x_392);
-lean_inc(x_320);
-x_394 = l_Lean_Elab_Term_throwError___rarg(x_3, x_393, x_320, x_391);
-x_395 = lean_ctor_get(x_394, 0);
-lean_inc(x_395);
-x_396 = lean_ctor_get(x_394, 1);
-lean_inc(x_396);
-lean_dec(x_394);
-x_341 = x_395;
-x_342 = x_396;
-goto block_358;
+lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; 
+x_280 = lean_ctor_get(x_279, 0);
+lean_inc(x_280);
+lean_dec(x_279);
+x_281 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_281, 0, x_280);
+x_282 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_282, 0, x_281);
+lean_inc(x_231);
+x_283 = l_Lean_Elab_Term_throwError___rarg(x_3, x_282, x_231, x_275);
+x_284 = lean_ctor_get(x_283, 0);
+lean_inc(x_284);
+x_285 = lean_ctor_get(x_283, 1);
+lean_inc(x_285);
+lean_dec(x_283);
+x_252 = x_284;
+x_253 = x_285;
+goto block_269;
 }
 else
 {
-lean_object* x_397; lean_object* x_398; lean_object* x_399; 
-lean_dec(x_380);
-lean_dec(x_377);
-lean_dec(x_376);
-lean_dec(x_375);
-lean_dec(x_373);
-lean_dec(x_372);
-lean_dec(x_371);
-lean_dec(x_370);
-lean_dec(x_369);
-lean_dec(x_368);
-lean_dec(x_367);
-lean_dec(x_366);
-x_397 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_363);
-x_398 = lean_ctor_get(x_397, 0);
-lean_inc(x_398);
-x_399 = lean_ctor_get(x_397, 1);
-lean_inc(x_399);
-lean_dec(x_397);
-x_341 = x_398;
-x_342 = x_399;
-goto block_358;
+lean_object* x_286; lean_object* x_287; lean_object* x_288; 
+x_286 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_275);
+x_287 = lean_ctor_get(x_286, 0);
+lean_inc(x_287);
+x_288 = lean_ctor_get(x_286, 1);
+lean_inc(x_288);
+lean_dec(x_286);
+x_252 = x_287;
+x_253 = x_288;
+goto block_269;
 }
 }
-block_340:
+else
 {
-lean_object* x_336; lean_object* x_337; lean_object* x_338; 
-lean_inc(x_334);
-x_336 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_336, 0, x_3);
-lean_ctor_set(x_336, 1, x_334);
-x_337 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_337, 0, x_336);
-lean_ctor_set(x_337, 1, x_307);
-x_338 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_338, 0, x_319);
-lean_ctor_set(x_338, 1, x_300);
-lean_ctor_set(x_338, 2, x_301);
-lean_ctor_set(x_338, 3, x_302);
-lean_ctor_set(x_338, 4, x_303);
-lean_ctor_set(x_338, 5, x_304);
-lean_ctor_set(x_338, 6, x_305);
-lean_ctor_set(x_338, 7, x_306);
-lean_ctor_set(x_338, 8, x_337);
-lean_ctor_set(x_338, 9, x_7);
-lean_ctor_set_uint8(x_338, sizeof(void*)*10, x_308);
-lean_ctor_set_uint8(x_338, sizeof(void*)*10 + 1, x_309);
-x_3 = x_334;
-x_4 = x_338;
-x_5 = x_335;
+lean_object* x_289; 
+lean_dec(x_244);
+lean_dec(x_239);
+lean_dec(x_231);
+x_289 = lean_ctor_get(x_278, 0);
+lean_inc(x_289);
+lean_dec(x_278);
+x_245 = x_289;
+x_246 = x_275;
+goto block_251;
+}
+block_251:
+{
+lean_object* x_247; lean_object* x_248; lean_object* x_249; 
+lean_inc(x_245);
+x_247 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_247, 0, x_3);
+lean_ctor_set(x_247, 1, x_245);
+x_248 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_248, 0, x_247);
+lean_ctor_set(x_248, 1, x_218);
+x_249 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_249, 0, x_230);
+lean_ctor_set(x_249, 1, x_211);
+lean_ctor_set(x_249, 2, x_212);
+lean_ctor_set(x_249, 3, x_213);
+lean_ctor_set(x_249, 4, x_214);
+lean_ctor_set(x_249, 5, x_215);
+lean_ctor_set(x_249, 6, x_216);
+lean_ctor_set(x_249, 7, x_217);
+lean_ctor_set(x_249, 8, x_248);
+lean_ctor_set(x_249, 9, x_7);
+lean_ctor_set_uint8(x_249, sizeof(void*)*10, x_219);
+lean_ctor_set_uint8(x_249, sizeof(void*)*10 + 1, x_220);
+x_3 = x_245;
+x_4 = x_249;
+x_5 = x_246;
 goto _start;
 }
-block_358:
+block_269:
 {
-lean_object* x_343; 
-x_343 = lean_ctor_get(x_341, 0);
-lean_inc(x_343);
-if (lean_obj_tag(x_343) == 0)
+lean_object* x_254; 
+x_254 = lean_ctor_get(x_252, 0);
+lean_inc(x_254);
+if (lean_obj_tag(x_254) == 0)
 {
-lean_object* x_344; 
-lean_dec(x_343);
-lean_dec(x_328);
-lean_dec(x_320);
+lean_object* x_255; 
+lean_dec(x_254);
+lean_dec(x_239);
+lean_dec(x_231);
 lean_dec(x_3);
-if (lean_is_scalar(x_333)) {
- x_344 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_244)) {
+ x_255 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_344 = x_333;
- lean_ctor_set_tag(x_344, 1);
+ x_255 = x_244;
+ lean_ctor_set_tag(x_255, 1);
 }
-lean_ctor_set(x_344, 0, x_341);
-lean_ctor_set(x_344, 1, x_342);
-return x_344;
+lean_ctor_set(x_255, 0, x_252);
+lean_ctor_set(x_255, 1, x_253);
+return x_255;
 }
 else
 {
-lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; 
-lean_dec(x_341);
-lean_dec(x_333);
-x_345 = l_Lean_Name_toString___closed__1;
-x_346 = l_Lean_Name_toStringWithSep___main(x_345, x_328);
-x_347 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_347, 0, x_346);
-x_348 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_348, 0, x_347);
-x_349 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
-x_350 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_350, 0, x_349);
-lean_ctor_set(x_350, 1, x_348);
-x_351 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
-x_352 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_352, 0, x_350);
-lean_ctor_set(x_352, 1, x_351);
-x_353 = l_Lean_Elab_Term_throwError___rarg(x_3, x_352, x_320, x_342);
+lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; 
+lean_dec(x_252);
+lean_dec(x_244);
+x_256 = l_Lean_Name_toString___closed__1;
+x_257 = l_Lean_Name_toStringWithSep___main(x_256, x_239);
+x_258 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_258, 0, x_257);
+x_259 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_259, 0, x_258);
+x_260 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
+x_261 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_261, 0, x_260);
+lean_ctor_set(x_261, 1, x_259);
+x_262 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
+x_263 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_263, 0, x_261);
+lean_ctor_set(x_263, 1, x_262);
+x_264 = l_Lean_Elab_Term_throwError___rarg(x_3, x_263, x_231, x_253);
 lean_dec(x_3);
-x_354 = lean_ctor_get(x_353, 0);
-lean_inc(x_354);
-x_355 = lean_ctor_get(x_353, 1);
-lean_inc(x_355);
-if (lean_is_exclusive(x_353)) {
- lean_ctor_release(x_353, 0);
- lean_ctor_release(x_353, 1);
- x_356 = x_353;
+x_265 = lean_ctor_get(x_264, 0);
+lean_inc(x_265);
+x_266 = lean_ctor_get(x_264, 1);
+lean_inc(x_266);
+if (lean_is_exclusive(x_264)) {
+ lean_ctor_release(x_264, 0);
+ lean_ctor_release(x_264, 1);
+ x_267 = x_264;
 } else {
- lean_dec_ref(x_353);
- x_356 = lean_box(0);
+ lean_dec_ref(x_264);
+ x_267 = lean_box(0);
 }
-if (lean_is_scalar(x_356)) {
- x_357 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_267)) {
+ x_268 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_357 = x_356;
+ x_268 = x_267;
 }
-lean_ctor_set(x_357, 0, x_354);
-lean_ctor_set(x_357, 1, x_355);
-return x_357;
+lean_ctor_set(x_268, 0, x_265);
+lean_ctor_set(x_268, 1, x_266);
+return x_268;
 }
 }
 }
 else
 {
-lean_object* x_400; lean_object* x_401; 
-lean_dec(x_328);
-lean_dec(x_319);
-lean_dec(x_307);
-lean_dec(x_306);
-lean_dec(x_305);
-lean_dec(x_304);
-lean_dec(x_303);
-lean_dec(x_302);
-lean_dec(x_301);
-lean_dec(x_300);
+lean_object* x_290; lean_object* x_291; 
+lean_dec(x_239);
+lean_dec(x_230);
+lean_dec(x_218);
+lean_dec(x_217);
+lean_dec(x_216);
+lean_dec(x_215);
+lean_dec(x_214);
+lean_dec(x_213);
+lean_dec(x_212);
+lean_dec(x_211);
 lean_dec(x_7);
-x_400 = lean_ctor_get(x_329, 0);
-lean_inc(x_400);
-lean_dec(x_329);
-lean_inc(x_321);
-x_401 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_321, x_3, x_1, x_2, x_400, x_320, x_321);
-return x_401;
+x_290 = lean_ctor_get(x_240, 0);
+lean_inc(x_290);
+lean_dec(x_240);
+lean_inc(x_232);
+x_291 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_232, x_3, x_1, x_2, x_290, x_231, x_232);
+return x_291;
 }
 }
-block_414:
+block_304:
 {
-lean_object* x_404; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; lean_object* x_411; lean_object* x_412; lean_object* x_413; 
-lean_dec(x_403);
-x_404 = lean_box(0);
-x_405 = lean_unsigned_to_nat(0u);
+lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; 
+lean_dec(x_293);
+x_294 = lean_box(0);
+x_295 = lean_unsigned_to_nat(0u);
 lean_inc(x_3);
-x_406 = l_Lean_Syntax_formatStxAux___main(x_404, x_405, x_3);
-x_407 = l_Lean_Options_empty;
-x_408 = l_Lean_Format_pretty(x_406, x_407);
-x_409 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_409, 0, x_408);
-x_410 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_410, 0, x_409);
-x_411 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_412 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_412, 0, x_411);
-lean_ctor_set(x_412, 1, x_410);
-x_413 = l_Lean_Elab_Term_throwError___rarg(x_3, x_412, x_320, x_311);
+x_296 = l_Lean_Syntax_formatStxAux___main(x_294, x_295, x_3);
+x_297 = l_Lean_Options_empty;
+x_298 = l_Lean_Format_pretty(x_296, x_297);
+x_299 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_299, 0, x_298);
+x_300 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_300, 0, x_299);
+x_301 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_302 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_302, 0, x_301);
+lean_ctor_set(x_302, 1, x_300);
+x_303 = l_Lean_Elab_Term_throwError___rarg(x_3, x_302, x_231, x_222);
 lean_dec(x_3);
-return x_413;
+return x_303;
 }
 }
 }
 }
 else
 {
-lean_object* x_434; lean_object* x_435; lean_object* x_436; lean_object* x_437; lean_object* x_438; lean_object* x_439; lean_object* x_440; lean_object* x_441; lean_object* x_442; lean_object* x_443; lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; lean_object* x_448; lean_object* x_449; lean_object* x_450; lean_object* x_451; uint8_t x_452; uint8_t x_453; lean_object* x_454; lean_object* x_455; lean_object* x_456; lean_object* x_570; lean_object* x_571; uint8_t x_572; 
-x_434 = lean_ctor_get(x_5, 0);
-x_435 = lean_ctor_get(x_5, 1);
-x_436 = lean_ctor_get(x_5, 2);
-x_437 = lean_ctor_get(x_5, 3);
-x_438 = lean_ctor_get(x_5, 4);
-x_439 = lean_ctor_get(x_5, 5);
-lean_inc(x_439);
-lean_inc(x_438);
-lean_inc(x_437);
-lean_inc(x_436);
-lean_inc(x_435);
-lean_inc(x_434);
+lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; uint8_t x_342; uint8_t x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_439; lean_object* x_440; uint8_t x_441; 
+x_324 = lean_ctor_get(x_5, 0);
+x_325 = lean_ctor_get(x_5, 1);
+x_326 = lean_ctor_get(x_5, 2);
+x_327 = lean_ctor_get(x_5, 3);
+x_328 = lean_ctor_get(x_5, 4);
+x_329 = lean_ctor_get(x_5, 5);
+lean_inc(x_329);
+lean_inc(x_328);
+lean_inc(x_327);
+lean_inc(x_326);
+lean_inc(x_325);
+lean_inc(x_324);
 lean_dec(x_5);
-x_440 = lean_unsigned_to_nat(1u);
-x_441 = lean_nat_add(x_439, x_440);
-x_442 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_442, 0, x_434);
-lean_ctor_set(x_442, 1, x_435);
-lean_ctor_set(x_442, 2, x_436);
-lean_ctor_set(x_442, 3, x_437);
-lean_ctor_set(x_442, 4, x_438);
-lean_ctor_set(x_442, 5, x_441);
-x_443 = lean_ctor_get(x_4, 0);
-lean_inc(x_443);
-x_444 = lean_ctor_get(x_4, 1);
-lean_inc(x_444);
-x_445 = lean_ctor_get(x_4, 2);
-lean_inc(x_445);
-x_446 = lean_ctor_get(x_4, 3);
-lean_inc(x_446);
-x_447 = lean_ctor_get(x_4, 4);
-lean_inc(x_447);
-x_448 = lean_ctor_get(x_4, 5);
-lean_inc(x_448);
-x_449 = lean_ctor_get(x_4, 6);
-lean_inc(x_449);
-x_450 = lean_ctor_get(x_4, 7);
-lean_inc(x_450);
-x_451 = lean_ctor_get(x_4, 8);
-lean_inc(x_451);
-x_452 = lean_ctor_get_uint8(x_4, sizeof(void*)*10);
-x_453 = lean_ctor_get_uint8(x_4, sizeof(void*)*10 + 1);
+x_330 = lean_unsigned_to_nat(1u);
+x_331 = lean_nat_add(x_329, x_330);
+x_332 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_332, 0, x_324);
+lean_ctor_set(x_332, 1, x_325);
+lean_ctor_set(x_332, 2, x_326);
+lean_ctor_set(x_332, 3, x_327);
+lean_ctor_set(x_332, 4, x_328);
+lean_ctor_set(x_332, 5, x_331);
+x_333 = lean_ctor_get(x_4, 0);
+lean_inc(x_333);
+x_334 = lean_ctor_get(x_4, 1);
+lean_inc(x_334);
+x_335 = lean_ctor_get(x_4, 2);
+lean_inc(x_335);
+x_336 = lean_ctor_get(x_4, 3);
+lean_inc(x_336);
+x_337 = lean_ctor_get(x_4, 4);
+lean_inc(x_337);
+x_338 = lean_ctor_get(x_4, 5);
+lean_inc(x_338);
+x_339 = lean_ctor_get(x_4, 6);
+lean_inc(x_339);
+x_340 = lean_ctor_get(x_4, 7);
+lean_inc(x_340);
+x_341 = lean_ctor_get(x_4, 8);
+lean_inc(x_341);
+x_342 = lean_ctor_get_uint8(x_4, sizeof(void*)*10);
+x_343 = lean_ctor_get_uint8(x_4, sizeof(void*)*10 + 1);
 if (lean_is_exclusive(x_4)) {
  lean_ctor_release(x_4, 0);
  lean_ctor_release(x_4, 1);
@@ -13969,574 +13210,454 @@ if (lean_is_exclusive(x_4)) {
  lean_ctor_release(x_4, 7);
  lean_ctor_release(x_4, 8);
  lean_ctor_release(x_4, 9);
- x_454 = x_4;
+ x_344 = x_4;
 } else {
  lean_dec_ref(x_4);
- x_454 = lean_box(0);
+ x_344 = lean_box(0);
 }
-lean_inc(x_439);
-lean_inc(x_451);
-lean_inc(x_450);
-lean_inc(x_449);
-lean_inc(x_448);
-lean_inc(x_447);
-lean_inc(x_446);
-lean_inc(x_445);
-lean_inc(x_444);
-lean_inc(x_443);
-if (lean_is_scalar(x_454)) {
- x_455 = lean_alloc_ctor(0, 10, 2);
+lean_inc(x_329);
+lean_inc(x_341);
+lean_inc(x_340);
+lean_inc(x_339);
+lean_inc(x_338);
+lean_inc(x_337);
+lean_inc(x_336);
+lean_inc(x_335);
+lean_inc(x_334);
+lean_inc(x_333);
+if (lean_is_scalar(x_344)) {
+ x_345 = lean_alloc_ctor(0, 10, 2);
 } else {
- x_455 = x_454;
+ x_345 = x_344;
 }
-lean_ctor_set(x_455, 0, x_443);
-lean_ctor_set(x_455, 1, x_444);
-lean_ctor_set(x_455, 2, x_445);
-lean_ctor_set(x_455, 3, x_446);
-lean_ctor_set(x_455, 4, x_447);
-lean_ctor_set(x_455, 5, x_448);
-lean_ctor_set(x_455, 6, x_449);
-lean_ctor_set(x_455, 7, x_450);
-lean_ctor_set(x_455, 8, x_451);
-lean_ctor_set(x_455, 9, x_439);
-lean_ctor_set_uint8(x_455, sizeof(void*)*10, x_452);
-lean_ctor_set_uint8(x_455, sizeof(void*)*10 + 1, x_453);
-x_570 = lean_ctor_get(x_443, 3);
-lean_inc(x_570);
-x_571 = lean_ctor_get(x_443, 4);
-lean_inc(x_571);
-x_572 = lean_nat_dec_eq(x_570, x_571);
-lean_dec(x_571);
-lean_dec(x_570);
-if (x_572 == 0)
+lean_ctor_set(x_345, 0, x_333);
+lean_ctor_set(x_345, 1, x_334);
+lean_ctor_set(x_345, 2, x_335);
+lean_ctor_set(x_345, 3, x_336);
+lean_ctor_set(x_345, 4, x_337);
+lean_ctor_set(x_345, 5, x_338);
+lean_ctor_set(x_345, 6, x_339);
+lean_ctor_set(x_345, 7, x_340);
+lean_ctor_set(x_345, 8, x_341);
+lean_ctor_set(x_345, 9, x_329);
+lean_ctor_set_uint8(x_345, sizeof(void*)*10, x_342);
+lean_ctor_set_uint8(x_345, sizeof(void*)*10 + 1, x_343);
+x_439 = lean_ctor_get(x_333, 3);
+lean_inc(x_439);
+x_440 = lean_ctor_get(x_333, 4);
+lean_inc(x_440);
+x_441 = lean_nat_dec_eq(x_439, x_440);
+lean_dec(x_440);
+lean_dec(x_439);
+if (x_441 == 0)
 {
-lean_dec(x_455);
-x_456 = x_442;
-goto block_569;
+lean_dec(x_345);
+x_346 = x_332;
+goto block_438;
 }
 else
 {
-lean_object* x_573; lean_object* x_574; lean_object* x_575; lean_object* x_576; lean_object* x_577; lean_object* x_578; 
-lean_dec(x_451);
-lean_dec(x_450);
-lean_dec(x_449);
-lean_dec(x_448);
-lean_dec(x_447);
-lean_dec(x_446);
-lean_dec(x_445);
-lean_dec(x_444);
-lean_dec(x_443);
-lean_dec(x_439);
+lean_object* x_442; lean_object* x_443; lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; 
+lean_dec(x_341);
+lean_dec(x_340);
+lean_dec(x_339);
+lean_dec(x_338);
+lean_dec(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_334);
+lean_dec(x_333);
+lean_dec(x_329);
 lean_dec(x_1);
-x_573 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
-x_574 = l_Lean_Elab_Term_throwError___rarg(x_3, x_573, x_455, x_442);
+x_442 = l_Lean_Elab_Term_withIncRecDepth___rarg___closed__2;
+x_443 = l_Lean_Elab_Term_throwError___rarg(x_3, x_442, x_345, x_332);
 lean_dec(x_3);
-x_575 = lean_ctor_get(x_574, 0);
-lean_inc(x_575);
-x_576 = lean_ctor_get(x_574, 1);
-lean_inc(x_576);
-if (lean_is_exclusive(x_574)) {
- lean_ctor_release(x_574, 0);
- lean_ctor_release(x_574, 1);
- x_577 = x_574;
-} else {
- lean_dec_ref(x_574);
- x_577 = lean_box(0);
-}
-if (lean_is_scalar(x_577)) {
- x_578 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_578 = x_577;
-}
-lean_ctor_set(x_578, 0, x_575);
-lean_ctor_set(x_578, 1, x_576);
-return x_578;
-}
-block_569:
-{
-lean_object* x_457; lean_object* x_458; lean_object* x_459; lean_object* x_460; lean_object* x_461; lean_object* x_462; lean_object* x_463; lean_object* x_464; lean_object* x_465; lean_object* x_466; lean_object* x_548; 
-x_457 = lean_ctor_get(x_443, 0);
-lean_inc(x_457);
-x_458 = lean_ctor_get(x_443, 1);
-lean_inc(x_458);
-x_459 = lean_ctor_get(x_443, 2);
-lean_inc(x_459);
-x_460 = lean_ctor_get(x_443, 3);
-lean_inc(x_460);
-x_461 = lean_ctor_get(x_443, 4);
-lean_inc(x_461);
+x_444 = lean_ctor_get(x_443, 0);
+lean_inc(x_444);
+x_445 = lean_ctor_get(x_443, 1);
+lean_inc(x_445);
 if (lean_is_exclusive(x_443)) {
  lean_ctor_release(x_443, 0);
  lean_ctor_release(x_443, 1);
- lean_ctor_release(x_443, 2);
- lean_ctor_release(x_443, 3);
- lean_ctor_release(x_443, 4);
- x_462 = x_443;
+ x_446 = x_443;
 } else {
  lean_dec_ref(x_443);
- x_462 = lean_box(0);
+ x_446 = lean_box(0);
 }
-x_463 = lean_nat_add(x_460, x_440);
-lean_dec(x_460);
-if (lean_is_scalar(x_462)) {
- x_464 = lean_alloc_ctor(0, 5, 0);
+if (lean_is_scalar(x_446)) {
+ x_447 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_464 = x_462;
+ x_447 = x_446;
 }
-lean_ctor_set(x_464, 0, x_457);
-lean_ctor_set(x_464, 1, x_458);
-lean_ctor_set(x_464, 2, x_459);
-lean_ctor_set(x_464, 3, x_463);
-lean_ctor_set(x_464, 4, x_461);
-lean_inc(x_439);
-lean_inc(x_451);
-lean_inc(x_450);
-lean_inc(x_449);
-lean_inc(x_448);
-lean_inc(x_447);
-lean_inc(x_446);
-lean_inc(x_445);
-lean_inc(x_444);
-lean_inc(x_464);
-x_465 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_465, 0, x_464);
-lean_ctor_set(x_465, 1, x_444);
-lean_ctor_set(x_465, 2, x_445);
-lean_ctor_set(x_465, 3, x_446);
-lean_ctor_set(x_465, 4, x_447);
-lean_ctor_set(x_465, 5, x_448);
-lean_ctor_set(x_465, 6, x_449);
-lean_ctor_set(x_465, 7, x_450);
-lean_ctor_set(x_465, 8, x_451);
-lean_ctor_set(x_465, 9, x_439);
-lean_ctor_set_uint8(x_465, sizeof(void*)*10, x_452);
-lean_ctor_set_uint8(x_465, sizeof(void*)*10 + 1, x_453);
+lean_ctor_set(x_447, 0, x_444);
+lean_ctor_set(x_447, 1, x_445);
+return x_447;
+}
+block_438:
+{
+lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_417; 
+x_347 = lean_ctor_get(x_333, 0);
+lean_inc(x_347);
+x_348 = lean_ctor_get(x_333, 1);
+lean_inc(x_348);
+x_349 = lean_ctor_get(x_333, 2);
+lean_inc(x_349);
+x_350 = lean_ctor_get(x_333, 3);
+lean_inc(x_350);
+x_351 = lean_ctor_get(x_333, 4);
+lean_inc(x_351);
+if (lean_is_exclusive(x_333)) {
+ lean_ctor_release(x_333, 0);
+ lean_ctor_release(x_333, 1);
+ lean_ctor_release(x_333, 2);
+ lean_ctor_release(x_333, 3);
+ lean_ctor_release(x_333, 4);
+ x_352 = x_333;
+} else {
+ lean_dec_ref(x_333);
+ x_352 = lean_box(0);
+}
+x_353 = lean_nat_add(x_350, x_330);
+lean_dec(x_350);
+if (lean_is_scalar(x_352)) {
+ x_354 = lean_alloc_ctor(0, 5, 0);
+} else {
+ x_354 = x_352;
+}
+lean_ctor_set(x_354, 0, x_347);
+lean_ctor_set(x_354, 1, x_348);
+lean_ctor_set(x_354, 2, x_349);
+lean_ctor_set(x_354, 3, x_353);
+lean_ctor_set(x_354, 4, x_351);
+lean_inc(x_329);
+lean_inc(x_341);
+lean_inc(x_340);
+lean_inc(x_339);
+lean_inc(x_338);
+lean_inc(x_337);
+lean_inc(x_336);
+lean_inc(x_335);
+lean_inc(x_334);
+lean_inc(x_354);
+x_355 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_355, 0, x_354);
+lean_ctor_set(x_355, 1, x_334);
+lean_ctor_set(x_355, 2, x_335);
+lean_ctor_set(x_355, 3, x_336);
+lean_ctor_set(x_355, 4, x_337);
+lean_ctor_set(x_355, 5, x_338);
+lean_ctor_set(x_355, 6, x_339);
+lean_ctor_set(x_355, 7, x_340);
+lean_ctor_set(x_355, 8, x_341);
+lean_ctor_set(x_355, 9, x_329);
+lean_ctor_set_uint8(x_355, sizeof(void*)*10, x_342);
+lean_ctor_set_uint8(x_355, sizeof(void*)*10 + 1, x_343);
 if (lean_obj_tag(x_3) == 1)
 {
-lean_object* x_560; lean_object* x_561; lean_object* x_562; lean_object* x_563; uint8_t x_564; 
-x_560 = l_Lean_Elab_Term_getOptions(x_465, x_456);
-x_561 = lean_ctor_get(x_560, 0);
-lean_inc(x_561);
-x_562 = lean_ctor_get(x_560, 1);
-lean_inc(x_562);
-lean_dec(x_560);
-x_563 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
-x_564 = l_Lean_checkTraceOption(x_561, x_563);
-lean_dec(x_561);
-if (x_564 == 0)
+lean_object* x_429; lean_object* x_430; lean_object* x_431; lean_object* x_432; uint8_t x_433; 
+x_429 = l_Lean_Elab_Term_getOptions(x_355, x_346);
+x_430 = lean_ctor_get(x_429, 0);
+lean_inc(x_430);
+x_431 = lean_ctor_get(x_429, 1);
+lean_inc(x_431);
+lean_dec(x_429);
+x_432 = l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
+x_433 = l_Lean_checkTraceOption(x_430, x_432);
+lean_dec(x_430);
+if (x_433 == 0)
 {
-x_466 = x_562;
-goto block_547;
+x_356 = x_431;
+goto block_416;
 }
 else
 {
-lean_object* x_565; lean_object* x_566; lean_object* x_567; 
+lean_object* x_434; lean_object* x_435; lean_object* x_436; 
 lean_inc(x_3);
-x_565 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_565, 0, x_3);
-x_566 = l_Lean_Elab_Term_logTrace(x_563, x_3, x_565, x_465, x_562);
-x_567 = lean_ctor_get(x_566, 1);
-lean_inc(x_567);
-lean_dec(x_566);
-x_466 = x_567;
-goto block_547;
+x_434 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_434, 0, x_3);
+x_435 = l_Lean_Elab_Term_logTrace(x_432, x_3, x_434, x_355, x_431);
+x_436 = lean_ctor_get(x_435, 1);
+lean_inc(x_436);
+lean_dec(x_435);
+x_356 = x_436;
+goto block_416;
 }
 }
 else
 {
-lean_object* x_568; 
-lean_dec(x_464);
-lean_dec(x_451);
-lean_dec(x_450);
-lean_dec(x_449);
-lean_dec(x_448);
-lean_dec(x_447);
-lean_dec(x_446);
-lean_dec(x_445);
-lean_dec(x_444);
-lean_dec(x_439);
+lean_object* x_437; 
+lean_dec(x_354);
+lean_dec(x_341);
+lean_dec(x_340);
+lean_dec(x_339);
+lean_dec(x_338);
+lean_dec(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_334);
+lean_dec(x_329);
 lean_dec(x_1);
-x_568 = lean_box(0);
-x_548 = x_568;
-goto block_559;
+x_437 = lean_box(0);
+x_417 = x_437;
+goto block_428;
 }
-block_547:
+block_416:
 {
-lean_object* x_467; lean_object* x_468; lean_object* x_469; lean_object* x_470; lean_object* x_471; lean_object* x_472; lean_object* x_473; lean_object* x_474; 
-x_467 = l_Lean_Elab_Term_termElabAttribute;
-x_468 = lean_ctor_get(x_467, 1);
-lean_inc(x_468);
-x_469 = lean_ctor_get(x_466, 0);
-lean_inc(x_469);
-x_470 = lean_ctor_get(x_469, 0);
-lean_inc(x_470);
-lean_dec(x_469);
-x_471 = l_Lean_PersistentEnvExtension_getState___rarg(x_468, x_470);
-lean_dec(x_470);
-lean_dec(x_468);
-x_472 = lean_ctor_get(x_471, 1);
-lean_inc(x_472);
-lean_dec(x_471);
+lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; 
+x_357 = l_Lean_Elab_Term_termElabAttribute;
+x_358 = lean_ctor_get(x_357, 1);
+lean_inc(x_358);
+x_359 = lean_ctor_get(x_356, 0);
+lean_inc(x_359);
+x_360 = lean_ctor_get(x_359, 0);
+lean_inc(x_360);
+lean_dec(x_359);
+x_361 = l_Lean_PersistentEnvExtension_getState___rarg(x_358, x_360);
+lean_dec(x_360);
+lean_dec(x_358);
+x_362 = lean_ctor_get(x_361, 1);
+lean_inc(x_362);
+lean_dec(x_361);
 lean_inc(x_3);
-x_473 = l_Lean_Syntax_getKind(x_3);
-x_474 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_472, x_473);
-if (lean_obj_tag(x_474) == 0)
+x_363 = l_Lean_Syntax_getKind(x_3);
+x_364 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTermAux___main___spec__1(x_362, x_363);
+if (lean_obj_tag(x_364) == 0)
 {
-lean_object* x_475; lean_object* x_476; lean_object* x_477; lean_object* x_478; lean_object* x_479; lean_object* x_480; lean_object* x_486; lean_object* x_487; lean_object* x_504; lean_object* x_505; lean_object* x_506; lean_object* x_507; lean_object* x_508; lean_object* x_509; lean_object* x_510; lean_object* x_511; lean_object* x_512; lean_object* x_513; lean_object* x_514; lean_object* x_515; lean_object* x_516; lean_object* x_517; lean_object* x_518; lean_object* x_519; lean_object* x_520; lean_object* x_521; lean_object* x_522; lean_object* x_523; lean_object* x_524; lean_object* x_525; 
-x_475 = l_Lean_Elab_Term_getEnv___rarg(x_466);
-x_476 = lean_ctor_get(x_475, 0);
-lean_inc(x_476);
-x_477 = lean_ctor_get(x_475, 1);
-lean_inc(x_477);
-if (lean_is_exclusive(x_475)) {
- lean_ctor_release(x_475, 0);
- lean_ctor_release(x_475, 1);
- x_478 = x_475;
+lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_376; lean_object* x_377; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; 
+x_365 = l_Lean_Elab_Term_getEnv___rarg(x_356);
+x_366 = lean_ctor_get(x_365, 0);
+lean_inc(x_366);
+x_367 = lean_ctor_get(x_365, 1);
+lean_inc(x_367);
+if (lean_is_exclusive(x_365)) {
+ lean_ctor_release(x_365, 0);
+ lean_ctor_release(x_365, 1);
+ x_368 = x_365;
 } else {
- lean_dec_ref(x_475);
- x_478 = lean_box(0);
+ lean_dec_ref(x_365);
+ x_368 = lean_box(0);
 }
-x_504 = l_Lean_Elab_Term_getCurrMacroScope(x_465, x_477);
-x_505 = lean_ctor_get(x_504, 0);
-lean_inc(x_505);
-x_506 = lean_ctor_get(x_504, 1);
-lean_inc(x_506);
-lean_dec(x_504);
-x_507 = l_Lean_Elab_Term_getEnv___rarg(x_506);
-x_508 = lean_ctor_get(x_507, 1);
-lean_inc(x_508);
-x_509 = lean_ctor_get(x_508, 0);
-lean_inc(x_509);
-x_510 = lean_ctor_get(x_507, 0);
-lean_inc(x_510);
-lean_dec(x_507);
-x_511 = lean_ctor_get(x_508, 1);
-lean_inc(x_511);
-x_512 = lean_ctor_get(x_508, 2);
-lean_inc(x_512);
-x_513 = lean_ctor_get(x_508, 3);
-lean_inc(x_513);
-x_514 = lean_ctor_get(x_508, 4);
-lean_inc(x_514);
-x_515 = lean_ctor_get(x_508, 5);
-lean_inc(x_515);
-x_516 = lean_ctor_get(x_509, 0);
-lean_inc(x_516);
-x_517 = lean_ctor_get(x_509, 1);
-lean_inc(x_517);
-x_518 = lean_ctor_get(x_509, 2);
-lean_inc(x_518);
-x_519 = lean_ctor_get(x_509, 3);
-lean_inc(x_519);
-x_520 = lean_ctor_get(x_509, 4);
-lean_inc(x_520);
-x_521 = lean_ctor_get(x_509, 5);
-lean_inc(x_521);
-if (lean_is_exclusive(x_509)) {
- lean_ctor_release(x_509, 0);
- lean_ctor_release(x_509, 1);
- lean_ctor_release(x_509, 2);
- lean_ctor_release(x_509, 3);
- lean_ctor_release(x_509, 4);
- lean_ctor_release(x_509, 5);
- x_522 = x_509;
-} else {
- lean_dec_ref(x_509);
- x_522 = lean_box(0);
-}
-x_523 = lean_environment_main_module(x_510);
-x_524 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_524, 0, x_523);
-lean_ctor_set(x_524, 1, x_505);
+x_394 = l_Lean_Elab_Term_getCurrMacroScope(x_355, x_367);
+x_395 = lean_ctor_get(x_394, 0);
+lean_inc(x_395);
+x_396 = lean_ctor_get(x_394, 1);
+lean_inc(x_396);
+lean_dec(x_394);
+x_397 = l_Lean_Elab_Term_getEnv___rarg(x_396);
+x_398 = lean_ctor_get(x_397, 0);
+lean_inc(x_398);
+x_399 = lean_ctor_get(x_397, 1);
+lean_inc(x_399);
+lean_dec(x_397);
+x_400 = lean_environment_main_module(x_398);
+x_401 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_401, 0, x_400);
+lean_ctor_set(x_401, 1, x_395);
 lean_inc(x_3);
-x_525 = l_Lean_Elab_getMacros(x_476, x_3, x_524, x_519);
-lean_dec(x_476);
-if (lean_obj_tag(x_525) == 0)
+x_402 = l_Lean_Elab_getMacros(x_366, x_3, x_401);
+lean_dec(x_366);
+if (lean_obj_tag(x_402) == 0)
 {
-lean_object* x_526; lean_object* x_527; lean_object* x_528; lean_object* x_529; lean_object* x_530; 
-lean_dec(x_478);
-lean_dec(x_473);
-lean_dec(x_465);
-if (lean_is_exclusive(x_508)) {
- lean_ctor_release(x_508, 0);
- lean_ctor_release(x_508, 1);
- lean_ctor_release(x_508, 2);
- lean_ctor_release(x_508, 3);
- lean_ctor_release(x_508, 4);
- lean_ctor_release(x_508, 5);
- x_526 = x_508;
-} else {
- lean_dec_ref(x_508);
- x_526 = lean_box(0);
-}
-x_527 = lean_ctor_get(x_525, 0);
-lean_inc(x_527);
-x_528 = lean_ctor_get(x_525, 1);
-lean_inc(x_528);
-lean_dec(x_525);
-if (lean_is_scalar(x_522)) {
- x_529 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_529 = x_522;
-}
-lean_ctor_set(x_529, 0, x_516);
-lean_ctor_set(x_529, 1, x_517);
-lean_ctor_set(x_529, 2, x_518);
-lean_ctor_set(x_529, 3, x_528);
-lean_ctor_set(x_529, 4, x_520);
-lean_ctor_set(x_529, 5, x_521);
-if (lean_is_scalar(x_526)) {
- x_530 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_530 = x_526;
-}
-lean_ctor_set(x_530, 0, x_529);
-lean_ctor_set(x_530, 1, x_511);
-lean_ctor_set(x_530, 2, x_512);
-lean_ctor_set(x_530, 3, x_513);
-lean_ctor_set(x_530, 4, x_514);
-lean_ctor_set(x_530, 5, x_515);
-x_479 = x_527;
-x_480 = x_530;
-goto block_485;
-}
-else
-{
-lean_object* x_531; 
-lean_dec(x_464);
-lean_dec(x_451);
-lean_dec(x_450);
-lean_dec(x_449);
-lean_dec(x_448);
-lean_dec(x_447);
-lean_dec(x_446);
-lean_dec(x_445);
-lean_dec(x_444);
-lean_dec(x_439);
+lean_object* x_403; 
+lean_dec(x_354);
+lean_dec(x_341);
+lean_dec(x_340);
+lean_dec(x_339);
+lean_dec(x_338);
+lean_dec(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_334);
+lean_dec(x_329);
 lean_dec(x_1);
-x_531 = lean_ctor_get(x_525, 0);
-lean_inc(x_531);
-if (lean_obj_tag(x_531) == 0)
+x_403 = lean_ctor_get(x_402, 0);
+lean_inc(x_403);
+lean_dec(x_402);
+if (lean_obj_tag(x_403) == 0)
 {
-lean_object* x_532; lean_object* x_533; lean_object* x_534; lean_object* x_535; lean_object* x_536; lean_object* x_537; lean_object* x_538; lean_object* x_539; lean_object* x_540; lean_object* x_541; 
-if (lean_is_exclusive(x_508)) {
- lean_ctor_release(x_508, 0);
- lean_ctor_release(x_508, 1);
- lean_ctor_release(x_508, 2);
- lean_ctor_release(x_508, 3);
- lean_ctor_release(x_508, 4);
- lean_ctor_release(x_508, 5);
- x_532 = x_508;
-} else {
- lean_dec_ref(x_508);
- x_532 = lean_box(0);
-}
-x_533 = lean_ctor_get(x_525, 1);
-lean_inc(x_533);
-lean_dec(x_525);
-x_534 = lean_ctor_get(x_531, 0);
-lean_inc(x_534);
-lean_dec(x_531);
-if (lean_is_scalar(x_522)) {
- x_535 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_535 = x_522;
-}
-lean_ctor_set(x_535, 0, x_516);
-lean_ctor_set(x_535, 1, x_517);
-lean_ctor_set(x_535, 2, x_518);
-lean_ctor_set(x_535, 3, x_533);
-lean_ctor_set(x_535, 4, x_520);
-lean_ctor_set(x_535, 5, x_521);
-if (lean_is_scalar(x_532)) {
- x_536 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_536 = x_532;
-}
-lean_ctor_set(x_536, 0, x_535);
-lean_ctor_set(x_536, 1, x_511);
-lean_ctor_set(x_536, 2, x_512);
-lean_ctor_set(x_536, 3, x_513);
-lean_ctor_set(x_536, 4, x_514);
-lean_ctor_set(x_536, 5, x_515);
-x_537 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_537, 0, x_534);
-x_538 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_538, 0, x_537);
-lean_inc(x_465);
-x_539 = l_Lean_Elab_Term_throwError___rarg(x_3, x_538, x_465, x_536);
-x_540 = lean_ctor_get(x_539, 0);
-lean_inc(x_540);
-x_541 = lean_ctor_get(x_539, 1);
-lean_inc(x_541);
-lean_dec(x_539);
-x_486 = x_540;
-x_487 = x_541;
-goto block_503;
+lean_object* x_404; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; 
+x_404 = lean_ctor_get(x_403, 0);
+lean_inc(x_404);
+lean_dec(x_403);
+x_405 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_405, 0, x_404);
+x_406 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_406, 0, x_405);
+lean_inc(x_355);
+x_407 = l_Lean_Elab_Term_throwError___rarg(x_3, x_406, x_355, x_399);
+x_408 = lean_ctor_get(x_407, 0);
+lean_inc(x_408);
+x_409 = lean_ctor_get(x_407, 1);
+lean_inc(x_409);
+lean_dec(x_407);
+x_376 = x_408;
+x_377 = x_409;
+goto block_393;
 }
 else
 {
-lean_object* x_542; lean_object* x_543; lean_object* x_544; 
-lean_dec(x_525);
-lean_dec(x_522);
-lean_dec(x_521);
-lean_dec(x_520);
-lean_dec(x_518);
-lean_dec(x_517);
-lean_dec(x_516);
-lean_dec(x_515);
-lean_dec(x_514);
-lean_dec(x_513);
-lean_dec(x_512);
-lean_dec(x_511);
-x_542 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_508);
-x_543 = lean_ctor_get(x_542, 0);
-lean_inc(x_543);
-x_544 = lean_ctor_get(x_542, 1);
-lean_inc(x_544);
-lean_dec(x_542);
-x_486 = x_543;
-x_487 = x_544;
-goto block_503;
+lean_object* x_410; lean_object* x_411; lean_object* x_412; 
+x_410 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_399);
+x_411 = lean_ctor_get(x_410, 0);
+lean_inc(x_411);
+x_412 = lean_ctor_get(x_410, 1);
+lean_inc(x_412);
+lean_dec(x_410);
+x_376 = x_411;
+x_377 = x_412;
+goto block_393;
 }
 }
-block_485:
+else
 {
-lean_object* x_481; lean_object* x_482; lean_object* x_483; 
-lean_inc(x_479);
-x_481 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_481, 0, x_3);
-lean_ctor_set(x_481, 1, x_479);
-x_482 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_482, 0, x_481);
-lean_ctor_set(x_482, 1, x_451);
-x_483 = lean_alloc_ctor(0, 10, 2);
-lean_ctor_set(x_483, 0, x_464);
-lean_ctor_set(x_483, 1, x_444);
-lean_ctor_set(x_483, 2, x_445);
-lean_ctor_set(x_483, 3, x_446);
-lean_ctor_set(x_483, 4, x_447);
-lean_ctor_set(x_483, 5, x_448);
-lean_ctor_set(x_483, 6, x_449);
-lean_ctor_set(x_483, 7, x_450);
-lean_ctor_set(x_483, 8, x_482);
-lean_ctor_set(x_483, 9, x_439);
-lean_ctor_set_uint8(x_483, sizeof(void*)*10, x_452);
-lean_ctor_set_uint8(x_483, sizeof(void*)*10 + 1, x_453);
-x_3 = x_479;
-x_4 = x_483;
-x_5 = x_480;
+lean_object* x_413; 
+lean_dec(x_368);
+lean_dec(x_363);
+lean_dec(x_355);
+x_413 = lean_ctor_get(x_402, 0);
+lean_inc(x_413);
+lean_dec(x_402);
+x_369 = x_413;
+x_370 = x_399;
+goto block_375;
+}
+block_375:
+{
+lean_object* x_371; lean_object* x_372; lean_object* x_373; 
+lean_inc(x_369);
+x_371 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_371, 0, x_3);
+lean_ctor_set(x_371, 1, x_369);
+x_372 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_372, 0, x_371);
+lean_ctor_set(x_372, 1, x_341);
+x_373 = lean_alloc_ctor(0, 10, 2);
+lean_ctor_set(x_373, 0, x_354);
+lean_ctor_set(x_373, 1, x_334);
+lean_ctor_set(x_373, 2, x_335);
+lean_ctor_set(x_373, 3, x_336);
+lean_ctor_set(x_373, 4, x_337);
+lean_ctor_set(x_373, 5, x_338);
+lean_ctor_set(x_373, 6, x_339);
+lean_ctor_set(x_373, 7, x_340);
+lean_ctor_set(x_373, 8, x_372);
+lean_ctor_set(x_373, 9, x_329);
+lean_ctor_set_uint8(x_373, sizeof(void*)*10, x_342);
+lean_ctor_set_uint8(x_373, sizeof(void*)*10 + 1, x_343);
+x_3 = x_369;
+x_4 = x_373;
+x_5 = x_370;
 goto _start;
 }
-block_503:
+block_393:
 {
-lean_object* x_488; 
-x_488 = lean_ctor_get(x_486, 0);
-lean_inc(x_488);
-if (lean_obj_tag(x_488) == 0)
+lean_object* x_378; 
+x_378 = lean_ctor_get(x_376, 0);
+lean_inc(x_378);
+if (lean_obj_tag(x_378) == 0)
 {
-lean_object* x_489; 
-lean_dec(x_488);
-lean_dec(x_473);
-lean_dec(x_465);
+lean_object* x_379; 
+lean_dec(x_378);
+lean_dec(x_363);
+lean_dec(x_355);
 lean_dec(x_3);
-if (lean_is_scalar(x_478)) {
- x_489 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_368)) {
+ x_379 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_489 = x_478;
- lean_ctor_set_tag(x_489, 1);
+ x_379 = x_368;
+ lean_ctor_set_tag(x_379, 1);
 }
-lean_ctor_set(x_489, 0, x_486);
-lean_ctor_set(x_489, 1, x_487);
-return x_489;
+lean_ctor_set(x_379, 0, x_376);
+lean_ctor_set(x_379, 1, x_377);
+return x_379;
 }
 else
 {
-lean_object* x_490; lean_object* x_491; lean_object* x_492; lean_object* x_493; lean_object* x_494; lean_object* x_495; lean_object* x_496; lean_object* x_497; lean_object* x_498; lean_object* x_499; lean_object* x_500; lean_object* x_501; lean_object* x_502; 
-lean_dec(x_486);
-lean_dec(x_478);
-x_490 = l_Lean_Name_toString___closed__1;
-x_491 = l_Lean_Name_toStringWithSep___main(x_490, x_473);
-x_492 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_492, 0, x_491);
-x_493 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_493, 0, x_492);
-x_494 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
-x_495 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_495, 0, x_494);
-lean_ctor_set(x_495, 1, x_493);
-x_496 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
-x_497 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_497, 0, x_495);
-lean_ctor_set(x_497, 1, x_496);
-x_498 = l_Lean_Elab_Term_throwError___rarg(x_3, x_497, x_465, x_487);
+lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; 
+lean_dec(x_376);
+lean_dec(x_368);
+x_380 = l_Lean_Name_toString___closed__1;
+x_381 = l_Lean_Name_toStringWithSep___main(x_380, x_363);
+x_382 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_382, 0, x_381);
+x_383 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_383, 0, x_382);
+x_384 = l_Lean_Elab_Term_elabTermAux___main___closed__3;
+x_385 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_385, 0, x_384);
+lean_ctor_set(x_385, 1, x_383);
+x_386 = l_Lean_Elab_Term_elabTermAux___main___closed__6;
+x_387 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_387, 0, x_385);
+lean_ctor_set(x_387, 1, x_386);
+x_388 = l_Lean_Elab_Term_throwError___rarg(x_3, x_387, x_355, x_377);
 lean_dec(x_3);
-x_499 = lean_ctor_get(x_498, 0);
-lean_inc(x_499);
-x_500 = lean_ctor_get(x_498, 1);
-lean_inc(x_500);
-if (lean_is_exclusive(x_498)) {
- lean_ctor_release(x_498, 0);
- lean_ctor_release(x_498, 1);
- x_501 = x_498;
+x_389 = lean_ctor_get(x_388, 0);
+lean_inc(x_389);
+x_390 = lean_ctor_get(x_388, 1);
+lean_inc(x_390);
+if (lean_is_exclusive(x_388)) {
+ lean_ctor_release(x_388, 0);
+ lean_ctor_release(x_388, 1);
+ x_391 = x_388;
 } else {
- lean_dec_ref(x_498);
- x_501 = lean_box(0);
+ lean_dec_ref(x_388);
+ x_391 = lean_box(0);
 }
-if (lean_is_scalar(x_501)) {
- x_502 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_391)) {
+ x_392 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_502 = x_501;
+ x_392 = x_391;
 }
-lean_ctor_set(x_502, 0, x_499);
-lean_ctor_set(x_502, 1, x_500);
-return x_502;
+lean_ctor_set(x_392, 0, x_389);
+lean_ctor_set(x_392, 1, x_390);
+return x_392;
 }
 }
 }
 else
 {
-lean_object* x_545; lean_object* x_546; 
-lean_dec(x_473);
-lean_dec(x_464);
-lean_dec(x_451);
-lean_dec(x_450);
-lean_dec(x_449);
-lean_dec(x_448);
-lean_dec(x_447);
-lean_dec(x_446);
-lean_dec(x_445);
-lean_dec(x_444);
-lean_dec(x_439);
-x_545 = lean_ctor_get(x_474, 0);
-lean_inc(x_545);
-lean_dec(x_474);
-lean_inc(x_466);
-x_546 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_466, x_3, x_1, x_2, x_545, x_465, x_466);
-return x_546;
+lean_object* x_414; lean_object* x_415; 
+lean_dec(x_363);
+lean_dec(x_354);
+lean_dec(x_341);
+lean_dec(x_340);
+lean_dec(x_339);
+lean_dec(x_338);
+lean_dec(x_337);
+lean_dec(x_336);
+lean_dec(x_335);
+lean_dec(x_334);
+lean_dec(x_329);
+x_414 = lean_ctor_get(x_364, 0);
+lean_inc(x_414);
+lean_dec(x_364);
+lean_inc(x_356);
+x_415 = l___private_Init_Lean_Elab_Term_8__elabTermUsing___main(x_356, x_3, x_1, x_2, x_414, x_355, x_356);
+return x_415;
 }
 }
-block_559:
+block_428:
 {
-lean_object* x_549; lean_object* x_550; lean_object* x_551; lean_object* x_552; lean_object* x_553; lean_object* x_554; lean_object* x_555; lean_object* x_556; lean_object* x_557; lean_object* x_558; 
-lean_dec(x_548);
-x_549 = lean_box(0);
-x_550 = lean_unsigned_to_nat(0u);
+lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; lean_object* x_423; lean_object* x_424; lean_object* x_425; lean_object* x_426; lean_object* x_427; 
+lean_dec(x_417);
+x_418 = lean_box(0);
+x_419 = lean_unsigned_to_nat(0u);
 lean_inc(x_3);
-x_551 = l_Lean_Syntax_formatStxAux___main(x_549, x_550, x_3);
-x_552 = l_Lean_Options_empty;
-x_553 = l_Lean_Format_pretty(x_551, x_552);
-x_554 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_554, 0, x_553);
-x_555 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_555, 0, x_554);
-x_556 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_557 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_557, 0, x_556);
-lean_ctor_set(x_557, 1, x_555);
-x_558 = l_Lean_Elab_Term_throwError___rarg(x_3, x_557, x_465, x_456);
+x_420 = l_Lean_Syntax_formatStxAux___main(x_418, x_419, x_3);
+x_421 = l_Lean_Options_empty;
+x_422 = l_Lean_Format_pretty(x_420, x_421);
+x_423 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_423, 0, x_422);
+x_424 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_424, 0, x_423);
+x_425 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_426 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_426, 0, x_425);
+lean_ctor_set(x_426, 1, x_424);
+x_427 = l_Lean_Elab_Term_throwError___rarg(x_3, x_426, x_355, x_346);
 lean_dec(x_3);
-return x_558;
+return x_427;
 }
 }
 }
@@ -22777,14 +21898,6 @@ l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3 = _init_l_Lean_Elab_Ter
 lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__3);
 l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4 = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4();
 lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__4);
-l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5 = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__5);
-l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6 = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6();
-lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__6);
-l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7 = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7();
-lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__7);
-l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8 = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8();
-lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter___closed__8);
 l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter = _init_l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter();
 lean_mark_persistent(l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter);
 l_Lean_Elab_Term_elabTermAux___main___closed__1 = _init_l_Lean_Elab_Term_elabTermAux___main___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/Util.c b/stage0/stdlib/Init/Lean/Elab/Util.c
index 8c77f50e8e..21f8c01f6d 100644
--- a/stage0/stdlib/Init/Lean/Elab/Util.c
+++ b/stage0/stdlib/Init/Lean/Elab/Util.c
@@ -30,7 +30,6 @@ lean_object* l_Lean_Elab_mkMacroAttribute(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttributeAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType(lean_object*);
 lean_object* l_Lean_Elab_macroAttribute___closed__2;
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_toFormat(lean_object*);
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
@@ -69,7 +68,7 @@ lean_object* l_List_find_x3f___main___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkMacroAttribute___closed__3;
 lean_object* l___private_Init_Lean_Elab_Util_1__ElabAttribute_mkInitial___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1___closed__2;
@@ -81,6 +80,7 @@ lean_object* l_Lean_Elab_adaptMacro___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg(lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1;
 extern lean_object* l_Lean_mkAttributeImplOfConstantUnsafe___closed__3;
 lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19(lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_getMacros___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -126,7 +126,6 @@ lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__El
 lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__2;
-lean_object* l_finally___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg___closed__3;
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttributeAux___spec__3___rarg___closed__1;
 lean_object* l_Lean_Elab_ElabAttributeExtensionState_inhabited___closed__1;
@@ -148,7 +147,7 @@ size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Char_HasRepr___closed__1;
-lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getMacros(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
 lean_object* l_Lean_Syntax_prettyPrint(lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_mkBuiltinMacroFnTable___spec__2(lean_object*);
@@ -160,7 +159,7 @@ lean_object* l_Lean_Elab_mkElabAttributeAux___rarg___lambda__2(lean_object*);
 lean_object* l_List_foldl___main___at_Lean_Elab_addMacroStack___spec__1___closed__2;
 lean_object* lean_eval_const(lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttributeAux___spec__3___rarg___closed__2;
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_Elab_mkElabAttributeAux___spec__2(lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__1___closed__1;
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttributeAux___spec__3___rarg(lean_object*, lean_object*);
@@ -216,8 +215,7 @@ lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__1;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_getMacros___spec__2(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_getMacros___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getMacros___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__3;
 lean_object* l_Lean_Elab_macroAttribute;
@@ -232,7 +230,7 @@ uint8_t l_USize_decLe(size_t, size_t);
 lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute(lean_object*);
 lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18___rarg(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_mkBuiltinMacroFnTable___spec__1___closed__2;
 lean_object* l_Lean_Elab_adaptMacro(lean_object*);
@@ -284,7 +282,6 @@ lean_object* l_Lean_Elab_checkSyntaxNodeKind___boxed(lean_object*, lean_object*)
 lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13(lean_object*);
 lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__4;
 lean_object* l_Lean_Elab_checkSyntaxNodeKind(lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg___boxed(lean_object*, lean_object*);
@@ -316,7 +313,7 @@ lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__El
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1(lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24(lean_object*);
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam(lean_object*, lean_object*, lean_object*);
@@ -5529,57 +5526,60 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* _init_l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_box(1);
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
 {
-lean_object* x_5; lean_object* x_6; 
+lean_object* x_4; 
 lean_dec(x_3);
 lean_dec(x_1);
-x_5 = lean_box(1);
-x_6 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_6, 0, x_5);
-lean_ctor_set(x_6, 1, x_4);
-return x_6;
+x_4 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1;
+return x_4;
 }
 else
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_7 = lean_ctor_get(x_2, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_2, 1);
-lean_inc(x_8);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_ctor_get(x_2, 0);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_2, 1);
+lean_inc(x_6);
 lean_dec(x_2);
 lean_inc(x_3);
 lean_inc(x_1);
-x_9 = lean_apply_3(x_7, x_1, x_3, x_4);
-if (lean_obj_tag(x_9) == 0)
+x_7 = lean_apply_2(x_5, x_1, x_3);
+if (lean_obj_tag(x_7) == 0)
 {
-lean_dec(x_8);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_9;
+lean_dec(x_7);
+x_2 = x_6;
+goto _start;
 }
 else
 {
-lean_object* x_10; 
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_2 = x_8;
-x_4 = x_10;
-goto _start;
+lean_dec(x_6);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_7;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Util_7__expandMacroFns(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(x_1, x_2, x_3, x_4);
-return x_5;
+lean_object* x_4; 
+x_4 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(x_1, x_2, x_3);
+return x_4;
 }
 }
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_getMacros___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -5800,41 +5800,38 @@ return x_9;
 }
 }
 }
-lean_object* l_Lean_Elab_getMacros(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Elab_getMacros(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
 lean_inc(x_2);
-x_5 = l_Lean_Syntax_getKind(x_2);
-x_6 = l_Lean_Elab_macroAttribute;
-x_7 = lean_ctor_get(x_6, 1);
-lean_inc(x_7);
-x_8 = l_Lean_PersistentEnvExtension_getState___rarg(x_7, x_1);
+x_4 = l_Lean_Syntax_getKind(x_2);
+x_5 = l_Lean_Elab_macroAttribute;
+x_6 = lean_ctor_get(x_5, 1);
+lean_inc(x_6);
+x_7 = l_Lean_PersistentEnvExtension_getState___rarg(x_6, x_1);
+lean_dec(x_6);
+x_8 = lean_ctor_get(x_7, 1);
+lean_inc(x_8);
 lean_dec(x_7);
-x_9 = lean_ctor_get(x_8, 1);
-lean_inc(x_9);
-lean_dec(x_8);
-x_10 = l_Lean_SMap_find_x3f___at_Lean_Elab_getMacros___spec__1(x_9, x_5);
-lean_dec(x_5);
-if (lean_obj_tag(x_10) == 0)
+x_9 = l_Lean_SMap_find_x3f___at_Lean_Elab_getMacros___spec__1(x_8, x_4);
+lean_dec(x_4);
+if (lean_obj_tag(x_9) == 0)
 {
-lean_object* x_11; lean_object* x_12; 
+lean_object* x_10; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_11 = lean_box(1);
-x_12 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_12, 0, x_11);
-lean_ctor_set(x_12, 1, x_4);
-return x_12;
+x_10 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1;
+return x_10;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_10, 0);
-lean_inc(x_13);
-lean_dec(x_10);
-x_14 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(x_2, x_13, x_3, x_4);
-return x_14;
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_ctor_get(x_9, 0);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = l___private_Init_Lean_Elab_Util_7__expandMacroFns___main(x_2, x_11, x_3);
+return x_12;
 }
 }
 }
@@ -5898,132 +5895,90 @@ lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_getMacros___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Elab_getMacros___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_5; 
-x_5 = l_Lean_Elab_getMacros(x_1, x_2, x_3, x_4);
+lean_object* x_4; 
+x_4 = l_Lean_Elab_getMacros(x_1, x_2, x_3);
 lean_dec(x_1);
-return x_5;
+return x_4;
 }
 }
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_5 = lean_ctor_get(x_1, 4);
-lean_inc(x_5);
-lean_dec(x_1);
-x_6 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_6, 0, x_2);
-x_7 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_7, 0, x_6);
-x_8 = lean_apply_3(x_5, lean_box(0), x_3, x_7);
-return x_8;
-}
-}
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
+lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_7 = lean_environment_main_module(x_6);
+x_8 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_8, 0, x_7);
+lean_ctor_set(x_8, 1, x_1);
+lean_inc(x_3);
+x_9 = lean_apply_2(x_2, x_3, x_8);
+if (lean_obj_tag(x_9) == 0)
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_9 = lean_environment_main_module(x_1);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_10, 1, x_2);
-lean_inc(x_4);
-x_11 = lean_apply_3(x_3, x_4, x_10, x_8);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-lean_dec(x_4);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_5, 3);
-lean_inc(x_14);
+lean_object* x_10; 
 lean_dec(x_5);
-x_15 = lean_apply_1(x_14, x_13);
-x_16 = lean_alloc_closure((void*)(l_finally___rarg___lambda__1___boxed), 3, 2);
-lean_closure_set(x_16, 0, x_6);
-lean_closure_set(x_16, 1, x_12);
-x_17 = lean_apply_4(x_7, lean_box(0), lean_box(0), x_15, x_16);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+lean_dec(x_9);
+if (lean_obj_tag(x_10) == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_ctor_get(x_4, 2);
+lean_inc(x_12);
+lean_dec(x_4);
+x_13 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_13, 0, x_11);
+x_14 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+x_15 = lean_apply_3(x_12, lean_box(0), x_3, x_14);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_3);
+x_16 = lean_ctor_get(x_4, 3);
+lean_inc(x_16);
+lean_dec(x_4);
+x_17 = lean_apply_1(x_16, lean_box(0));
 return x_17;
 }
-else
-{
-lean_object* x_18; 
-lean_dec(x_6);
-x_18 = lean_ctor_get(x_11, 0);
-lean_inc(x_18);
-if (lean_obj_tag(x_18) == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_19 = lean_ctor_get(x_11, 1);
-lean_inc(x_19);
-lean_dec(x_11);
-x_20 = lean_ctor_get(x_18, 0);
-lean_inc(x_20);
-lean_dec(x_18);
-x_21 = lean_ctor_get(x_5, 3);
-lean_inc(x_21);
-x_22 = lean_apply_1(x_21, x_19);
-x_23 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__1___boxed), 4, 3);
-lean_closure_set(x_23, 0, x_5);
-lean_closure_set(x_23, 1, x_20);
-lean_closure_set(x_23, 2, x_4);
-x_24 = lean_apply_4(x_7, lean_box(0), lean_box(0), x_22, x_23);
-return x_24;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; 
-lean_dec(x_11);
-lean_dec(x_7);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
 lean_dec(x_4);
-x_25 = lean_ctor_get(x_5, 5);
-lean_inc(x_25);
+lean_dec(x_3);
+x_18 = lean_ctor_get(x_9, 0);
+lean_inc(x_18);
+lean_dec(x_9);
+x_19 = lean_ctor_get(x_5, 0);
+lean_inc(x_19);
 lean_dec(x_5);
-x_26 = lean_apply_1(x_25, lean_box(0));
-return x_26;
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = lean_apply_2(x_20, lean_box(0), x_18);
+return x_21;
 }
 }
 }
-}
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_8 = lean_ctor_get(x_1, 2);
-lean_inc(x_8);
-lean_inc(x_6);
-x_9 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__2), 8, 7);
-lean_closure_set(x_9, 0, x_7);
-lean_closure_set(x_9, 1, x_2);
-lean_closure_set(x_9, 2, x_3);
-lean_closure_set(x_9, 3, x_4);
-lean_closure_set(x_9, 4, x_1);
-lean_closure_set(x_9, 5, x_5);
-lean_closure_set(x_9, 6, x_6);
-x_10 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_8, x_9);
-return x_10;
-}
-}
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; 
 x_7 = lean_ctor_get(x_1, 0);
 lean_inc(x_7);
-lean_inc(x_5);
-x_8 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__3), 7, 6);
-lean_closure_set(x_8, 0, x_1);
-lean_closure_set(x_8, 1, x_6);
-lean_closure_set(x_8, 2, x_2);
-lean_closure_set(x_8, 3, x_3);
+x_8 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__1), 6, 5);
+lean_closure_set(x_8, 0, x_6);
+lean_closure_set(x_8, 1, x_2);
+lean_closure_set(x_8, 2, x_3);
+lean_closure_set(x_8, 3, x_1);
 lean_closure_set(x_8, 4, x_4);
-lean_closure_set(x_8, 5, x_5);
 x_9 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_7, x_8);
 return x_9;
 }
@@ -6037,7 +5992,7 @@ lean_inc(x_5);
 x_6 = lean_ctor_get(x_2, 1);
 lean_inc(x_6);
 lean_inc(x_5);
-x_7 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__4), 6, 5);
+x_7 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg___lambda__2), 6, 5);
 lean_closure_set(x_7, 0, x_2);
 lean_closure_set(x_7, 1, x_3);
 lean_closure_set(x_7, 2, x_4);
@@ -6055,15 +6010,6 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Elab_adaptMacro___rarg), 4, 0);
 return x_2;
 }
 }
-lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_adaptMacro___rarg___lambda__1(x_1, x_2, x_3, x_4);
-lean_dec(x_4);
-return x_5;
-}
-}
 lean_object* l_Lean_Elab_adaptMacro___boxed(lean_object* x_1) {
 _start:
 {
@@ -6274,6 +6220,8 @@ if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_macroAttribute = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_macroAttribute);
 lean_dec_ref(res);
+l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1 = _init_l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Util_7__expandMacroFns___main___closed__1);
 l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__1 = _init_l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__1();
 lean_mark_persistent(l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__1);
 l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__2 = _init_l___private_Init_Lean_Elab_Util_8__regTraceClasses___closed__2();
diff --git a/stage0/stdlib/Init/LeanInit.c b/stage0/stdlib/Init/LeanInit.c
index 1f10a617ce..6bcd0be68a 100644
--- a/stage0/stdlib/Init/LeanInit.c
+++ b/stage0/stdlib/Init/LeanInit.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.LeanInit
-// Imports: Init.Data.String.Basic Init.Data.Array.Basic Init.Data.UInt Init.Data.Hashable Init.Control.Reader Init.Control.EState
+// Imports: Init.Data.String.Basic Init.Data.Array.Basic Init.Data.UInt Init.Data.Hashable Init.Control.Reader Init.Control.Except
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -42,7 +42,7 @@ lean_object* l_Lean_Name_HasAppend;
 lean_object* l_Lean_Syntax_identToAtom___boxed(lean_object*);
 lean_object* l_Lean_fieldIdxKind___closed__2;
 lean_object* l_Lean_ParserDescr_orelse(uint8_t, lean_object*, lean_object*);
-lean_object* l_Lean_MacroM_monadQuotation___lambda__2(lean_object*, lean_object*);
+lean_object* l_Lean_MacroM_monadQuotation___lambda__2(lean_object*);
 lean_object* l___private_Init_LeanInit_3__extractMainModule(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_8__decodeHexDigit___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_10__decodeDecimalLitAux___main(lean_object*, lean_object*, lean_object*);
@@ -114,7 +114,7 @@ lean_object* l_Lean_mkStxNumLit(lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescrCore_inhabited(uint8_t);
 lean_object* l_Lean_Name_HasAppend___closed__1;
 uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
-lean_object* l_Lean_MacroM_monadQuotation___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_MacroM_monadQuotation___lambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getKind___closed__4;
 lean_object* l_Lean_Syntax_termIdToAntiquot___closed__4;
 lean_object* l_Lean_ParserDescr_many1(uint8_t, lean_object*);
@@ -130,16 +130,15 @@ lean_object* l_Lean_choiceKind___closed__1;
 lean_object* l___private_Init_LeanInit_7__decodeOctalLitAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_choiceKind___closed__2;
-lean_object* l_Lean_Macro_mkFreshName___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescr_num___boxed(lean_object*);
-lean_object* l_Lean_MacroM_monadQuotation___lambda__2___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_MacroM_monadQuotation___lambda__2___boxed(lean_object*);
 lean_object* l_Lean_strLitKind;
 lean_object* l_Lean_Syntax_isStrLit_x3f(lean_object*);
-lean_object* l_Lean_Macro_mkFreshName(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_getSepElems(lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isFieldIdx_x3f(lean_object*);
 lean_object* l_Lean_ParserDescr_many1___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Macro_addMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_mkTermIdFrom___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getHeadInfo(lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*);
@@ -211,7 +210,7 @@ uint8_t l_UInt32_decEq(uint32_t, uint32_t);
 lean_object* l_Lean_Syntax_inhabited;
 lean_object* l_Lean_mkAppStx___closed__5;
 lean_object* l_Lean_mkHole(lean_object*);
-lean_object* l_Lean_MacroM_monadQuotation___lambda__1___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_MacroM_monadQuotation___lambda__1___boxed(lean_object*);
 lean_object* l_Lean_ParserDescr_char___boxed(lean_object*);
 lean_object* l___private_Init_LeanInit_4__extractMacroScopesAux___main(lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_hasArgs(lean_object*);
@@ -275,7 +274,7 @@ lean_object* l_Lean_mkAtomFrom___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
 lean_object* l_Lean_ParserDescr_symbol(uint8_t, lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_9__decodeHexLitAux(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_MacroM_monadQuotation___lambda__1(lean_object*, lean_object*);
+lean_object* l_Lean_MacroM_monadQuotation___lambda__1(lean_object*);
 uint8_t l_UInt32_decLe(uint32_t, uint32_t);
 lean_object* l_Lean_ParserDescr_optional___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkAppStx___closed__2;
@@ -1856,106 +1855,56 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l_Lean_Macro_mkFreshName(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_Macro_addMacroScope(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_2, 0);
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_3 = lean_ctor_get(x_2, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_2, 1);
 lean_inc(x_4);
 lean_dec(x_2);
-x_5 = l_Lean_Name_append___main(x_1, x_4);
-x_6 = !lean_is_exclusive(x_3);
-if (x_6 == 0)
+x_5 = l_Lean_addMacroScope(x_3, x_1, x_4);
+x_6 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_6, 0, x_5);
+return x_6;
+}
+}
+lean_object* l_Lean_MacroM_monadQuotation___lambda__1(lean_object* x_1) {
+_start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_7 = lean_ctor_get(x_3, 0);
-x_8 = lean_ctor_get(x_3, 1);
-lean_inc(x_8);
-lean_inc(x_7);
-x_9 = lean_name_mk_numeral(x_7, x_8);
-x_10 = l_Lean_Name_append___main(x_5, x_9);
-lean_dec(x_5);
-x_11 = lean_unsigned_to_nat(1u);
-x_12 = lean_nat_add(x_8, x_11);
-lean_dec(x_8);
-lean_ctor_set(x_3, 1, x_12);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_10);
-lean_ctor_set(x_13, 1, x_3);
-return x_13;
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 1);
+lean_inc(x_2);
+x_3 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_3, 0, x_2);
+return x_3;
 }
-else
+}
+lean_object* l_Lean_MacroM_monadQuotation___lambda__2(lean_object* x_1) {
+_start:
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_14 = lean_ctor_get(x_3, 0);
-x_15 = lean_ctor_get(x_3, 1);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_3);
-lean_inc(x_15);
-lean_inc(x_14);
-x_16 = lean_name_mk_numeral(x_14, x_15);
-x_17 = l_Lean_Name_append___main(x_5, x_16);
-lean_dec(x_5);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_15, x_18);
-lean_dec(x_15);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_14);
-lean_ctor_set(x_20, 1, x_19);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_17);
-lean_ctor_set(x_21, 1, x_20);
-return x_21;
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_3, 0, x_2);
+return x_3;
 }
 }
-}
-lean_object* l_Lean_Macro_mkFreshName___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_MacroM_monadQuotation___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Lean_Macro_mkFreshName(x_1, x_2, x_3);
-lean_dec(x_1);
+x_4 = lean_apply_1(x_2, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_MacroM_monadQuotation___lambda__1(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; 
-x_3 = lean_ctor_get(x_1, 1);
-lean_inc(x_3);
-x_4 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_4, 0, x_3);
-lean_ctor_set(x_4, 1, x_2);
-return x_4;
-}
-}
-lean_object* l_Lean_MacroM_monadQuotation___lambda__2(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; 
-x_3 = lean_ctor_get(x_1, 0);
-lean_inc(x_3);
-x_4 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_4, 0, x_3);
-lean_ctor_set(x_4, 1, x_2);
-return x_4;
-}
-}
-lean_object* l_Lean_MacroM_monadQuotation___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = lean_apply_2(x_2, x_3, x_4);
-return x_5;
-}
-}
 lean_object* _init_l_Lean_MacroM_monadQuotation___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__1___boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__1___boxed), 1, 0);
 return x_1;
 }
 }
@@ -1963,7 +1912,7 @@ lean_object* _init_l_Lean_MacroM_monadQuotation___closed__2() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__2___boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__2___boxed), 1, 0);
 return x_1;
 }
 }
@@ -1971,7 +1920,7 @@ lean_object* _init_l_Lean_MacroM_monadQuotation___closed__3() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__3), 4, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_MacroM_monadQuotation___lambda__3), 3, 0);
 return x_1;
 }
 }
@@ -1997,22 +1946,22 @@ x_1 = l_Lean_MacroM_monadQuotation___closed__4;
 return x_1;
 }
 }
-lean_object* l_Lean_MacroM_monadQuotation___lambda__1___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_MacroM_monadQuotation___lambda__1___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_3; 
-x_3 = l_Lean_MacroM_monadQuotation___lambda__1(x_1, x_2);
+lean_object* x_2; 
+x_2 = l_Lean_MacroM_monadQuotation___lambda__1(x_1);
 lean_dec(x_1);
-return x_3;
+return x_2;
 }
 }
-lean_object* l_Lean_MacroM_monadQuotation___lambda__2___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_MacroM_monadQuotation___lambda__2___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_3; 
-x_3 = l_Lean_MacroM_monadQuotation___lambda__2(x_1, x_2);
+lean_object* x_2; 
+x_2 = l_Lean_MacroM_monadQuotation___lambda__2(x_1);
 lean_dec(x_1);
-return x_3;
+return x_2;
 }
 }
 lean_object* _init_l_Lean_choiceKind___closed__1() {
@@ -4587,7 +4536,7 @@ lean_object* initialize_Init_Data_Array_Basic(lean_object*);
 lean_object* initialize_Init_Data_UInt(lean_object*);
 lean_object* initialize_Init_Data_Hashable(lean_object*);
 lean_object* initialize_Init_Control_Reader(lean_object*);
-lean_object* initialize_Init_Control_EState(lean_object*);
+lean_object* initialize_Init_Control_Except(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_LeanInit(lean_object* w) {
 lean_object * res;
@@ -4608,7 +4557,7 @@ lean_dec_ref(res);
 res = initialize_Init_Control_Reader(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Init_Control_EState(lean_io_mk_world());
+res = initialize_Init_Control_Except(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Name_inhabited = _init_l_Lean_Name_inhabited();