diff --git a/stage0/src/Lean/Elab/Attributes.lean b/stage0/src/Lean/Elab/Attributes.lean
index 542637f549..aacb24a3b0 100644
--- a/stage0/src/Lean/Elab/Attributes.lean
+++ b/stage0/src/Lean/Elab/Attributes.lean
@@ -9,20 +9,34 @@ import Lean.MonadEnv
 namespace Lean.Elab
 
 structure Attribute where
-  «scoped» : Bool := false
+  kind     : AttributeKind := AttributeKind.global
   name     : Name
   args     : Syntax := Syntax.missing
 
 instance : ToFormat Attribute where
   format attr :=
-    Format.bracket "@[" f!"{if attr.scoped then "scoped" else ""}{attr.name}{if attr.args.isMissing then "" else toString attr.args}" "]"
+   let kindStr := match attr.kind with
+     | AttributeKind.global => ""
+     | AttributeKind.local  => "local "
+     | AttributeKind.scoped => "scoped "
+   Format.bracket "@[" f!"{kindStr}{attr.name}{if attr.args.isMissing then "" else toString attr.args}" "]"
 
 instance : Inhabited Attribute where
   default := { name := arbitrary }
 
+/-
+  ```
+  attrKind := optional («scoped» <|> «local»)
+  ```
+-/
+def toAttributeKind (attrKindStx : Syntax) : AttributeKind :=
+  if attrKindStx.isNone then AttributeKind.global
+  else if attrKindStx[0].getKind == `Lean.Parser.Term.scoped then AttributeKind.scoped
+  else AttributeKind.local
+
 def elabAttr {m} [Monad m] [MonadEnv m] [MonadExceptOf Exception m] [MonadRef m] [AddErrorMessageContext m] (stx : Syntax) : m Attribute := do
-  -- optional "scoped" >> rawIdent >> many attrArg
-  let «scoped»  := !stx[0].isNone
+  -- attrKind >> rawIdent >> many attrArg
+  let kind := toAttributeKind stx[0]
   let nameStx := stx[1]
   let attrName ← match nameStx.isIdOrAtom? with
     | none     => withRef nameStx $ throwError "identifier expected"
@@ -33,7 +47,7 @@ def elabAttr {m} [Monad m] [MonadEnv m] [MonadExceptOf Exception m] [MonadRef m]
   -- the old frontend passes Syntax.missing for empty args, for reasons
   if args.getNumArgs == 0 then
     args := Syntax.missing
-  pure { «scoped» := «scoped», name := attrName, args := args }
+  pure { kind := kind, name := attrName, args := args }
 
 -- sepBy1 attrInstance ", "
 def elabAttrs {m} [Monad m] [MonadEnv m] [MonadExceptOf Exception m] [MonadRef m] [AddErrorMessageContext m] (stx : Syntax) : m (Array Attribute) := do
diff --git a/stage0/src/Lean/Elab/Declaration.lean b/stage0/src/Lean/Elab/Declaration.lean
index a841af3278..e6519ee02c 100644
--- a/stage0/src/Lean/Elab/Declaration.lean
+++ b/stage0/src/Lean/Elab/Declaration.lean
@@ -250,14 +250,13 @@ def elabMutual : CommandElab := fun stx => do
   else
     throwError "invalid mutual block"
 
-/- parser! optional "local " >> "attribute " >> "[" >> sepBy1 Term.attrInstance ", " >> "]" >> many1 ident -/
+/- parser! "attribute " >> "[" >> sepBy1 Term.attrInstance ", " >> "]" >> many1 ident -/
 @[builtinCommandElab «attribute»] def elabAttr : CommandElab := fun stx => do
-  let persistent := stx[0].isNone
-  let attrs ← elabAttrs stx[3]
-  let idents := stx[5].getArgs
+  let attrs ← elabAttrs stx[2]
+  let idents := stx[4].getArgs
   for ident in idents do withRef ident $ liftTermElabM none do
     let declName ← resolveGlobalConstNoOverload ident.getId
-    Term.applyAttributes declName attrs persistent
+    Term.applyAttributes declName attrs
 
 def expandInitCmd (builtin : Bool) : Macro := fun stx =>
   let optHeader := stx[1]
diff --git a/stage0/src/Lean/Elab/Term.lean b/stage0/src/Lean/Elab/Term.lean
index aef903161c..6d8b60ad11 100644
--- a/stage0/src/Lean/Elab/Term.lean
+++ b/stage0/src/Lean/Elab/Term.lean
@@ -470,33 +470,24 @@ private def liftAttrM {α} (x : AttrM α) : TermElabM α := do
 
 private def applyAttributesCore
     (declName : Name) (attrs : Array Attribute)
-    (applicationTime? : Option AttributeApplicationTime) (persistent : Bool) : TermElabM Unit :=
+    (applicationTime? : Option AttributeApplicationTime) : TermElabM Unit :=
   for attr in attrs do
     let env ← getEnv
     match getAttributeImpl env attr.name with
     | Except.error errMsg => throwError errMsg
     | Except.ok attrImpl  =>
       match applicationTime? with
-      | none => apply attrImpl declName attr.scoped attr.args persistent
+      | none => liftAttrM <| attrImpl.add declName attr.args attr.kind
       | some applicationTime =>
         if applicationTime == attrImpl.applicationTime then
-          apply attrImpl declName attr.scoped attr.args persistent
-where
-  apply attrImpl declName «scoped» args persistent := do
-    let kind ←
-      match persistent, «scoped» with
-      | true,  true  => pure AttributeKind.scoped
-      | false, true  => throwError "scoped local attributes are not allowed"
-      | true,  false => pure AttributeKind.global
-      | false, false => pure AttributeKind.local
-    liftAttrM <| attrImpl.add declName args kind
+          liftAttrM <| attrImpl.add declName attr.args attr.kind
 
 /-- Apply given attributes **at** a given application time -/
-def applyAttributesAt (declName : Name) (attrs : Array Attribute) (applicationTime : AttributeApplicationTime) (persistent : Bool := true) : TermElabM Unit :=
-  applyAttributesCore declName attrs applicationTime persistent
+def applyAttributesAt (declName : Name) (attrs : Array Attribute) (applicationTime : AttributeApplicationTime) : TermElabM Unit :=
+  applyAttributesCore declName attrs applicationTime
 
-def applyAttributes (declName : Name) (attrs : Array Attribute) (persistent : Bool) : TermElabM Unit :=
-  applyAttributesCore declName attrs none persistent
+def applyAttributes (declName : Name) (attrs : Array Attribute) : TermElabM Unit :=
+  applyAttributesCore declName attrs none
 
 def mkTypeMismatchError (header? : Option String) (e : Expr) (eType : Expr) (expectedType : Expr) : MessageData :=
   let header : MessageData := match header? with
diff --git a/stage0/src/Lean/Parser/Command.lean b/stage0/src/Lean/Parser/Command.lean
index 0365c53696..d9f7bea495 100644
--- a/stage0/src/Lean/Parser/Command.lean
+++ b/stage0/src/Lean/Parser/Command.lean
@@ -81,7 +81,7 @@ declModifiers false >> («abbrev» <|> «def» <|> «theorem» <|> «constant»
 @[builtinCommandParser] def «resolve_name» := parser! "#resolve_name " >> ident
 @[builtinCommandParser] def «init_quot»    := parser! "init_quot"
 @[builtinCommandParser] def «set_option»   := parser! "set_option " >> ident >> (nonReservedSymbol "true" <|> nonReservedSymbol "false" <|> strLit <|> numLit)
-@[builtinCommandParser] def «attribute»    := parser! optional "local " >> "attribute " >> "[" >> sepBy1 Term.attrInstance ", " >> "] " >> many1 ident
+@[builtinCommandParser] def «attribute»    := parser! "attribute " >> "[" >> sepBy1 Term.attrInstance ", " >> "] " >> many1 ident
 @[builtinCommandParser] def «export»       := parser! "export " >> ident >> "(" >> many1 ident >> ")"
 def openHiding       := parser! atomic (ident >> "hiding") >> many1 ident
 def openRenamingItem := parser! ident >> unicodeSymbol "→" "->" >> ident
diff --git a/stage0/stdlib/Lean/Elab/Attributes.c b/stage0/stdlib/Lean/Elab/Attributes.c
index 5fbc75a829..864a0b4e82 100644
--- a/stage0/stdlib/Lean/Elab/Attributes.c
+++ b/stage0/stdlib/Lean/Elab/Attributes.c
@@ -27,6 +27,7 @@ extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_Elab_instToFormatAttribute(lean_object*);
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 extern lean_object* l_term_x5b___x2c_x5d___closed__11;
+uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -38,6 +39,8 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_elabAttrs___spec__1___rarg_
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Elab_Attribute_kind___default;
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1(lean_object*);
 extern lean_object* l_Lean_Format_join___closed__1;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__10;
 lean_object* l_Lean_Elab_elabAttrs(lean_object*);
@@ -45,6 +48,7 @@ lean_object* l_Lean_Elab_elabAttr(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_elabAttrs___spec__1(lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_38____closed__6;
 lean_object* l_Lean_Elab_instInhabitedAttribute___closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_elabAttrs___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___closed__1;
@@ -62,19 +66,26 @@ lean_object* l_Lean_Elab_instToFormatAttribute___closed__4;
 lean_object* l_Lean_Elab_elabAttr___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___rarg___lambda__1(lean_object*, lean_object*);
 extern lean_object* l_Lean_Format_sbracket___closed__4;
+lean_object* l_Lean_Syntax_getKind(lean_object*);
+lean_object* l_Lean_Elab_instToFormatAttribute___closed__5;
 lean_object* l_Lean_Elab_instToFormatAttribute___closed__2;
 lean_object* l_Lean_Elab_instToFormatAttribute___closed__1;
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_toAttributeKind___closed__1;
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* l_Lean_Elab_instToFormatAttribute___closed__3;
 lean_object* l_Lean_fmt___at_Lean_Level_LevelToFormat_toResult___spec__1(lean_object*);
+lean_object* l_Lean_Elab_toAttributeKind___closed__2;
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__3___closed__1;
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__3(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_length(lean_object*);
+lean_object* l_Lean_Elab_toAttributeKind___boxed(lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
-uint8_t l_Lean_Elab_Attribute_scoped___default;
+uint8_t l_Lean_Elab_toAttributeKind(lean_object*);
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__3___closed__2;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_elabAttrs___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___rarg___lambda__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
@@ -83,7 +94,7 @@ lean_object* lean_nat_to_int(lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabDeclAttrs___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static uint8_t _init_l_Lean_Elab_Attribute_scoped___default() {
+static uint8_t _init_l_Lean_Elab_Attribute_kind___default() {
 _start:
 {
 uint8_t x_1; 
@@ -99,6 +110,58 @@ x_1 = lean_box(0);
 return x_1;
 }
 }
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+switch (x_1) {
+case 0:
+{
+lean_object* x_5; lean_object* x_6; 
+lean_dec(x_4);
+lean_dec(x_3);
+x_5 = lean_box(0);
+x_6 = lean_apply_1(x_2, x_5);
+return x_6;
+}
+case 1:
+{
+lean_object* x_7; lean_object* x_8; 
+lean_dec(x_4);
+lean_dec(x_2);
+x_7 = lean_box(0);
+x_8 = lean_apply_1(x_3, x_7);
+return x_8;
+}
+default: 
+{
+lean_object* x_9; lean_object* x_10; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_9 = lean_box(0);
+x_10 = lean_apply_1(x_4, x_9);
+return x_10;
+}
+}
+}
+}
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Elab_instToFormatAttribute_match__1___rarg___boxed), 4, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_Elab_instToFormatAttribute_match__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Elab_instToFormatAttribute_match__1___rarg(x_5, x_2, x_3, x_4);
+return x_6;
+}
+}
 static lean_object* _init_l_Lean_Elab_instToFormatAttribute___closed__1() {
 _start:
 {
@@ -131,7 +194,15 @@ static lean_object* _init_l_Lean_Elab_instToFormatAttribute___closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("scoped");
+x_1 = lean_mk_string("local ");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_instToFormatAttribute___closed__5() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("scoped ");
 return x_1;
 }
 }
@@ -147,20 +218,29 @@ x_5 = lean_ctor_get(x_1, 1);
 lean_inc(x_5);
 lean_dec(x_1);
 x_6 = l_Lean_Syntax_isMissing(x_5);
-if (x_2 == 0)
+switch (x_2) {
+case 0:
 {
 lean_object* x_42; 
 x_42 = l_Lean_instInhabitedParserDescr___closed__1;
 x_7 = x_42;
 goto block_41;
 }
-else
+case 1:
 {
 lean_object* x_43; 
 x_43 = l_Lean_Elab_instToFormatAttribute___closed__4;
 x_7 = x_43;
 goto block_41;
 }
+default: 
+{
+lean_object* x_44; 
+x_44 = l_Lean_Elab_instToFormatAttribute___closed__5;
+x_7 = x_44;
+goto block_41;
+}
+}
 block_41:
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
@@ -267,6 +347,69 @@ x_1 = l_Lean_Elab_instInhabitedAttribute___closed__1;
 return x_1;
 }
 }
+static lean_object* _init_l_Lean_Elab_toAttributeKind___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("scoped");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_toAttributeKind___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_myMacro____x40_Init_Notation___hyg_38____closed__6;
+x_2 = l_Lean_Elab_toAttributeKind___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+uint8_t l_Lean_Elab_toAttributeKind(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; 
+x_2 = l_Lean_Syntax_isNone(x_1);
+if (x_2 == 0)
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+x_3 = lean_unsigned_to_nat(0u);
+x_4 = l_Lean_Syntax_getArg(x_1, x_3);
+x_5 = l_Lean_Syntax_getKind(x_4);
+x_6 = l_Lean_Elab_toAttributeKind___closed__2;
+x_7 = lean_name_eq(x_5, x_6);
+lean_dec(x_5);
+if (x_7 == 0)
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+else
+{
+uint8_t x_9; 
+x_9 = 2;
+return x_9;
+}
+}
+else
+{
+uint8_t x_10; 
+x_10 = 0;
+return x_10;
+}
+}
+}
+lean_object* l_Lean_Elab_toAttributeKind___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Elab_toAttributeKind(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 lean_object* l_Lean_Elab_elabAttr_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -501,87 +644,69 @@ return x_2;
 lean_object* l_Lean_Elab_elabAttr___rarg(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; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+lean_object* x_7; lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = l_Lean_Syntax_getArg(x_6, x_7);
-x_9 = l_Lean_Syntax_isNone(x_8);
+x_9 = l_Lean_Elab_toAttributeKind(x_8);
 lean_dec(x_8);
 x_10 = lean_unsigned_to_nat(1u);
 x_11 = l_Lean_Syntax_getArg(x_6, x_10);
-x_12 = l_Lean_Syntax_isIdOrAtom_x3f(x_11);
-if (x_9 == 0)
-{
-uint8_t x_32; 
-x_32 = 1;
-x_13 = x_32;
-goto block_31;
-}
-else
-{
-uint8_t x_33; 
-x_33 = 0;
-x_13 = x_33;
-goto block_31;
-}
-block_31:
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_box(x_13);
+x_12 = lean_box(x_9);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_1);
-x_15 = lean_alloc_closure((void*)(l_Lean_Elab_elabAttr___rarg___lambda__4___boxed), 8, 7);
-lean_closure_set(x_15, 0, x_1);
-lean_closure_set(x_15, 1, x_2);
-lean_closure_set(x_15, 2, x_6);
-lean_closure_set(x_15, 3, x_14);
-lean_closure_set(x_15, 4, x_3);
-lean_closure_set(x_15, 5, x_4);
-lean_closure_set(x_15, 6, x_5);
-if (lean_obj_tag(x_12) == 0)
+x_13 = lean_alloc_closure((void*)(l_Lean_Elab_elabAttr___rarg___lambda__4___boxed), 8, 7);
+lean_closure_set(x_13, 0, x_1);
+lean_closure_set(x_13, 1, x_2);
+lean_closure_set(x_13, 2, x_6);
+lean_closure_set(x_13, 3, x_12);
+lean_closure_set(x_13, 4, x_3);
+lean_closure_set(x_13, 5, x_4);
+lean_closure_set(x_13, 6, x_5);
+x_14 = l_Lean_Syntax_isIdOrAtom_x3f(x_11);
+if (lean_obj_tag(x_14) == 0)
 {
-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; 
-x_16 = lean_ctor_get(x_1, 1);
-lean_inc(x_16);
-x_17 = l_Lean_Elab_elabAttr___rarg___closed__3;
+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_15 = lean_ctor_get(x_1, 1);
+lean_inc(x_15);
+x_16 = l_Lean_Elab_elabAttr___rarg___closed__3;
 lean_inc(x_4);
-x_18 = l_Lean_throwError___rarg(x_1, x_3, x_4, x_5, lean_box(0), x_17);
-x_19 = lean_ctor_get(x_4, 0);
-lean_inc(x_19);
-x_20 = lean_alloc_closure((void*)(l_Lean_withRef___rarg___lambda__1___boxed), 4, 3);
-lean_closure_set(x_20, 0, x_11);
-lean_closure_set(x_20, 1, x_4);
-lean_closure_set(x_20, 2, x_18);
-lean_inc(x_16);
-x_21 = lean_apply_4(x_16, lean_box(0), lean_box(0), x_19, x_20);
-x_22 = lean_apply_4(x_16, lean_box(0), lean_box(0), x_21, x_15);
-return x_22;
+x_17 = l_Lean_throwError___rarg(x_1, x_3, x_4, x_5, lean_box(0), x_16);
+x_18 = lean_ctor_get(x_4, 0);
+lean_inc(x_18);
+x_19 = lean_alloc_closure((void*)(l_Lean_withRef___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_19, 0, x_11);
+lean_closure_set(x_19, 1, x_4);
+lean_closure_set(x_19, 2, x_17);
+lean_inc(x_15);
+x_20 = lean_apply_4(x_15, lean_box(0), lean_box(0), x_18, x_19);
+x_21 = lean_apply_4(x_15, lean_box(0), lean_box(0), x_20, x_13);
+return x_21;
 }
 else
 {
-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_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_dec(x_11);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_23 = lean_ctor_get(x_12, 0);
+x_22 = lean_ctor_get(x_14, 0);
+lean_inc(x_22);
+lean_dec(x_14);
+x_23 = lean_ctor_get(x_1, 1);
 lean_inc(x_23);
-lean_dec(x_12);
-x_24 = lean_ctor_get(x_1, 1);
+x_24 = lean_ctor_get(x_1, 0);
 lean_inc(x_24);
-x_25 = lean_ctor_get(x_1, 0);
-lean_inc(x_25);
 lean_dec(x_1);
-x_26 = lean_ctor_get(x_25, 1);
-lean_inc(x_26);
-lean_dec(x_25);
-x_27 = lean_box(0);
-x_28 = lean_name_mk_string(x_27, x_23);
-x_29 = lean_apply_2(x_26, lean_box(0), x_28);
-x_30 = lean_apply_4(x_24, lean_box(0), lean_box(0), x_29, x_15);
-return x_30;
-}
+x_25 = lean_ctor_get(x_24, 1);
+lean_inc(x_25);
+lean_dec(x_24);
+x_26 = lean_box(0);
+x_27 = lean_name_mk_string(x_26, x_22);
+x_28 = lean_apply_2(x_25, lean_box(0), x_27);
+x_29 = lean_apply_4(x_23, lean_box(0), lean_box(0), x_28, x_13);
+return x_29;
 }
 }
 }
@@ -888,7 +1013,7 @@ lean_dec_ref(res);
 res = initialize_Lean_MonadEnv(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Attribute_scoped___default = _init_l_Lean_Elab_Attribute_scoped___default();
+l_Lean_Elab_Attribute_kind___default = _init_l_Lean_Elab_Attribute_kind___default();
 l_Lean_Elab_Attribute_args___default = _init_l_Lean_Elab_Attribute_args___default();
 lean_mark_persistent(l_Lean_Elab_Attribute_args___default);
 l_Lean_Elab_instToFormatAttribute___closed__1 = _init_l_Lean_Elab_instToFormatAttribute___closed__1();
@@ -899,10 +1024,16 @@ l_Lean_Elab_instToFormatAttribute___closed__3 = _init_l_Lean_Elab_instToFormatAt
 lean_mark_persistent(l_Lean_Elab_instToFormatAttribute___closed__3);
 l_Lean_Elab_instToFormatAttribute___closed__4 = _init_l_Lean_Elab_instToFormatAttribute___closed__4();
 lean_mark_persistent(l_Lean_Elab_instToFormatAttribute___closed__4);
+l_Lean_Elab_instToFormatAttribute___closed__5 = _init_l_Lean_Elab_instToFormatAttribute___closed__5();
+lean_mark_persistent(l_Lean_Elab_instToFormatAttribute___closed__5);
 l_Lean_Elab_instInhabitedAttribute___closed__1 = _init_l_Lean_Elab_instInhabitedAttribute___closed__1();
 lean_mark_persistent(l_Lean_Elab_instInhabitedAttribute___closed__1);
 l_Lean_Elab_instInhabitedAttribute = _init_l_Lean_Elab_instInhabitedAttribute();
 lean_mark_persistent(l_Lean_Elab_instInhabitedAttribute);
+l_Lean_Elab_toAttributeKind___closed__1 = _init_l_Lean_Elab_toAttributeKind___closed__1();
+lean_mark_persistent(l_Lean_Elab_toAttributeKind___closed__1);
+l_Lean_Elab_toAttributeKind___closed__2 = _init_l_Lean_Elab_toAttributeKind___closed__2();
+lean_mark_persistent(l_Lean_Elab_toAttributeKind___closed__2);
 l_Lean_Elab_elabAttr___rarg___lambda__3___closed__1 = _init_l_Lean_Elab_elabAttr___rarg___lambda__3___closed__1();
 lean_mark_persistent(l_Lean_Elab_elabAttr___rarg___lambda__3___closed__1);
 l_Lean_Elab_elabAttr___rarg___lambda__3___closed__2 = _init_l_Lean_Elab_elabAttr___rarg___lambda__3___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/DeclModifiers.c b/stage0/stdlib/Lean/Elab/DeclModifiers.c
index 94b08df64c..be950908ff 100644
--- a/stage0/stdlib/Lean/Elab/DeclModifiers.c
+++ b/stage0/stdlib/Lean/Elab/DeclModifiers.c
@@ -149,6 +149,7 @@ lean_object* l_Lean_Elab_instToFormatModifiers_match__1(lean_object*);
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l_Lean_Elab_mkDeclName___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabModifiers___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_instToFormatAttribute___closed__5;
 lean_object* l_Lean_Elab_expandDeclId___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Modifiers_isPrivate___boxed(lean_object*);
 extern lean_object* l_Lean_Elab_instToFormatAttribute___closed__2;
@@ -1015,20 +1016,29 @@ x_5 = lean_ctor_get(x_1, 1);
 lean_inc(x_5);
 lean_dec(x_1);
 x_6 = l_Lean_Syntax_isMissing(x_5);
-if (x_2 == 0)
+switch (x_2) {
+case 0:
 {
 lean_object* x_42; 
 x_42 = l_Lean_instInhabitedParserDescr___closed__1;
 x_7 = x_42;
 goto block_41;
 }
-else
+case 1:
 {
 lean_object* x_43; 
 x_43 = l_Lean_Elab_instToFormatAttribute___closed__4;
 x_7 = x_43;
 goto block_41;
 }
+default: 
+{
+lean_object* x_44; 
+x_44 = l_Lean_Elab_instToFormatAttribute___closed__5;
+x_7 = x_44;
+goto block_41;
+}
+}
 block_41:
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
diff --git a/stage0/stdlib/Lean/Elab/Declaration.c b/stage0/stdlib/Lean/Elab/Declaration.c
index 434e448944..8788c0497c 100644
--- a/stage0/stdlib/Lean/Elab/Declaration.c
+++ b/stage0/stdlib/Lean/Elab/Declaration.c
@@ -30,7 +30,7 @@ extern lean_object* l_Lean_Elab_checkNotAlreadyDeclared___rarg___lambda__3___clo
 lean_object* l___regBuiltin_Lean_Elab_Command_expandMutualPreamble___closed__1;
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__4(lean_object*);
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVarsImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDecl___at_Lean_Elab_Term_declareTacticSyntax___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind;
@@ -100,7 +100,7 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Declaration_0__Lean
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__3(lean_object*);
 lean_object* l_List_map___at_Lean_resolveGlobalConst___spec__2(lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualElement_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames___rarg(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabMutual(lean_object*);
@@ -212,7 +212,7 @@ extern lean_object* l_Lean_Elab_Command_elabStructure___closed__3;
 lean_object* l_Lean_Elab_sortDeclLevelParams(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_isMutualInductive___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_elabMutual___closed__2;
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabAxiom_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___regBuiltin_Lean_Elab_Command_elabUniverses___closed__2;
@@ -274,7 +274,7 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____close
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l_Lean_MacroScopesView_review(lean_object*);
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributes(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributes(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_11836____closed__11;
 lean_object* l_Lean_Elab_Command_expandDeclNamespace_x3f___closed__4;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__5___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -308,7 +308,7 @@ lean_object* l_Lean_Elab_Modifiers_addAttribute(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Macro_expandMacro_x3fImp(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(uint8_t, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__6;
 lean_object* l_Lean_Elab_Command_expandMutualNamespace(lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__1;
@@ -338,7 +338,7 @@ lean_object* l_Lean_Meta_mkForallUsedOnly___at_Lean_Elab_Command_elabAxiom___spe
 lean_object* l_Lean_Elab_Command_elabDeclaration___closed__2;
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_9707____closed__20;
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandDeclNamespace_x3f___closed__5;
 lean_object* l___regBuiltin_Lean_Elab_Command_expandBuiltinInitialize___closed__3;
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1829,186 +1829,185 @@ return x_10;
 lean_object* l_Lean_Elab_Command_elabAxiom___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, 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, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-lean_object* x_16; uint8_t x_17; uint8_t x_18; lean_object* x_19; 
+lean_object* x_16; uint8_t x_17; lean_object* x_18; 
 x_16 = lean_ctor_get(x_1, 1);
 x_17 = 2;
-x_18 = 1;
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_9);
 lean_inc(x_2);
-x_19 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_17, x_18, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
-if (lean_obj_tag(x_19) == 0)
+x_18 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_17, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_20; lean_object* x_21; 
-x_20 = lean_ctor_get(x_19, 1);
-lean_inc(x_20);
-lean_dec(x_19);
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_ctor_get(x_18, 1);
+lean_inc(x_19);
+lean_dec(x_18);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_21 = l_Lean_Elab_Term_elabType(x_3, x_9, x_10, x_11, x_12, x_13, x_14, x_20);
-if (lean_obj_tag(x_21) == 0)
+x_20 = l_Lean_Elab_Term_elabType(x_3, x_9, x_10, x_11, x_12, x_13, x_14, x_19);
+if (lean_obj_tag(x_20) == 0)
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; 
-x_22 = lean_ctor_get(x_21, 0);
+lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; 
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = 0;
-x_25 = lean_box(0);
+lean_dec(x_20);
+x_23 = 0;
+x_24 = lean_box(0);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_26 = l_Lean_Elab_Term_synthesizeSyntheticMVars_loop(x_24, x_25, x_9, x_10, x_11, x_12, x_13, x_14, x_23);
-if (lean_obj_tag(x_26) == 0)
+x_25 = l_Lean_Elab_Term_synthesizeSyntheticMVars_loop(x_23, x_24, x_9, x_10, x_11, x_12, x_13, x_14, x_22);
+if (lean_obj_tag(x_25) == 0)
 {
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_26, 1);
-lean_inc(x_27);
-lean_dec(x_26);
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
-x_28 = l_Lean_Meta_instantiateMVarsImp(x_22, x_11, x_12, x_13, x_14, x_27);
-if (lean_obj_tag(x_28) == 0)
+x_27 = l_Lean_Meta_instantiateMVarsImp(x_21, x_11, x_12, x_13, x_14, x_26);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_28, 0);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_27, 0);
+lean_inc(x_28);
+x_29 = lean_ctor_get(x_27, 1);
 lean_inc(x_29);
-x_30 = lean_ctor_get(x_28, 1);
-lean_inc(x_30);
-lean_dec(x_28);
+lean_dec(x_27);
 lean_inc(x_11);
-x_31 = l_Lean_Meta_mkForallFVarsImp(x_8, x_29, x_11, x_12, x_13, x_14, x_30);
-if (lean_obj_tag(x_31) == 0)
+x_30 = l_Lean_Meta_mkForallFVarsImp(x_8, x_28, x_11, x_12, x_13, x_14, x_29);
+if (lean_obj_tag(x_30) == 0)
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_31, 0);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_30, 0);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_30, 1);
 lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec(x_31);
+lean_dec(x_30);
 lean_inc(x_11);
-x_34 = l_Lean_Meta_mkForallUsedOnlyImp(x_4, x_32, x_11, x_12, x_13, x_14, x_33);
-if (lean_obj_tag(x_34) == 0)
+x_33 = l_Lean_Meta_mkForallUsedOnlyImp(x_4, x_31, x_11, x_12, x_13, x_14, x_32);
+if (lean_obj_tag(x_33) == 0)
 {
-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; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_35 = lean_ctor_get(x_34, 0);
+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; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
+lean_dec(x_33);
+x_36 = lean_ctor_get(x_34, 0);
 lean_inc(x_36);
 lean_dec(x_34);
-x_37 = lean_ctor_get(x_35, 0);
-lean_inc(x_37);
-lean_dec(x_35);
-x_38 = lean_unsigned_to_nat(1u);
-x_39 = l_Lean_Elab_Term_levelMVarToParam(x_37, x_38, x_9, x_10, x_11, x_12, x_13, x_14, x_36);
-x_40 = lean_ctor_get(x_39, 0);
+x_37 = lean_unsigned_to_nat(1u);
+x_38 = l_Lean_Elab_Term_levelMVarToParam(x_36, x_37, x_9, x_10, x_11, x_12, x_13, x_14, x_35);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
+lean_dec(x_38);
+x_41 = lean_ctor_get(x_39, 0);
 lean_inc(x_41);
 lean_dec(x_39);
-x_42 = lean_ctor_get(x_40, 0);
-lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l_Lean_CollectLevelParams_instInhabitedState___closed__1;
-lean_inc(x_42);
-x_44 = l_Lean_CollectLevelParams_main(x_42, x_43);
-x_45 = lean_ctor_get(x_44, 2);
-lean_inc(x_45);
-lean_dec(x_44);
-x_46 = l_Lean_Elab_sortDeclLevelParams(x_5, x_6, x_45);
-if (lean_obj_tag(x_46) == 0)
+x_42 = l_Lean_CollectLevelParams_instInhabitedState___closed__1;
+lean_inc(x_41);
+x_43 = l_Lean_CollectLevelParams_main(x_41, x_42);
+x_44 = lean_ctor_get(x_43, 2);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = l_Lean_Elab_sortDeclLevelParams(x_5, x_6, x_44);
+if (lean_obj_tag(x_45) == 0)
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-lean_dec(x_42);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+lean_dec(x_41);
 lean_dec(x_2);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-lean_dec(x_46);
-x_48 = lean_alloc_ctor(2, 1, 0);
+x_46 = lean_ctor_get(x_45, 0);
+lean_inc(x_46);
+lean_dec(x_45);
+x_47 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_47, 0, x_46);
+x_48 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_48, 0, x_47);
-x_49 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-x_50 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__1___rarg(x_7, x_49, x_9, x_10, x_11, x_12, x_13, x_14, x_41);
+x_49 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__1___rarg(x_7, x_48, x_9, x_10, x_11, x_12, x_13, x_14, x_40);
 lean_dec(x_14);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-return x_50;
+return x_49;
 }
 else
 {
-lean_object* x_51; lean_object* x_52; uint8_t x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_51 = lean_ctor_get(x_46, 0);
-lean_inc(x_51);
-lean_dec(x_46);
+lean_object* x_50; lean_object* x_51; uint8_t x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_50 = lean_ctor_get(x_45, 0);
+lean_inc(x_50);
+lean_dec(x_45);
 lean_inc(x_2);
-x_52 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_52, 0, x_2);
-lean_ctor_set(x_52, 1, x_51);
-lean_ctor_set(x_52, 2, x_42);
-x_53 = lean_ctor_get_uint8(x_1, sizeof(void*)*2 + 3);
-x_54 = lean_alloc_ctor(0, 1, 1);
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set_uint8(x_54, sizeof(void*)*1, x_53);
-x_55 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_55, 0, x_54);
+x_51 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_51, 0, x_2);
+lean_ctor_set(x_51, 1, x_50);
+lean_ctor_set(x_51, 2, x_41);
+x_52 = lean_ctor_get_uint8(x_1, sizeof(void*)*2 + 3);
+x_53 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set_uint8(x_53, sizeof(void*)*1, x_52);
+x_54 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_54, 0, x_53);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_55);
-x_56 = l_Lean_Elab_Term_ensureNoUnassignedMVars(x_55, x_9, x_10, x_11, x_12, x_13, x_14, x_41);
-if (lean_obj_tag(x_56) == 0)
+lean_inc(x_54);
+x_55 = l_Lean_Elab_Term_ensureNoUnassignedMVars(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_40);
+if (lean_obj_tag(x_55) == 0)
 {
-lean_object* x_57; lean_object* x_58; 
-x_57 = lean_ctor_get(x_56, 1);
-lean_inc(x_57);
-lean_dec(x_56);
+lean_object* x_56; lean_object* x_57; 
+x_56 = lean_ctor_get(x_55, 1);
+lean_inc(x_56);
+lean_dec(x_55);
 lean_inc(x_13);
 lean_inc(x_9);
-x_58 = l_Lean_addDecl___at_Lean_Elab_Term_declareTacticSyntax___spec__1(x_55, x_9, x_10, x_11, x_12, x_13, x_14, x_57);
-lean_dec(x_55);
-if (lean_obj_tag(x_58) == 0)
+x_57 = l_Lean_addDecl___at_Lean_Elab_Term_declareTacticSyntax___spec__1(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_56);
+lean_dec(x_54);
+if (lean_obj_tag(x_57) == 0)
 {
-lean_object* x_59; uint8_t x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_58, 1);
-lean_inc(x_59);
-lean_dec(x_58);
-x_60 = 0;
+lean_object* x_58; uint8_t x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_57, 1);
+lean_inc(x_58);
+lean_dec(x_57);
+x_59 = 0;
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_9);
 lean_inc(x_2);
-x_61 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_60, x_18, x_9, x_10, x_11, x_12, x_13, x_14, x_59);
-if (lean_obj_tag(x_61) == 0)
+x_60 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_59, x_9, x_10, x_11, x_12, x_13, x_14, x_58);
+if (lean_obj_tag(x_60) == 0)
 {
-lean_object* x_62; uint8_t x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_61, 1);
-lean_inc(x_62);
-lean_dec(x_61);
-x_63 = 1;
-x_64 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_63, x_18, x_9, x_10, x_11, x_12, x_13, x_14, x_62);
+lean_object* x_61; uint8_t x_62; lean_object* x_63; 
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+lean_dec(x_60);
+x_62 = 1;
+x_63 = l_Lean_Elab_Term_applyAttributesAt(x_2, x_16, x_62, x_9, x_10, x_11, x_12, x_13, x_14, x_61);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-return x_64;
+return x_63;
 }
 else
 {
-uint8_t x_65; 
+uint8_t x_64; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2016,29 +2015,29 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_2);
-x_65 = !lean_is_exclusive(x_61);
-if (x_65 == 0)
+x_64 = !lean_is_exclusive(x_60);
+if (x_64 == 0)
 {
-return x_61;
+return x_60;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_61, 0);
-x_67 = lean_ctor_get(x_61, 1);
-lean_inc(x_67);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_60, 0);
+x_66 = lean_ctor_get(x_60, 1);
 lean_inc(x_66);
-lean_dec(x_61);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+lean_inc(x_65);
+lean_dec(x_60);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
 }
 }
 }
 else
 {
-uint8_t x_69; 
+uint8_t x_68; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2046,30 +2045,30 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_2);
-x_69 = !lean_is_exclusive(x_58);
-if (x_69 == 0)
+x_68 = !lean_is_exclusive(x_57);
+if (x_68 == 0)
 {
-return x_58;
+return x_57;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_58, 0);
-x_71 = lean_ctor_get(x_58, 1);
-lean_inc(x_71);
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_57, 0);
+x_70 = lean_ctor_get(x_57, 1);
 lean_inc(x_70);
-lean_dec(x_58);
-x_72 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_72, 0, x_70);
-lean_ctor_set(x_72, 1, x_71);
-return x_72;
+lean_inc(x_69);
+lean_dec(x_57);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
 }
 }
 }
 else
 {
-uint8_t x_73; 
-lean_dec(x_55);
+uint8_t x_72; 
+lean_dec(x_54);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2077,30 +2076,30 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_2);
-x_73 = !lean_is_exclusive(x_56);
-if (x_73 == 0)
+x_72 = !lean_is_exclusive(x_55);
+if (x_72 == 0)
 {
-return x_56;
+return x_55;
 }
 else
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_56, 0);
-x_75 = lean_ctor_get(x_56, 1);
-lean_inc(x_75);
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_55, 0);
+x_74 = lean_ctor_get(x_55, 1);
 lean_inc(x_74);
-lean_dec(x_56);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
+lean_inc(x_73);
+lean_dec(x_55);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
 }
 }
 }
 else
 {
-uint8_t x_77; 
+uint8_t x_76; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2110,29 +2109,29 @@ lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_2);
-x_77 = !lean_is_exclusive(x_34);
-if (x_77 == 0)
+x_76 = !lean_is_exclusive(x_33);
+if (x_76 == 0)
 {
-return x_34;
+return x_33;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_34, 0);
-x_79 = lean_ctor_get(x_34, 1);
-lean_inc(x_79);
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_77 = lean_ctor_get(x_33, 0);
+x_78 = lean_ctor_get(x_33, 1);
 lean_inc(x_78);
-lean_dec(x_34);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
-return x_80;
+lean_inc(x_77);
+lean_dec(x_33);
+x_79 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_79, 0, x_77);
+lean_ctor_set(x_79, 1, x_78);
+return x_79;
 }
 }
 }
 else
 {
-uint8_t x_81; 
+uint8_t x_80; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2143,29 +2142,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_81 = !lean_is_exclusive(x_31);
-if (x_81 == 0)
+x_80 = !lean_is_exclusive(x_30);
+if (x_80 == 0)
 {
-return x_31;
+return x_30;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_31, 0);
-x_83 = lean_ctor_get(x_31, 1);
-lean_inc(x_83);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_30, 0);
+x_82 = lean_ctor_get(x_30, 1);
 lean_inc(x_82);
-lean_dec(x_31);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
+lean_inc(x_81);
+lean_dec(x_30);
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
 else
 {
-uint8_t x_85; 
+uint8_t x_84; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2177,98 +2176,98 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_85 = !lean_is_exclusive(x_28);
-if (x_85 == 0)
+x_84 = !lean_is_exclusive(x_27);
+if (x_84 == 0)
 {
-return x_28;
+return x_27;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_28, 0);
-x_87 = lean_ctor_get(x_28, 1);
-lean_inc(x_87);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_85 = lean_ctor_get(x_27, 0);
+x_86 = lean_ctor_get(x_27, 1);
 lean_inc(x_86);
-lean_dec(x_28);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_86);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
+lean_inc(x_85);
+lean_dec(x_27);
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_85);
+lean_ctor_set(x_87, 1, x_86);
+return x_87;
 }
 }
 }
 else
 {
-uint8_t x_89; 
-lean_dec(x_22);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-x_89 = !lean_is_exclusive(x_26);
-if (x_89 == 0)
-{
-return x_26;
-}
-else
-{
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_26, 0);
-x_91 = lean_ctor_get(x_26, 1);
-lean_inc(x_91);
-lean_inc(x_90);
-lean_dec(x_26);
-x_92 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-return x_92;
-}
-}
-}
-else
-{
-uint8_t x_93; 
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-x_93 = !lean_is_exclusive(x_21);
-if (x_93 == 0)
-{
-return x_21;
-}
-else
-{
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_21, 0);
-x_95 = lean_ctor_get(x_21, 1);
-lean_inc(x_95);
-lean_inc(x_94);
+uint8_t x_88; 
 lean_dec(x_21);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_88 = !lean_is_exclusive(x_25);
+if (x_88 == 0)
+{
+return x_25;
+}
+else
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_25, 0);
+x_90 = lean_ctor_get(x_25, 1);
+lean_inc(x_90);
+lean_inc(x_89);
+lean_dec(x_25);
+x_91 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_91, 0, x_89);
+lean_ctor_set(x_91, 1, x_90);
+return x_91;
 }
 }
 }
 else
 {
-uint8_t x_97; 
+uint8_t x_92; 
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_92 = !lean_is_exclusive(x_20);
+if (x_92 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+x_93 = lean_ctor_get(x_20, 0);
+x_94 = lean_ctor_get(x_20, 1);
+lean_inc(x_94);
+lean_inc(x_93);
+lean_dec(x_20);
+x_95 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_95, 0, x_93);
+lean_ctor_set(x_95, 1, x_94);
+return x_95;
+}
+}
+}
+else
+{
+uint8_t x_96; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -2281,23 +2280,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_97 = !lean_is_exclusive(x_19);
-if (x_97 == 0)
+x_96 = !lean_is_exclusive(x_18);
+if (x_96 == 0)
 {
-return x_19;
+return x_18;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_19, 0);
-x_99 = lean_ctor_get(x_19, 1);
-lean_inc(x_99);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_18, 0);
+x_98 = lean_ctor_get(x_18, 1);
 lean_inc(x_98);
-lean_dec(x_19);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-return x_100;
+lean_inc(x_97);
+lean_dec(x_18);
+x_99 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_99, 0, x_97);
+lean_ctor_set(x_99, 1, x_98);
+return x_99;
 }
 }
 }
@@ -6939,110 +6938,108 @@ return x_53;
 }
 }
 }
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1(lean_object* x_1, uint8_t 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, lean_object* x_9, lean_object* x_10) {
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___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, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_11; 
-x_11 = l_Lean_Elab_Term_applyAttributes(x_3, x_1, x_2, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_11;
+lean_object* x_10; 
+x_10 = l_Lean_Elab_Term_applyAttributes(x_2, x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_10;
 }
 }
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(uint8_t x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-uint8_t x_10; 
-x_10 = x_5 < x_4;
-if (x_10 == 0)
+uint8_t x_9; 
+x_9 = x_4 < x_3;
+if (x_9 == 0)
 {
-lean_object* x_11; 
-lean_dec(x_2);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_6);
-lean_ctor_set(x_11, 1, x_9);
-return x_11;
+lean_object* x_10; 
+lean_dec(x_1);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_5);
+lean_ctor_set(x_10, 1, x_8);
+return x_10;
 }
 else
 {
-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; 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_dec(x_6);
-x_12 = lean_array_uget(x_3, x_5);
-x_13 = lean_box(0);
-x_14 = l_Lean_Syntax_getId(x_12);
-x_15 = lean_alloc_closure((void*)(l_Lean_resolveGlobalConstNoOverload___at_Lean_Elab_Command_elabAttr___spec__1___boxed), 8, 1);
-lean_closure_set(x_15, 0, x_14);
-x_16 = lean_box(x_1);
-lean_inc(x_2);
-x_17 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1___boxed), 10, 2);
-lean_closure_set(x_17, 0, x_2);
-lean_closure_set(x_17, 1, x_16);
-x_18 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg), 9, 2);
-lean_closure_set(x_18, 0, x_15);
-lean_closure_set(x_18, 1, x_17);
-x_19 = l_Lean_Elab_Command_getRef(x_7, x_8, x_9);
-x_20 = lean_ctor_get(x_19, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 1);
-lean_inc(x_21);
-lean_dec(x_19);
-x_22 = l_Lean_replaceRef(x_12, x_20);
-lean_dec(x_20);
-lean_dec(x_12);
-x_23 = lean_ctor_get(x_7, 0);
-x_24 = lean_ctor_get(x_7, 1);
-x_25 = lean_ctor_get(x_7, 2);
-x_26 = lean_ctor_get(x_7, 3);
-x_27 = lean_ctor_get(x_7, 4);
-x_28 = lean_ctor_get(x_7, 5);
-lean_inc(x_28);
-lean_inc(x_27);
+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; 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_dec(x_5);
+x_11 = lean_array_uget(x_2, x_4);
+x_12 = lean_box(0);
+x_13 = l_Lean_Syntax_getId(x_11);
+x_14 = lean_alloc_closure((void*)(l_Lean_resolveGlobalConstNoOverload___at_Lean_Elab_Command_elabAttr___spec__1___boxed), 8, 1);
+lean_closure_set(x_14, 0, x_13);
+lean_inc(x_1);
+x_15 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1___boxed), 9, 1);
+lean_closure_set(x_15, 0, x_1);
+x_16 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg), 9, 2);
+lean_closure_set(x_16, 0, x_14);
+lean_closure_set(x_16, 1, x_15);
+x_17 = l_Lean_Elab_Command_getRef(x_6, x_7, x_8);
+x_18 = lean_ctor_get(x_17, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_17, 1);
+lean_inc(x_19);
+lean_dec(x_17);
+x_20 = l_Lean_replaceRef(x_11, x_18);
+lean_dec(x_18);
+lean_dec(x_11);
+x_21 = lean_ctor_get(x_6, 0);
+x_22 = lean_ctor_get(x_6, 1);
+x_23 = lean_ctor_get(x_6, 2);
+x_24 = lean_ctor_get(x_6, 3);
+x_25 = lean_ctor_get(x_6, 4);
+x_26 = lean_ctor_get(x_6, 5);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
-x_29 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_29, 0, x_23);
-lean_ctor_set(x_29, 1, x_24);
-lean_ctor_set(x_29, 2, x_25);
-lean_ctor_set(x_29, 3, x_26);
-lean_ctor_set(x_29, 4, x_27);
-lean_ctor_set(x_29, 5, x_28);
-lean_ctor_set(x_29, 6, x_22);
-x_30 = l_Lean_Elab_Command_liftTermElabM___rarg(x_13, x_18, x_29, x_8, x_21);
-if (lean_obj_tag(x_30) == 0)
+lean_inc(x_22);
+lean_inc(x_21);
+x_27 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_27, 0, x_21);
+lean_ctor_set(x_27, 1, x_22);
+lean_ctor_set(x_27, 2, x_23);
+lean_ctor_set(x_27, 3, x_24);
+lean_ctor_set(x_27, 4, x_25);
+lean_ctor_set(x_27, 5, x_26);
+lean_ctor_set(x_27, 6, x_20);
+x_28 = l_Lean_Elab_Command_liftTermElabM___rarg(x_12, x_16, x_27, x_7, x_19);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_31; size_t x_32; size_t x_33; lean_object* x_34; 
-x_31 = lean_ctor_get(x_30, 1);
-lean_inc(x_31);
-lean_dec(x_30);
-x_32 = 1;
-x_33 = x_5 + x_32;
-x_34 = lean_box(0);
-x_5 = x_33;
-x_6 = x_34;
-x_9 = x_31;
+lean_object* x_29; size_t x_30; size_t x_31; lean_object* x_32; 
+x_29 = lean_ctor_get(x_28, 1);
+lean_inc(x_29);
+lean_dec(x_28);
+x_30 = 1;
+x_31 = x_4 + x_30;
+x_32 = lean_box(0);
+x_4 = x_31;
+x_5 = x_32;
+x_8 = x_29;
 goto _start;
 }
 else
 {
-uint8_t x_36; 
-lean_dec(x_2);
-x_36 = !lean_is_exclusive(x_30);
-if (x_36 == 0)
+uint8_t x_34; 
+lean_dec(x_1);
+x_34 = !lean_is_exclusive(x_28);
+if (x_34 == 0)
 {
-return x_30;
+return x_28;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_30, 0);
-x_38 = lean_ctor_get(x_30, 1);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_30);
-x_39 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_39, 0, x_37);
-lean_ctor_set(x_39, 1, x_38);
-return x_39;
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_28, 0);
+x_36 = lean_ctor_get(x_28, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_28);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_35);
+lean_ctor_set(x_37, 1, x_36);
+return x_37;
 }
 }
 }
@@ -7051,102 +7048,98 @@ return x_39;
 lean_object* l_Lean_Elab_Command_elabAttr(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = lean_unsigned_to_nat(0u);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(2u);
 x_6 = l_Lean_Syntax_getArg(x_1, x_5);
-x_7 = l_Lean_Syntax_isNone(x_6);
-lean_dec(x_6);
-x_8 = lean_unsigned_to_nat(3u);
-x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 lean_inc(x_2);
-x_10 = l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3(x_9, x_2, x_3, x_4);
-lean_dec(x_9);
-if (lean_obj_tag(x_10) == 0)
+x_7 = l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3(x_6, x_2, x_3, x_4);
+lean_dec(x_6);
+if (lean_obj_tag(x_7) == 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; size_t x_17; size_t x_18; lean_object* x_19; lean_object* x_20; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = lean_unsigned_to_nat(5u);
-x_14 = l_Lean_Syntax_getArg(x_1, x_13);
-x_15 = l_Lean_Syntax_getArgs(x_14);
-lean_dec(x_14);
-x_16 = lean_array_get_size(x_15);
-x_17 = lean_usize_of_nat(x_16);
-lean_dec(x_16);
-x_18 = 0;
-x_19 = lean_box(0);
-x_20 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(x_7, x_11, x_15, x_17, x_18, x_19, x_2, x_3, x_12);
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_unsigned_to_nat(4u);
+x_11 = l_Lean_Syntax_getArg(x_1, x_10);
+x_12 = l_Lean_Syntax_getArgs(x_11);
+lean_dec(x_11);
+x_13 = lean_array_get_size(x_12);
+x_14 = lean_usize_of_nat(x_13);
+lean_dec(x_13);
+x_15 = 0;
+x_16 = lean_box(0);
+x_17 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(x_8, x_12, x_14, x_15, x_16, x_2, x_3, x_9);
 lean_dec(x_2);
-lean_dec(x_15);
-if (lean_obj_tag(x_20) == 0)
+lean_dec(x_12);
+if (lean_obj_tag(x_17) == 0)
 {
-uint8_t x_21; 
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_17);
+if (x_18 == 0)
 {
-return x_20;
+return x_17;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_20, 0);
-x_23 = lean_ctor_get(x_20, 1);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_17, 0);
+x_20 = lean_ctor_get(x_17, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_17);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+return x_21;
+}
+}
+else
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_17);
+if (x_22 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_17, 0);
+x_24 = lean_ctor_get(x_17, 1);
+lean_inc(x_24);
 lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_20);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
-}
-}
-else
-{
-uint8_t x_25; 
-x_25 = !lean_is_exclusive(x_20);
-if (x_25 == 0)
-{
-return x_20;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_20, 0);
-x_27 = lean_ctor_get(x_20, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_20);
-x_28 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_28, 0, x_26);
-lean_ctor_set(x_28, 1, x_27);
-return x_28;
+lean_dec(x_17);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
 }
 }
 }
 else
 {
-uint8_t x_29; 
+uint8_t x_26; 
 lean_dec(x_2);
-x_29 = !lean_is_exclusive(x_10);
-if (x_29 == 0)
+x_26 = !lean_is_exclusive(x_7);
+if (x_26 == 0)
 {
-return x_10;
+return x_7;
 }
 else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_30 = lean_ctor_get(x_10, 0);
-x_31 = lean_ctor_get(x_10, 1);
-lean_inc(x_31);
-lean_inc(x_30);
-lean_dec(x_10);
-x_32 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_32, 0, x_30);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_7, 0);
+x_28 = lean_ctor_get(x_7, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_7);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
 }
 }
 }
@@ -7203,35 +7196,31 @@ lean_dec(x_3);
 return x_9;
 }
 }
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___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, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___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, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-uint8_t x_11; lean_object* x_12; 
-x_11 = lean_unbox(x_2);
-lean_dec(x_2);
-x_12 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1(x_1, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_7);
+lean_object* x_10; 
+x_10 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_6);
 lean_dec(x_5);
+lean_dec(x_4);
 lean_dec(x_1);
-return x_12;
+return x_10;
 }
 }
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___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, lean_object* x_8, lean_object* x_9) {
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4___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, lean_object* x_8) {
 _start:
 {
-uint8_t x_10; size_t x_11; size_t x_12; lean_object* x_13; 
-x_10 = lean_unbox(x_1);
-lean_dec(x_1);
-x_11 = lean_unbox_usize(x_4);
-lean_dec(x_4);
-x_12 = lean_unbox_usize(x_5);
-lean_dec(x_5);
-x_13 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(x_10, x_2, x_3, x_11, x_12, x_6, x_7, x_8, x_9);
-lean_dec(x_8);
-lean_dec(x_7);
+size_t x_9; size_t x_10; lean_object* x_11; 
+x_9 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-return x_13;
+x_10 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_11 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__4(x_1, x_2, x_9, x_10, x_5, x_6, x_7, x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_2);
+return x_11;
 }
 }
 lean_object* l_Lean_Elab_Command_elabAttr___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
diff --git a/stage0/stdlib/Lean/Elab/Inductive.c b/stage0/stdlib/Lean/Elab/Inductive.c
index f115d03715..62f7bc86ab 100644
--- a/stage0/stdlib/Lean/Elab/Inductive.c
+++ b/stage0/stdlib/Lean/Elab/Inductive.c
@@ -117,7 +117,7 @@ lean_object* l_Lean_Elab_Command_accLevelAtCtor___closed__1;
 lean_object* l_List_mapM___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_levelMVarToParamAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_elabCtors___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
 lean_object* l_List_map___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_applyInferMod___spec__1___closed__1;
@@ -15351,7 +15351,7 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; uint8_t x_19; lean_object* x_20; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; 
 lean_dec(x_4);
 x_14 = lean_array_uget(x_1, x_3);
 x_15 = lean_ctor_get(x_14, 3);
@@ -15363,49 +15363,48 @@ x_17 = lean_ctor_get(x_16, 1);
 lean_inc(x_17);
 lean_dec(x_16);
 x_18 = 0;
-x_19 = 1;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_5);
-x_20 = l_Lean_Elab_Term_applyAttributesAt(x_15, x_17, x_18, x_19, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_19 = l_Lean_Elab_Term_applyAttributesAt(x_15, x_17, x_18, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_17);
-if (lean_obj_tag(x_20) == 0)
+if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_21; size_t x_22; size_t x_23; lean_object* x_24; 
-x_21 = lean_ctor_get(x_20, 1);
-lean_inc(x_21);
-lean_dec(x_20);
-x_22 = 1;
-x_23 = x_3 + x_22;
-x_24 = lean_box(0);
-x_3 = x_23;
-x_4 = x_24;
-x_11 = x_21;
+lean_object* x_20; size_t x_21; size_t x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = 1;
+x_22 = x_3 + x_21;
+x_23 = lean_box(0);
+x_3 = x_22;
+x_4 = x_23;
+x_11 = x_20;
 goto _start;
 }
 else
 {
-uint8_t x_26; 
+uint8_t x_25; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_26 = !lean_is_exclusive(x_20);
-if (x_26 == 0)
+x_25 = !lean_is_exclusive(x_19);
+if (x_25 == 0)
 {
-return x_20;
+return x_19;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_20, 0);
-x_28 = lean_ctor_get(x_20, 1);
-lean_inc(x_28);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_19, 0);
+x_27 = lean_ctor_get(x_19, 1);
 lean_inc(x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
+lean_inc(x_26);
+lean_dec(x_19);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/LetRec.c b/stage0/stdlib/Lean/Elab/LetRec.c
index 29ecf9df5b..ef141a4f2b 100644
--- a/stage0/stdlib/Lean/Elab/LetRec.c
+++ b/stage0/stdlib/Lean/Elab/LetRec.c
@@ -49,7 +49,7 @@ extern lean_object* l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___close
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView_match__1___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__3___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -165,6 +165,7 @@ lean_object* l_Lean_Elab_elabDeclAttrs___at___private_Lean_Elab_LetRec_0__Lean_E
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__1___closed__3;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Elab_toAttributeKind(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_CheckAssignment_checkFVar___closed__1;
 extern lean_object* l_Lean_Meta_CheckAssignment_checkFVar___closed__2;
@@ -559,128 +560,111 @@ return x_27;
 lean_object* l_Lean_Elab_elabAttr___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__7(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_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_9 = lean_unsigned_to_nat(0u);
 x_10 = l_Lean_Syntax_getArg(x_1, x_9);
-x_11 = l_Lean_Syntax_isNone(x_10);
+x_11 = l_Lean_Elab_toAttributeKind(x_10);
 lean_dec(x_10);
 x_12 = lean_unsigned_to_nat(1u);
 x_13 = l_Lean_Syntax_getArg(x_1, x_12);
 x_14 = l_Lean_Syntax_isIdOrAtom_x3f(x_13);
-if (x_11 == 0)
-{
-uint8_t x_44; 
-x_44 = 1;
-x_15 = x_44;
-goto block_43;
-}
-else
-{
-uint8_t x_45; 
-x_45 = 0;
-x_15 = x_45;
-goto block_43;
-}
-block_43:
-{
 if (lean_obj_tag(x_14) == 0)
 {
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_6);
-if (x_16 == 0)
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_6);
+if (x_15 == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_17 = lean_ctor_get(x_6, 3);
-x_18 = l_Lean_replaceRef(x_13, x_17);
-lean_dec(x_17);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_16 = lean_ctor_get(x_6, 3);
+x_17 = l_Lean_replaceRef(x_13, x_16);
+lean_dec(x_16);
 lean_dec(x_13);
-lean_ctor_set(x_6, 3, x_18);
-x_19 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_20 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_19, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_ctor_set(x_6, 3, x_17);
+x_18 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_19 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_18, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
 {
-return x_20;
+return x_19;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_20, 0);
-x_23 = lean_ctor_get(x_20, 1);
-lean_inc(x_23);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_19, 0);
+x_22 = lean_ctor_get(x_19, 1);
 lean_inc(x_22);
-lean_dec(x_20);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
+lean_inc(x_21);
+lean_dec(x_19);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
 }
 }
 else
 {
-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; lean_object* x_37; lean_object* x_38; 
-x_25 = lean_ctor_get(x_6, 0);
-x_26 = lean_ctor_get(x_6, 1);
-x_27 = lean_ctor_get(x_6, 2);
-x_28 = lean_ctor_get(x_6, 3);
-x_29 = lean_ctor_get(x_6, 4);
-x_30 = lean_ctor_get(x_6, 5);
-lean_inc(x_30);
+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; lean_object* x_37; 
+x_24 = lean_ctor_get(x_6, 0);
+x_25 = lean_ctor_get(x_6, 1);
+x_26 = lean_ctor_get(x_6, 2);
+x_27 = lean_ctor_get(x_6, 3);
+x_28 = lean_ctor_get(x_6, 4);
+x_29 = lean_ctor_get(x_6, 5);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
+lean_inc(x_24);
 lean_dec(x_6);
-x_31 = l_Lean_replaceRef(x_13, x_28);
-lean_dec(x_28);
+x_30 = l_Lean_replaceRef(x_13, x_27);
+lean_dec(x_27);
 lean_dec(x_13);
-x_32 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_32, 0, x_25);
-lean_ctor_set(x_32, 1, x_26);
-lean_ctor_set(x_32, 2, x_27);
-lean_ctor_set(x_32, 3, x_31);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-x_33 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_34 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_33, x_2, x_3, x_4, x_5, x_32, x_7, x_8);
-lean_dec(x_32);
-x_35 = lean_ctor_get(x_34, 0);
+x_31 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_31, 0, x_24);
+lean_ctor_set(x_31, 1, x_25);
+lean_ctor_set(x_31, 2, x_26);
+lean_ctor_set(x_31, 3, x_30);
+lean_ctor_set(x_31, 4, x_28);
+lean_ctor_set(x_31, 5, x_29);
+x_32 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_33 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_32, x_2, x_3, x_4, x_5, x_31, x_7, x_8);
+lean_dec(x_31);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
-lean_inc(x_36);
-if (lean_is_exclusive(x_34)) {
- lean_ctor_release(x_34, 0);
- lean_ctor_release(x_34, 1);
- x_37 = x_34;
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_36 = x_33;
 } else {
- lean_dec_ref(x_34);
- x_37 = lean_box(0);
+ lean_dec_ref(x_33);
+ x_36 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_36)) {
+ x_37 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_37 = x_36;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_37, 0, x_34);
+lean_ctor_set(x_37, 1, x_35);
+return x_37;
 }
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_13);
-x_39 = lean_ctor_get(x_14, 0);
-lean_inc(x_39);
+x_38 = lean_ctor_get(x_14, 0);
+lean_inc(x_38);
 lean_dec(x_14);
-x_40 = lean_box(0);
-x_41 = lean_name_mk_string(x_40, x_39);
-x_42 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__7___lambda__3(x_1, x_15, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_39 = lean_box(0);
+x_40 = lean_name_mk_string(x_39, x_38);
+x_41 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__7___lambda__3(x_1, x_11, x_40, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-return x_42;
-}
+return x_41;
 }
 }
 }
@@ -1038,13 +1022,13 @@ lean_inc(x_13);
 x_17 = l_Lean_Syntax_isOfKind(x_13, x_16);
 if (x_17 == 0)
 {
-lean_object* x_109; uint8_t x_110; 
-x_109 = l_Lean_Elab_Term_elabLetDeclCore___closed__4;
+lean_object* x_108; uint8_t x_109; 
+x_108 = l_Lean_Elab_Term_elabLetDeclCore___closed__4;
 lean_inc(x_13);
-x_110 = l_Lean_Syntax_isOfKind(x_13, x_109);
-if (x_110 == 0)
+x_109 = l_Lean_Syntax_isOfKind(x_13, x_108);
+if (x_109 == 0)
 {
-lean_object* x_111; 
+lean_object* x_110; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -1053,25 +1037,25 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_111 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__4___rarg(x_9);
-return x_111;
+x_110 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__4___rarg(x_9);
+return x_110;
+}
+else
+{
+lean_object* x_111; 
+x_111 = lean_box(0);
+x_18 = x_111;
+goto block_107;
+}
 }
 else
 {
 lean_object* x_112; 
 x_112 = lean_box(0);
 x_18 = x_112;
-goto block_108;
+goto block_107;
 }
-}
-else
-{
-lean_object* x_113; 
-x_113 = lean_box(0);
-x_18 = x_113;
-goto block_108;
-}
-block_108:
+block_107:
 {
 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_dec(x_18);
@@ -1086,21 +1070,21 @@ lean_inc(x_23);
 lean_dec(x_21);
 if (lean_obj_tag(x_22) == 0)
 {
-lean_object* x_106; 
-x_106 = lean_box(0);
-x_24 = x_106;
-goto block_105;
+lean_object* x_105; 
+x_105 = lean_box(0);
+x_24 = x_105;
+goto block_104;
 }
 else
 {
-lean_object* x_107; 
-x_107 = lean_ctor_get(x_22, 0);
-lean_inc(x_107);
+lean_object* x_106; 
+x_106 = lean_ctor_get(x_22, 0);
+lean_inc(x_106);
 lean_dec(x_22);
-x_24 = x_107;
-goto block_105;
+x_24 = x_106;
+goto block_104;
 }
-block_105:
+block_104:
 {
 lean_object* x_25; lean_object* x_26; 
 lean_inc(x_20);
@@ -1111,196 +1095,195 @@ lean_inc(x_25);
 x_26 = l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__1(x_25, x_3, x_4, x_5, x_6, x_7, x_8, x_23);
 if (lean_obj_tag(x_26) == 0)
 {
-lean_object* x_27; uint8_t x_28; uint8_t x_29; lean_object* x_30; 
+lean_object* x_27; uint8_t x_28; lean_object* x_29; 
 x_27 = lean_ctor_get(x_26, 1);
 lean_inc(x_27);
 lean_dec(x_26);
 x_28 = 2;
-x_29 = 1;
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_3);
 lean_inc(x_25);
-x_30 = l_Lean_Elab_Term_applyAttributesAt(x_25, x_2, x_28, x_29, x_3, x_4, x_5, x_6, x_7, x_8, x_27);
-if (lean_obj_tag(x_30) == 0)
+x_29 = l_Lean_Elab_Term_applyAttributesAt(x_25, x_2, x_28, x_3, x_4, x_5, x_6, x_7, x_8, x_27);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; 
-x_31 = lean_ctor_get(x_30, 1);
-lean_inc(x_31);
-lean_dec(x_30);
-x_32 = l_Lean_Syntax_getArg(x_13, x_10);
-x_33 = l_Lean_Syntax_getArgs(x_32);
-lean_dec(x_32);
-x_34 = lean_unsigned_to_nat(2u);
-x_35 = l_Lean_Syntax_getArg(x_13, x_34);
-x_36 = l_Lean_Elab_Term_expandOptType(x_13, x_35);
-lean_dec(x_35);
-x_37 = lean_alloc_closure((void*)(l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__1), 9, 1);
-lean_closure_set(x_37, 0, x_36);
-x_38 = 0;
+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; uint8_t x_37; lean_object* x_38; 
+x_30 = lean_ctor_get(x_29, 1);
+lean_inc(x_30);
+lean_dec(x_29);
+x_31 = l_Lean_Syntax_getArg(x_13, x_10);
+x_32 = l_Lean_Syntax_getArgs(x_31);
+lean_dec(x_31);
+x_33 = lean_unsigned_to_nat(2u);
+x_34 = l_Lean_Syntax_getArg(x_13, x_33);
+x_35 = l_Lean_Elab_Term_expandOptType(x_13, x_34);
+lean_dec(x_34);
+x_36 = lean_alloc_closure((void*)(l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__1), 9, 1);
+lean_closure_set(x_36, 0, x_35);
+x_37 = 0;
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_39 = l_Lean_Elab_Term_elabBinders___rarg(x_33, x_37, x_38, x_3, x_4, x_5, x_6, x_7, x_8, x_31);
-if (lean_obj_tag(x_39) == 0)
+x_38 = l_Lean_Elab_Term_elabBinders___rarg(x_32, x_36, x_37, x_3, x_4, x_5, x_6, x_7, x_8, x_30);
+if (lean_obj_tag(x_38) == 0)
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; uint8_t x_45; lean_object* x_46; lean_object* x_47; 
-x_40 = lean_ctor_get(x_39, 0);
+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_45; lean_object* x_46; 
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
+lean_dec(x_38);
+x_41 = lean_ctor_get(x_39, 0);
 lean_inc(x_41);
+x_42 = lean_ctor_get(x_39, 1);
+lean_inc(x_42);
 lean_dec(x_39);
-x_42 = lean_ctor_get(x_40, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_40, 1);
-lean_inc(x_43);
-lean_dec(x_40);
-lean_inc(x_42);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_42);
-x_45 = 2;
-x_46 = lean_box(0);
+lean_inc(x_41);
+x_43 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_43, 0, x_41);
+x_44 = 2;
+x_45 = lean_box(0);
 lean_inc(x_5);
-x_47 = l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(x_44, x_45, x_46, x_5, x_6, x_7, x_8, x_41);
+x_46 = l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(x_43, x_44, x_45, x_5, x_6, x_7, x_8, x_40);
 if (x_17 == 0)
 {
-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; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 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; uint8_t x_76; 
-x_48 = lean_ctor_get(x_47, 0);
+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; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 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; uint8_t x_75; 
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
 lean_inc(x_48);
-x_49 = lean_ctor_get(x_47, 1);
-lean_inc(x_49);
-lean_dec(x_47);
-x_50 = lean_unsigned_to_nat(3u);
-x_51 = l_Lean_Syntax_getArg(x_13, x_50);
-x_52 = lean_st_ref_get(x_8, x_49);
-x_53 = lean_ctor_get(x_52, 0);
+lean_dec(x_46);
+x_49 = lean_unsigned_to_nat(3u);
+x_50 = l_Lean_Syntax_getArg(x_13, x_49);
+x_51 = lean_st_ref_get(x_8, x_48);
+x_52 = lean_ctor_get(x_51, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_51, 1);
 lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
+lean_dec(x_51);
+x_54 = lean_ctor_get(x_52, 0);
 lean_inc(x_54);
 lean_dec(x_52);
-x_55 = lean_ctor_get(x_53, 0);
+x_55 = lean_ctor_get(x_7, 3);
 lean_inc(x_55);
-lean_dec(x_53);
-x_56 = lean_ctor_get(x_7, 3);
-lean_inc(x_56);
-x_57 = l_Lean_Elab_Term_getCurrMacroScope(x_3, x_4, x_5, x_6, x_7, x_8, x_54);
-x_58 = lean_ctor_get(x_57, 0);
+x_56 = l_Lean_Elab_Term_getCurrMacroScope(x_3, x_4, x_5, x_6, x_7, x_8, x_53);
+x_57 = lean_ctor_get(x_56, 0);
+lean_inc(x_57);
+x_58 = lean_ctor_get(x_56, 1);
 lean_inc(x_58);
-x_59 = lean_ctor_get(x_57, 1);
+lean_dec(x_56);
+x_59 = lean_ctor_get(x_7, 1);
 lean_inc(x_59);
-lean_dec(x_57);
-x_60 = lean_ctor_get(x_7, 1);
+x_60 = lean_ctor_get(x_7, 2);
 lean_inc(x_60);
-x_61 = lean_ctor_get(x_7, 2);
-lean_inc(x_61);
-x_62 = lean_st_ref_get(x_8, x_59);
-x_63 = lean_ctor_get(x_62, 0);
+x_61 = lean_st_ref_get(x_8, x_58);
+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_64 = lean_ctor_get(x_62, 1);
 lean_inc(x_64);
 lean_dec(x_62);
-x_65 = lean_ctor_get(x_63, 1);
-lean_inc(x_65);
-lean_dec(x_63);
-lean_inc(x_55);
-x_66 = lean_alloc_closure((void*)(l___private_Lean_Elab_Util_0__Lean_Elab_expandMacro_x3f___boxed), 4, 1);
-lean_closure_set(x_66, 0, x_55);
-x_67 = x_66;
-x_68 = lean_environment_main_module(x_55);
-x_69 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_69, 0, x_67);
-lean_ctor_set(x_69, 1, x_68);
-lean_ctor_set(x_69, 2, x_58);
-lean_ctor_set(x_69, 3, x_60);
-lean_ctor_set(x_69, 4, x_61);
-lean_ctor_set(x_69, 5, x_56);
-x_70 = l_Lean_Elab_Term_expandMatchAltsIntoMatch(x_13, x_51, x_38, x_69, x_65);
-x_71 = lean_ctor_get(x_70, 0);
+lean_inc(x_54);
+x_65 = lean_alloc_closure((void*)(l___private_Lean_Elab_Util_0__Lean_Elab_expandMacro_x3f___boxed), 4, 1);
+lean_closure_set(x_65, 0, x_54);
+x_66 = x_65;
+x_67 = lean_environment_main_module(x_54);
+x_68 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+lean_ctor_set(x_68, 2, x_57);
+lean_ctor_set(x_68, 3, x_59);
+lean_ctor_set(x_68, 4, x_60);
+lean_ctor_set(x_68, 5, x_55);
+x_69 = l_Lean_Elab_Term_expandMatchAltsIntoMatch(x_13, x_50, x_37, x_68, x_64);
+x_70 = lean_ctor_get(x_69, 0);
+lean_inc(x_70);
+x_71 = lean_ctor_get(x_69, 1);
 lean_inc(x_71);
-x_72 = lean_ctor_get(x_70, 1);
-lean_inc(x_72);
-lean_dec(x_70);
-x_73 = lean_st_ref_take(x_8, x_64);
-x_74 = lean_ctor_get(x_73, 0);
+lean_dec(x_69);
+x_72 = lean_st_ref_take(x_8, x_63);
+x_73 = lean_ctor_get(x_72, 0);
+lean_inc(x_73);
+x_74 = lean_ctor_get(x_72, 1);
 lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
-lean_inc(x_75);
-lean_dec(x_73);
-x_76 = !lean_is_exclusive(x_74);
-if (x_76 == 0)
+lean_dec(x_72);
+x_75 = !lean_is_exclusive(x_73);
+if (x_75 == 0)
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_77 = lean_ctor_get(x_74, 1);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_76 = lean_ctor_get(x_73, 1);
+lean_dec(x_76);
+lean_ctor_set(x_73, 1, x_71);
+x_77 = lean_st_ref_set(x_8, x_73, x_74);
+x_78 = lean_ctor_get(x_77, 1);
+lean_inc(x_78);
 lean_dec(x_77);
-lean_ctor_set(x_74, 1, x_72);
-x_78 = lean_st_ref_set(x_8, x_74, x_75);
-x_79 = lean_ctor_get(x_78, 1);
-lean_inc(x_79);
-lean_dec(x_78);
-x_80 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_43, x_42, x_48, x_71, x_3, x_4, x_5, x_6, x_7, x_8, x_79);
+x_79 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_42, x_41, x_47, x_70, x_3, x_4, x_5, x_6, x_7, x_8, x_78);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_80;
+return x_79;
 }
 else
 {
-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_81 = lean_ctor_get(x_74, 0);
-x_82 = lean_ctor_get(x_74, 2);
-x_83 = lean_ctor_get(x_74, 3);
-lean_inc(x_83);
+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; 
+x_80 = lean_ctor_get(x_73, 0);
+x_81 = lean_ctor_get(x_73, 2);
+x_82 = lean_ctor_get(x_73, 3);
 lean_inc(x_82);
 lean_inc(x_81);
-lean_dec(x_74);
-x_84 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_84, 0, x_81);
-lean_ctor_set(x_84, 1, x_72);
-lean_ctor_set(x_84, 2, x_82);
-lean_ctor_set(x_84, 3, x_83);
-x_85 = lean_st_ref_set(x_8, x_84, x_75);
-x_86 = lean_ctor_get(x_85, 1);
-lean_inc(x_86);
-lean_dec(x_85);
-x_87 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_43, x_42, x_48, x_71, x_3, x_4, x_5, x_6, x_7, x_8, x_86);
+lean_inc(x_80);
+lean_dec(x_73);
+x_83 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_83, 0, x_80);
+lean_ctor_set(x_83, 1, x_71);
+lean_ctor_set(x_83, 2, x_81);
+lean_ctor_set(x_83, 3, x_82);
+x_84 = lean_st_ref_set(x_8, x_83, x_74);
+x_85 = lean_ctor_get(x_84, 1);
+lean_inc(x_85);
+lean_dec(x_84);
+x_86 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_42, x_41, x_47, x_70, x_3, x_4, x_5, x_6, x_7, x_8, x_85);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_87;
+return x_86;
 }
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_88 = lean_ctor_get(x_47, 0);
+lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_87 = lean_ctor_get(x_46, 0);
+lean_inc(x_87);
+x_88 = lean_ctor_get(x_46, 1);
 lean_inc(x_88);
-x_89 = lean_ctor_get(x_47, 1);
-lean_inc(x_89);
-lean_dec(x_47);
-x_90 = lean_unsigned_to_nat(4u);
-x_91 = l_Lean_Syntax_getArg(x_13, x_90);
-x_92 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_43, x_42, x_88, x_91, x_3, x_4, x_5, x_6, x_7, x_8, x_89);
+lean_dec(x_46);
+x_89 = lean_unsigned_to_nat(4u);
+x_90 = l_Lean_Syntax_getArg(x_13, x_89);
+x_91 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__2(x_13, x_2, x_20, x_25, x_42, x_41, x_87, x_90, x_3, x_4, x_5, x_6, x_7, x_8, x_88);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_92;
+return x_91;
 }
 }
 else
 {
-uint8_t x_93; 
+uint8_t x_92; 
 lean_dec(x_25);
 lean_dec(x_20);
 lean_dec(x_13);
@@ -1311,29 +1294,29 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_93 = !lean_is_exclusive(x_39);
-if (x_93 == 0)
+x_92 = !lean_is_exclusive(x_38);
+if (x_92 == 0)
 {
-return x_39;
+return x_38;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_39, 0);
-x_95 = lean_ctor_get(x_39, 1);
-lean_inc(x_95);
+lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+x_93 = lean_ctor_get(x_38, 0);
+x_94 = lean_ctor_get(x_38, 1);
 lean_inc(x_94);
-lean_dec(x_39);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
+lean_inc(x_93);
+lean_dec(x_38);
+x_95 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_95, 0, x_93);
+lean_ctor_set(x_95, 1, x_94);
+return x_95;
 }
 }
 }
 else
 {
-uint8_t x_97; 
+uint8_t x_96; 
 lean_dec(x_25);
 lean_dec(x_20);
 lean_dec(x_13);
@@ -1344,29 +1327,29 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_97 = !lean_is_exclusive(x_30);
-if (x_97 == 0)
+x_96 = !lean_is_exclusive(x_29);
+if (x_96 == 0)
 {
-return x_30;
+return x_29;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_30, 0);
-x_99 = lean_ctor_get(x_30, 1);
-lean_inc(x_99);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_29, 0);
+x_98 = lean_ctor_get(x_29, 1);
 lean_inc(x_98);
-lean_dec(x_30);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-return x_100;
+lean_inc(x_97);
+lean_dec(x_29);
+x_99 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_99, 0, x_97);
+lean_ctor_set(x_99, 1, x_98);
+return x_99;
 }
 }
 }
 else
 {
-uint8_t x_101; 
+uint8_t x_100; 
 lean_dec(x_25);
 lean_dec(x_20);
 lean_dec(x_13);
@@ -1377,23 +1360,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_101 = !lean_is_exclusive(x_26);
-if (x_101 == 0)
+x_100 = !lean_is_exclusive(x_26);
+if (x_100 == 0)
 {
 return x_26;
 }
 else
 {
-lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_102 = lean_ctor_get(x_26, 0);
-x_103 = lean_ctor_get(x_26, 1);
-lean_inc(x_103);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_26, 0);
+x_102 = lean_ctor_get(x_26, 1);
 lean_inc(x_102);
+lean_inc(x_101);
 lean_dec(x_26);
-x_104 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_104, 0, x_102);
-lean_ctor_set(x_104, 1, x_103);
-return x_104;
+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;
 }
 }
 }
@@ -1401,16 +1384,16 @@ return x_104;
 }
 else
 {
-lean_object* x_114; lean_object* x_115; 
+lean_object* x_113; lean_object* x_114; 
 lean_dec(x_2);
-x_114 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__3___closed__3;
-x_115 = l_Lean_throwErrorAt___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__1___rarg(x_13, x_114, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_113 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___lambda__3___closed__3;
+x_114 = l_Lean_throwErrorAt___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__1___rarg(x_13, x_113, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_13);
-return x_115;
+return x_114;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/MutualDef.c b/stage0/stdlib/Lean/Elab/MutualDef.c
index 153c4949d7..dfa2e1ec49 100644
--- a/stage0/stdlib/Lean/Elab/MutualDef.c
+++ b/stage0/stdlib/Lean/Elab/MutualDef.c
@@ -137,7 +137,7 @@ lean_object* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__2___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___at_Lean_Elab_Term_MutualClosure_main___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__2___rarg(lean_object*);
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkKinds___lambda__1(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -591,6 +591,7 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsA
 lean_object* l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___lambda__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 uint8_t l_List_foldr___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_typeHasRecFun___spec__1(lean_object*, uint8_t, lean_object*);
+uint8_t l_Lean_Elab_toAttributeKind(lean_object*);
 extern lean_object* l_Lean_CollectFVars_instInhabitedState___closed__1;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureFor_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__3___closed__2;
@@ -4209,7 +4210,7 @@ x_29 = l_Lean_Elab_expandDeclId___at___private_Lean_Elab_MutualDef_0__Lean_Elab_
 lean_dec(x_27);
 if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; uint8_t x_37; lean_object* x_38; 
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; 
 x_30 = lean_ctor_get(x_29, 0);
 lean_inc(x_30);
 x_31 = lean_ctor_get(x_29, 1);
@@ -4225,35 +4226,35 @@ lean_dec(x_30);
 x_35 = lean_ctor_get(x_28, 1);
 lean_inc(x_35);
 x_36 = 2;
-x_37 = 1;
 lean_inc(x_10);
 lean_inc(x_23);
 lean_inc(x_5);
 lean_inc(x_33);
-x_38 = l_Lean_Elab_Term_applyAttributesAt(x_33, x_35, x_36, x_37, x_5, x_6, x_7, x_8, x_23, x_10, x_31);
+x_37 = l_Lean_Elab_Term_applyAttributesAt(x_33, x_35, x_36, x_5, x_6, x_7, x_8, x_23, x_10, x_31);
 lean_dec(x_35);
-if (lean_obj_tag(x_38) == 0)
+if (lean_obj_tag(x_37) == 0)
 {
-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; 
-x_39 = lean_ctor_get(x_38, 1);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_38 = lean_ctor_get(x_37, 1);
+lean_inc(x_38);
+lean_dec(x_37);
+x_39 = lean_ctor_get(x_14, 3);
 lean_inc(x_39);
-lean_dec(x_38);
-x_40 = lean_ctor_get(x_14, 3);
-lean_inc(x_40);
-x_41 = l_Lean_Syntax_getArgs(x_40);
-lean_dec(x_40);
+x_40 = l_Lean_Syntax_getArgs(x_39);
+lean_dec(x_39);
 lean_inc(x_4);
-x_42 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__7___lambda__2), 14, 6);
-lean_closure_set(x_42, 0, x_14);
-lean_closure_set(x_42, 1, x_15);
-lean_closure_set(x_42, 2, x_28);
-lean_closure_set(x_42, 3, x_32);
-lean_closure_set(x_42, 4, x_33);
-lean_closure_set(x_42, 5, x_4);
-x_43 = lean_box(x_37);
+x_41 = lean_alloc_closure((void*)(l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__7___lambda__2), 14, 6);
+lean_closure_set(x_41, 0, x_14);
+lean_closure_set(x_41, 1, x_15);
+lean_closure_set(x_41, 2, x_28);
+lean_closure_set(x_41, 3, x_32);
+lean_closure_set(x_41, 4, x_33);
+lean_closure_set(x_41, 5, x_4);
+x_42 = 1;
+x_43 = lean_box(x_42);
 x_44 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabBinders___rarg___boxed), 10, 3);
-lean_closure_set(x_44, 0, x_41);
-lean_closure_set(x_44, 1, x_42);
+lean_closure_set(x_44, 0, x_40);
+lean_closure_set(x_44, 1, x_41);
 lean_closure_set(x_44, 2, x_43);
 x_45 = lean_alloc_closure((void*)(l_Lean_Elab_Term_withLevelNames___rarg), 9, 2);
 lean_closure_set(x_45, 0, x_34);
@@ -4263,7 +4264,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_46 = l_Lean_Elab_Term_withAutoBoundImplicitLocal___rarg(x_45, x_37, x_5, x_6, x_7, x_8, x_23, x_10, x_39);
+x_46 = l_Lean_Elab_Term_withAutoBoundImplicitLocal___rarg(x_45, x_42, x_5, x_6, x_7, x_8, x_23, x_10, x_38);
 if (lean_obj_tag(x_46) == 0)
 {
 lean_object* x_47; lean_object* x_48; lean_object* x_49; size_t x_50; size_t x_51; 
@@ -4327,19 +4328,19 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_57 = !lean_is_exclusive(x_38);
+x_57 = !lean_is_exclusive(x_37);
 if (x_57 == 0)
 {
-return x_38;
+return x_37;
 }
 else
 {
 lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_38, 0);
-x_59 = lean_ctor_get(x_38, 1);
+x_58 = lean_ctor_get(x_37, 0);
+x_59 = lean_ctor_get(x_37, 1);
 lean_inc(x_59);
 lean_inc(x_58);
-lean_dec(x_38);
+lean_dec(x_37);
 x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_58);
 lean_ctor_set(x_60, 1, x_59);
@@ -17688,130 +17689,113 @@ return x_2;
 lean_object* l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = l_Lean_Syntax_getArg(x_1, x_5);
-x_7 = l_Lean_Syntax_isNone(x_6);
+x_7 = l_Lean_Elab_toAttributeKind(x_6);
 lean_dec(x_6);
 x_8 = lean_unsigned_to_nat(1u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 x_10 = l_Lean_Syntax_isIdOrAtom_x3f(x_9);
-if (x_7 == 0)
-{
-uint8_t x_42; 
-x_42 = 1;
-x_11 = x_42;
-goto block_41;
-}
-else
-{
-uint8_t x_43; 
-x_43 = 0;
-x_11 = x_43;
-goto block_41;
-}
-block_41:
-{
 if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_12 = l_Lean_Elab_Command_getRef(x_2, x_3, x_4);
-x_13 = lean_ctor_get(x_12, 0);
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_11 = l_Lean_Elab_Command_getRef(x_2, x_3, 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);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
+lean_dec(x_11);
+x_14 = l_Lean_replaceRef(x_9, x_12);
 lean_dec(x_12);
-x_15 = l_Lean_replaceRef(x_9, x_13);
-lean_dec(x_13);
 lean_dec(x_9);
-x_16 = !lean_is_exclusive(x_2);
-if (x_16 == 0)
+x_15 = !lean_is_exclusive(x_2);
+if (x_15 == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-x_17 = lean_ctor_get(x_2, 6);
-lean_dec(x_17);
-lean_ctor_set(x_2, 6, x_15);
-x_18 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___closed__2;
-x_19 = l_Lean_throwError___at___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing___spec__1___rarg(x_18, x_2, x_3, x_14);
-x_20 = !lean_is_exclusive(x_19);
-if (x_20 == 0)
+lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_16 = lean_ctor_get(x_2, 6);
+lean_dec(x_16);
+lean_ctor_set(x_2, 6, x_14);
+x_17 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___closed__2;
+x_18 = l_Lean_throwError___at___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing___spec__1___rarg(x_17, x_2, x_3, x_13);
+x_19 = !lean_is_exclusive(x_18);
+if (x_19 == 0)
 {
-return x_19;
+return x_18;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_19, 0);
-x_22 = lean_ctor_get(x_19, 1);
-lean_inc(x_22);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_18, 0);
+x_21 = lean_ctor_get(x_18, 1);
 lean_inc(x_21);
-lean_dec(x_19);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
+lean_inc(x_20);
+lean_dec(x_18);
+x_22 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+return x_22;
 }
 }
 else
 {
-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_24 = lean_ctor_get(x_2, 0);
-x_25 = lean_ctor_get(x_2, 1);
-x_26 = lean_ctor_get(x_2, 2);
-x_27 = lean_ctor_get(x_2, 3);
-x_28 = lean_ctor_get(x_2, 4);
-x_29 = lean_ctor_get(x_2, 5);
-lean_inc(x_29);
+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; 
+x_23 = lean_ctor_get(x_2, 0);
+x_24 = lean_ctor_get(x_2, 1);
+x_25 = lean_ctor_get(x_2, 2);
+x_26 = lean_ctor_get(x_2, 3);
+x_27 = lean_ctor_get(x_2, 4);
+x_28 = lean_ctor_get(x_2, 5);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
+lean_inc(x_23);
 lean_dec(x_2);
-x_30 = lean_alloc_ctor(0, 7, 0);
-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_27);
-lean_ctor_set(x_30, 4, x_28);
-lean_ctor_set(x_30, 5, x_29);
-lean_ctor_set(x_30, 6, x_15);
-x_31 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___closed__2;
-x_32 = l_Lean_throwError___at___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing___spec__1___rarg(x_31, x_30, x_3, x_14);
-x_33 = lean_ctor_get(x_32, 0);
+x_29 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_29, 0, x_23);
+lean_ctor_set(x_29, 1, x_24);
+lean_ctor_set(x_29, 2, x_25);
+lean_ctor_set(x_29, 3, x_26);
+lean_ctor_set(x_29, 4, x_27);
+lean_ctor_set(x_29, 5, x_28);
+lean_ctor_set(x_29, 6, x_14);
+x_30 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___closed__2;
+x_31 = l_Lean_throwError___at___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing___spec__1___rarg(x_30, x_29, x_3, x_13);
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
 lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-if (lean_is_exclusive(x_32)) {
- lean_ctor_release(x_32, 0);
- lean_ctor_release(x_32, 1);
- x_35 = x_32;
+if (lean_is_exclusive(x_31)) {
+ lean_ctor_release(x_31, 0);
+ lean_ctor_release(x_31, 1);
+ x_34 = x_31;
 } else {
- lean_dec_ref(x_32);
- x_35 = lean_box(0);
+ lean_dec_ref(x_31);
+ x_34 = lean_box(0);
 }
-if (lean_is_scalar(x_35)) {
- x_36 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_34)) {
+ x_35 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_36 = x_35;
+ x_35 = x_34;
 }
-lean_ctor_set(x_36, 0, x_33);
-lean_ctor_set(x_36, 1, x_34);
-return x_36;
+lean_ctor_set(x_35, 0, x_32);
+lean_ctor_set(x_35, 1, x_33);
+return x_35;
 }
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 lean_dec(x_9);
-x_37 = lean_ctor_get(x_10, 0);
-lean_inc(x_37);
+x_36 = lean_ctor_get(x_10, 0);
+lean_inc(x_36);
 lean_dec(x_10);
-x_38 = lean_box(0);
-x_39 = lean_name_mk_string(x_38, x_37);
-x_40 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___lambda__3(x_1, x_11, x_39, x_2, x_3, x_4);
-return x_40;
-}
+x_37 = lean_box(0);
+x_38 = lean_name_mk_string(x_37, x_36);
+x_39 = l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___lambda__3(x_1, x_7, x_38, x_2, x_3, x_4);
+return x_39;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/PreDefinition/Basic.c b/stage0/stdlib/Lean/Elab/PreDefinition/Basic.c
index 51a100e76d..40edf6c1e5 100644
--- a/stage0/stdlib/Lean/Elab/PreDefinition/Basic.c
+++ b/stage0/stdlib/Lean/Elab/PreDefinition/Basic.c
@@ -41,7 +41,7 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_addAndCompileUnsafeRec___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_instantiateMVarsAtPreDecls___boxed__const__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_applyAttributesOf___spec__1(uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_DefKind_isExample(uint8_t);
@@ -3142,7 +3142,7 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
 lean_dec(x_5);
 x_15 = lean_array_uget(x_2, x_4);
 x_16 = lean_ctor_get(x_15, 2);
@@ -3153,49 +3153,48 @@ lean_dec(x_15);
 x_18 = lean_ctor_get(x_17, 1);
 lean_inc(x_18);
 lean_dec(x_17);
-x_19 = 1;
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_6);
-x_20 = l_Lean_Elab_Term_applyAttributesAt(x_16, x_18, x_1, x_19, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_19 = l_Lean_Elab_Term_applyAttributesAt(x_16, x_18, x_1, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_18);
-if (lean_obj_tag(x_20) == 0)
+if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_21; size_t x_22; size_t x_23; lean_object* x_24; 
-x_21 = lean_ctor_get(x_20, 1);
-lean_inc(x_21);
-lean_dec(x_20);
-x_22 = 1;
-x_23 = x_4 + x_22;
-x_24 = lean_box(0);
-x_4 = x_23;
-x_5 = x_24;
-x_12 = x_21;
+lean_object* x_20; size_t x_21; size_t x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = 1;
+x_22 = x_4 + x_21;
+x_23 = lean_box(0);
+x_4 = x_22;
+x_5 = x_23;
+x_12 = x_20;
 goto _start;
 }
 else
 {
-uint8_t x_26; 
+uint8_t x_25; 
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_6);
-x_26 = !lean_is_exclusive(x_20);
-if (x_26 == 0)
+x_25 = !lean_is_exclusive(x_19);
+if (x_25 == 0)
 {
-return x_20;
+return x_19;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_20, 0);
-x_28 = lean_ctor_get(x_20, 1);
-lean_inc(x_28);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_19, 0);
+x_27 = lean_ctor_get(x_19, 1);
 lean_inc(x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
+lean_inc(x_26);
+lean_dec(x_19);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/Structure.c b/stage0/stdlib/Lean/Elab/Structure.c
index ce06471d29..0dfae16820 100644
--- a/stage0/stdlib/Lean/Elab/Structure.c
+++ b/stage0/stdlib/Lean/Elab/Structure.c
@@ -139,7 +139,7 @@ extern lean_object* l_Array_getEvenElems___rarg___closed__1;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_checkParentIsStructure___closed__3;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addProjections_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__7(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -556,6 +556,7 @@ lean_object* l_Lean_Name_appendBefore(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_updateResultingUniverse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_updateResultingUniverse___closed__2;
+uint8_t l_Lean_Elab_toAttributeKind(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToParamFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__7___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_CollectFVars_instInhabitedState___closed__1;
@@ -952,128 +953,111 @@ return x_27;
 lean_object* l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__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* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_9 = lean_unsigned_to_nat(0u);
 x_10 = l_Lean_Syntax_getArg(x_1, x_9);
-x_11 = l_Lean_Syntax_isNone(x_10);
+x_11 = l_Lean_Elab_toAttributeKind(x_10);
 lean_dec(x_10);
 x_12 = lean_unsigned_to_nat(1u);
 x_13 = l_Lean_Syntax_getArg(x_1, x_12);
 x_14 = l_Lean_Syntax_isIdOrAtom_x3f(x_13);
-if (x_11 == 0)
-{
-uint8_t x_44; 
-x_44 = 1;
-x_15 = x_44;
-goto block_43;
-}
-else
-{
-uint8_t x_45; 
-x_45 = 0;
-x_15 = x_45;
-goto block_43;
-}
-block_43:
-{
 if (lean_obj_tag(x_14) == 0)
 {
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_6);
-if (x_16 == 0)
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_6);
+if (x_15 == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_17 = lean_ctor_get(x_6, 3);
-x_18 = l_Lean_replaceRef(x_13, x_17);
-lean_dec(x_17);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_16 = lean_ctor_get(x_6, 3);
+x_17 = l_Lean_replaceRef(x_13, x_16);
+lean_dec(x_16);
 lean_dec(x_13);
-lean_ctor_set(x_6, 3, x_18);
-x_19 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_20 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_19, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_ctor_set(x_6, 3, x_17);
+x_18 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_19 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_18, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
 {
-return x_20;
+return x_19;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_20, 0);
-x_23 = lean_ctor_get(x_20, 1);
-lean_inc(x_23);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_19, 0);
+x_22 = lean_ctor_get(x_19, 1);
 lean_inc(x_22);
-lean_dec(x_20);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
+lean_inc(x_21);
+lean_dec(x_19);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
 }
 }
 else
 {
-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; lean_object* x_37; lean_object* x_38; 
-x_25 = lean_ctor_get(x_6, 0);
-x_26 = lean_ctor_get(x_6, 1);
-x_27 = lean_ctor_get(x_6, 2);
-x_28 = lean_ctor_get(x_6, 3);
-x_29 = lean_ctor_get(x_6, 4);
-x_30 = lean_ctor_get(x_6, 5);
-lean_inc(x_30);
+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; lean_object* x_37; 
+x_24 = lean_ctor_get(x_6, 0);
+x_25 = lean_ctor_get(x_6, 1);
+x_26 = lean_ctor_get(x_6, 2);
+x_27 = lean_ctor_get(x_6, 3);
+x_28 = lean_ctor_get(x_6, 4);
+x_29 = lean_ctor_get(x_6, 5);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
+lean_inc(x_24);
 lean_dec(x_6);
-x_31 = l_Lean_replaceRef(x_13, x_28);
-lean_dec(x_28);
+x_30 = l_Lean_replaceRef(x_13, x_27);
+lean_dec(x_27);
 lean_dec(x_13);
-x_32 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_32, 0, x_25);
-lean_ctor_set(x_32, 1, x_26);
-lean_ctor_set(x_32, 2, x_27);
-lean_ctor_set(x_32, 3, x_31);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-x_33 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_34 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_33, x_2, x_3, x_4, x_5, x_32, x_7, x_8);
-lean_dec(x_32);
-x_35 = lean_ctor_get(x_34, 0);
+x_31 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_31, 0, x_24);
+lean_ctor_set(x_31, 1, x_25);
+lean_ctor_set(x_31, 2, x_26);
+lean_ctor_set(x_31, 3, x_30);
+lean_ctor_set(x_31, 4, x_28);
+lean_ctor_set(x_31, 5, x_29);
+x_32 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_33 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_32, x_2, x_3, x_4, x_5, x_31, x_7, x_8);
+lean_dec(x_31);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
-lean_inc(x_36);
-if (lean_is_exclusive(x_34)) {
- lean_ctor_release(x_34, 0);
- lean_ctor_release(x_34, 1);
- x_37 = x_34;
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_36 = x_33;
 } else {
- lean_dec_ref(x_34);
- x_37 = lean_box(0);
+ lean_dec_ref(x_33);
+ x_36 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_36)) {
+ x_37 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_37 = x_36;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_37, 0, x_34);
+lean_ctor_set(x_37, 1, x_35);
+return x_37;
 }
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_13);
-x_39 = lean_ctor_get(x_14, 0);
-lean_inc(x_39);
+x_38 = lean_ctor_get(x_14, 0);
+lean_inc(x_38);
 lean_dec(x_14);
-x_40 = lean_box(0);
-x_41 = lean_name_mk_string(x_40, x_39);
-x_42 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__4___lambda__3(x_1, x_15, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_39 = lean_box(0);
+x_40 = lean_name_mk_string(x_39, x_38);
+x_41 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__4___lambda__3(x_1, x_11, x_40, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-return x_42;
-}
+return x_41;
 }
 }
 }
@@ -3671,128 +3655,111 @@ return x_27;
 lean_object* l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__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* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_9 = lean_unsigned_to_nat(0u);
 x_10 = l_Lean_Syntax_getArg(x_1, x_9);
-x_11 = l_Lean_Syntax_isNone(x_10);
+x_11 = l_Lean_Elab_toAttributeKind(x_10);
 lean_dec(x_10);
 x_12 = lean_unsigned_to_nat(1u);
 x_13 = l_Lean_Syntax_getArg(x_1, x_12);
 x_14 = l_Lean_Syntax_isIdOrAtom_x3f(x_13);
-if (x_11 == 0)
-{
-uint8_t x_44; 
-x_44 = 1;
-x_15 = x_44;
-goto block_43;
-}
-else
-{
-uint8_t x_45; 
-x_45 = 0;
-x_15 = x_45;
-goto block_43;
-}
-block_43:
-{
 if (lean_obj_tag(x_14) == 0)
 {
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_6);
-if (x_16 == 0)
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_6);
+if (x_15 == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_17 = lean_ctor_get(x_6, 3);
-x_18 = l_Lean_replaceRef(x_13, x_17);
-lean_dec(x_17);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_16 = lean_ctor_get(x_6, 3);
+x_17 = l_Lean_replaceRef(x_13, x_16);
+lean_dec(x_16);
 lean_dec(x_13);
-lean_ctor_set(x_6, 3, x_18);
-x_19 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_20 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__2___rarg(x_19, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_ctor_set(x_6, 3, x_17);
+x_18 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_19 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__2___rarg(x_18, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
+x_20 = !lean_is_exclusive(x_19);
+if (x_20 == 0)
 {
-return x_20;
+return x_19;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_20, 0);
-x_23 = lean_ctor_get(x_20, 1);
-lean_inc(x_23);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_19, 0);
+x_22 = lean_ctor_get(x_19, 1);
 lean_inc(x_22);
-lean_dec(x_20);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
+lean_inc(x_21);
+lean_dec(x_19);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
 }
 }
 else
 {
-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; lean_object* x_37; lean_object* x_38; 
-x_25 = lean_ctor_get(x_6, 0);
-x_26 = lean_ctor_get(x_6, 1);
-x_27 = lean_ctor_get(x_6, 2);
-x_28 = lean_ctor_get(x_6, 3);
-x_29 = lean_ctor_get(x_6, 4);
-x_30 = lean_ctor_get(x_6, 5);
-lean_inc(x_30);
+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; lean_object* x_37; 
+x_24 = lean_ctor_get(x_6, 0);
+x_25 = lean_ctor_get(x_6, 1);
+x_26 = lean_ctor_get(x_6, 2);
+x_27 = lean_ctor_get(x_6, 3);
+x_28 = lean_ctor_get(x_6, 4);
+x_29 = lean_ctor_get(x_6, 5);
 lean_inc(x_29);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
+lean_inc(x_24);
 lean_dec(x_6);
-x_31 = l_Lean_replaceRef(x_13, x_28);
-lean_dec(x_28);
+x_30 = l_Lean_replaceRef(x_13, x_27);
+lean_dec(x_27);
 lean_dec(x_13);
-x_32 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_32, 0, x_25);
-lean_ctor_set(x_32, 1, x_26);
-lean_ctor_set(x_32, 2, x_27);
-lean_ctor_set(x_32, 3, x_31);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-x_33 = l_Lean_Elab_elabAttr___rarg___closed__3;
-x_34 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__2___rarg(x_33, x_2, x_3, x_4, x_5, x_32, x_7, x_8);
-lean_dec(x_32);
-x_35 = lean_ctor_get(x_34, 0);
+x_31 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_31, 0, x_24);
+lean_ctor_set(x_31, 1, x_25);
+lean_ctor_set(x_31, 2, x_26);
+lean_ctor_set(x_31, 3, x_30);
+lean_ctor_set(x_31, 4, x_28);
+lean_ctor_set(x_31, 5, x_29);
+x_32 = l_Lean_Elab_elabAttr___rarg___closed__3;
+x_33 = l_Lean_throwError___at_Lean_Elab_Term_Quotation_match__syntax_expand___spec__2___rarg(x_32, x_2, x_3, x_4, x_5, x_31, x_7, x_8);
+lean_dec(x_31);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_33, 1);
 lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
-lean_inc(x_36);
-if (lean_is_exclusive(x_34)) {
- lean_ctor_release(x_34, 0);
- lean_ctor_release(x_34, 1);
- x_37 = x_34;
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_36 = x_33;
 } else {
- lean_dec_ref(x_34);
- x_37 = lean_box(0);
+ lean_dec_ref(x_33);
+ x_36 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_36)) {
+ x_37 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_37 = x_36;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_37, 0, x_34);
+lean_ctor_set(x_37, 1, x_35);
+return x_37;
 }
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_13);
-x_39 = lean_ctor_get(x_14, 0);
-lean_inc(x_39);
+x_38 = lean_ctor_get(x_14, 0);
+lean_inc(x_38);
 lean_dec(x_14);
-x_40 = lean_box(0);
-x_41 = lean_name_mk_string(x_40, x_39);
-x_42 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__4___lambda__1(x_1, x_15, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_39 = lean_box(0);
+x_40 = lean_name_mk_string(x_39, x_38);
+x_41 = l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__4___lambda__1(x_1, x_11, x_40, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_6);
-return x_42;
-}
+return x_41;
 }
 }
 }
@@ -15150,67 +15117,67 @@ lean_inc(x_9);
 x_16 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToParam(x_8, x_1, x_2, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
 if (lean_obj_tag(x_16) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 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_object* x_223; lean_object* x_224; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 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_object* x_223; 
 x_17 = lean_ctor_get(x_16, 0);
 lean_inc(x_17);
 x_18 = lean_ctor_get(x_16, 1);
 lean_inc(x_18);
 lean_dec(x_16);
-x_217 = lean_ctor_get(x_13, 0);
+x_216 = lean_ctor_get(x_13, 0);
+lean_inc(x_216);
+x_217 = lean_ctor_get(x_13, 1);
 lean_inc(x_217);
-x_218 = lean_ctor_get(x_13, 1);
+x_218 = lean_ctor_get(x_13, 2);
 lean_inc(x_218);
-x_219 = lean_ctor_get(x_13, 2);
+x_219 = lean_ctor_get(x_13, 3);
 lean_inc(x_219);
-x_220 = lean_ctor_get(x_13, 3);
+x_220 = lean_ctor_get(x_13, 4);
 lean_inc(x_220);
-x_221 = lean_ctor_get(x_13, 4);
+x_221 = lean_ctor_get(x_13, 5);
 lean_inc(x_221);
-x_222 = lean_ctor_get(x_13, 5);
-lean_inc(x_222);
-x_223 = l_Lean_replaceRef(x_4, x_220);
-lean_dec(x_220);
-x_224 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_224, 0, x_217);
-lean_ctor_set(x_224, 1, x_218);
-lean_ctor_set(x_224, 2, x_219);
-lean_ctor_set(x_224, 3, x_223);
-lean_ctor_set(x_224, 4, x_221);
-lean_ctor_set(x_224, 5, x_222);
+x_222 = l_Lean_replaceRef(x_4, x_219);
+lean_dec(x_219);
+x_223 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_223, 0, x_216);
+lean_ctor_set(x_223, 1, x_217);
+lean_ctor_set(x_223, 2, x_218);
+lean_ctor_set(x_223, 3, x_222);
+lean_ctor_set(x_223, 4, x_220);
+lean_ctor_set(x_223, 5, x_221);
 if (x_6 == 0)
 {
-lean_object* x_225; 
+lean_object* x_224; 
 lean_inc(x_14);
-lean_inc(x_224);
+lean_inc(x_223);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_9);
 lean_inc(x_7);
-x_225 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_getResultUniverse(x_7, x_9, x_10, x_11, x_12, x_224, x_14, x_18);
-if (lean_obj_tag(x_225) == 0)
+x_224 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_getResultUniverse(x_7, x_9, x_10, x_11, x_12, x_223, x_14, x_18);
+if (lean_obj_tag(x_224) == 0)
 {
-lean_object* x_226; lean_object* x_227; lean_object* x_228; 
-x_226 = lean_ctor_get(x_225, 0);
+lean_object* x_225; lean_object* x_226; lean_object* x_227; 
+x_225 = lean_ctor_get(x_224, 0);
+lean_inc(x_225);
+x_226 = lean_ctor_get(x_224, 1);
 lean_inc(x_226);
-x_227 = lean_ctor_get(x_225, 1);
-lean_inc(x_227);
-lean_dec(x_225);
+lean_dec(x_224);
 lean_inc(x_9);
-x_228 = l_Lean_Elab_Command_checkResultingUniverse(x_226, x_9, x_10, x_11, x_12, x_224, x_14, x_227);
-lean_dec(x_224);
-if (lean_obj_tag(x_228) == 0)
+x_227 = l_Lean_Elab_Command_checkResultingUniverse(x_225, x_9, x_10, x_11, x_12, x_223, x_14, x_226);
+lean_dec(x_223);
+if (lean_obj_tag(x_227) == 0)
 {
-lean_object* x_229; 
-x_229 = lean_ctor_get(x_228, 1);
-lean_inc(x_229);
-lean_dec(x_228);
+lean_object* x_228; 
+x_228 = lean_ctor_get(x_227, 1);
+lean_inc(x_228);
+lean_dec(x_227);
 x_19 = x_7;
-x_20 = x_229;
-goto block_216;
+x_20 = x_228;
+goto block_215;
 }
 else
 {
-uint8_t x_230; 
+uint8_t x_229; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -15222,30 +15189,30 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_3);
-x_230 = !lean_is_exclusive(x_228);
-if (x_230 == 0)
+x_229 = !lean_is_exclusive(x_227);
+if (x_229 == 0)
 {
-return x_228;
+return x_227;
 }
 else
 {
-lean_object* x_231; lean_object* x_232; lean_object* x_233; 
-x_231 = lean_ctor_get(x_228, 0);
-x_232 = lean_ctor_get(x_228, 1);
-lean_inc(x_232);
+lean_object* x_230; lean_object* x_231; lean_object* x_232; 
+x_230 = lean_ctor_get(x_227, 0);
+x_231 = lean_ctor_get(x_227, 1);
 lean_inc(x_231);
-lean_dec(x_228);
-x_233 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_233, 0, x_231);
-lean_ctor_set(x_233, 1, x_232);
-return x_233;
+lean_inc(x_230);
+lean_dec(x_227);
+x_232 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_232, 0, x_230);
+lean_ctor_set(x_232, 1, x_231);
+return x_232;
 }
 }
 }
 else
 {
-uint8_t x_234; 
-lean_dec(x_224);
+uint8_t x_233; 
+lean_dec(x_223);
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -15257,49 +15224,49 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_3);
-x_234 = !lean_is_exclusive(x_225);
-if (x_234 == 0)
+x_233 = !lean_is_exclusive(x_224);
+if (x_233 == 0)
 {
-return x_225;
+return x_224;
 }
 else
 {
-lean_object* x_235; lean_object* x_236; lean_object* x_237; 
-x_235 = lean_ctor_get(x_225, 0);
-x_236 = lean_ctor_get(x_225, 1);
-lean_inc(x_236);
+lean_object* x_234; lean_object* x_235; lean_object* x_236; 
+x_234 = lean_ctor_get(x_224, 0);
+x_235 = lean_ctor_get(x_224, 1);
 lean_inc(x_235);
-lean_dec(x_225);
-x_237 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_237, 0, x_235);
-lean_ctor_set(x_237, 1, x_236);
-return x_237;
+lean_inc(x_234);
+lean_dec(x_224);
+x_236 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_236, 0, x_234);
+lean_ctor_set(x_236, 1, x_235);
+return x_236;
 }
 }
 }
 else
 {
-lean_object* x_238; 
+lean_object* x_237; 
 lean_inc(x_14);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_9);
-x_238 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_updateResultingUniverse(x_17, x_7, x_9, x_10, x_11, x_12, x_224, x_14, x_18);
-if (lean_obj_tag(x_238) == 0)
+x_237 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_updateResultingUniverse(x_17, x_7, x_9, x_10, x_11, x_12, x_223, x_14, x_18);
+if (lean_obj_tag(x_237) == 0)
 {
-lean_object* x_239; lean_object* x_240; 
-x_239 = lean_ctor_get(x_238, 0);
+lean_object* x_238; lean_object* x_239; 
+x_238 = lean_ctor_get(x_237, 0);
+lean_inc(x_238);
+x_239 = lean_ctor_get(x_237, 1);
 lean_inc(x_239);
-x_240 = lean_ctor_get(x_238, 1);
-lean_inc(x_240);
-lean_dec(x_238);
-x_19 = x_239;
-x_20 = x_240;
-goto block_216;
+lean_dec(x_237);
+x_19 = x_238;
+x_20 = x_239;
+goto block_215;
 }
 else
 {
-uint8_t x_241; 
+uint8_t x_240; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -15310,68 +15277,68 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_3);
-x_241 = !lean_is_exclusive(x_238);
-if (x_241 == 0)
+x_240 = !lean_is_exclusive(x_237);
+if (x_240 == 0)
 {
-return x_238;
+return x_237;
 }
 else
 {
-lean_object* x_242; lean_object* x_243; lean_object* x_244; 
-x_242 = lean_ctor_get(x_238, 0);
-x_243 = lean_ctor_get(x_238, 1);
-lean_inc(x_243);
+lean_object* x_241; lean_object* x_242; lean_object* x_243; 
+x_241 = lean_ctor_get(x_237, 0);
+x_242 = lean_ctor_get(x_237, 1);
 lean_inc(x_242);
-lean_dec(x_238);
-x_244 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_244, 0, x_242);
-lean_ctor_set(x_244, 1, x_243);
-return x_244;
+lean_inc(x_241);
+lean_dec(x_237);
+x_243 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_243, 0, x_241);
+lean_ctor_set(x_243, 1, x_242);
+return x_243;
 }
 }
 }
-block_216:
+block_215:
 {
-lean_object* x_21; uint8_t x_193; lean_object* x_194; lean_object* x_204; lean_object* x_205; lean_object* x_206; uint8_t x_207; 
-x_204 = lean_st_ref_get(x_14, x_20);
-x_205 = lean_ctor_get(x_204, 0);
+lean_object* x_21; uint8_t x_192; lean_object* x_193; lean_object* x_203; lean_object* x_204; lean_object* x_205; uint8_t x_206; 
+x_203 = lean_st_ref_get(x_14, x_20);
+x_204 = lean_ctor_get(x_203, 0);
+lean_inc(x_204);
+x_205 = lean_ctor_get(x_204, 3);
 lean_inc(x_205);
-x_206 = lean_ctor_get(x_205, 3);
-lean_inc(x_206);
-lean_dec(x_205);
-x_207 = lean_ctor_get_uint8(x_206, sizeof(void*)*1);
-lean_dec(x_206);
-if (x_207 == 0)
-{
-lean_object* x_208; uint8_t x_209; 
-x_208 = lean_ctor_get(x_204, 1);
-lean_inc(x_208);
 lean_dec(x_204);
-x_209 = 0;
-x_193 = x_209;
-x_194 = x_208;
-goto block_203;
+x_206 = lean_ctor_get_uint8(x_205, sizeof(void*)*1);
+lean_dec(x_205);
+if (x_206 == 0)
+{
+lean_object* x_207; uint8_t x_208; 
+x_207 = lean_ctor_get(x_203, 1);
+lean_inc(x_207);
+lean_dec(x_203);
+x_208 = 0;
+x_192 = x_208;
+x_193 = x_207;
+goto block_202;
 }
 else
 {
-lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; uint8_t x_215; 
-x_210 = lean_ctor_get(x_204, 1);
-lean_inc(x_210);
-lean_dec(x_204);
-x_211 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__2;
-x_212 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_211, x_9, x_10, x_11, x_12, x_13, x_14, x_210);
-x_213 = lean_ctor_get(x_212, 0);
+lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; uint8_t x_214; 
+x_209 = lean_ctor_get(x_203, 1);
+lean_inc(x_209);
+lean_dec(x_203);
+x_210 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__2;
+x_211 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_210, x_9, x_10, x_11, x_12, x_13, x_14, x_209);
+x_212 = lean_ctor_get(x_211, 0);
+lean_inc(x_212);
+x_213 = lean_ctor_get(x_211, 1);
 lean_inc(x_213);
-x_214 = lean_ctor_get(x_212, 1);
-lean_inc(x_214);
+lean_dec(x_211);
+x_214 = lean_unbox(x_212);
 lean_dec(x_212);
-x_215 = lean_unbox(x_213);
-lean_dec(x_213);
-x_193 = x_215;
-x_194 = x_214;
-goto block_203;
+x_192 = x_214;
+x_193 = x_213;
+goto block_202;
 }
-block_192:
+block_191:
 {
 lean_object* x_22; 
 lean_inc(x_14);
@@ -15551,240 +15518,239 @@ x_66 = l_Lean_addDecl___at_Lean_Elab_Term_declareTacticSyntax___spec__1(x_63, x_
 lean_dec(x_63);
 if (lean_obj_tag(x_66) == 0)
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_134; uint8_t x_135; uint8_t x_136; lean_object* x_137; 
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_133; uint8_t x_134; uint8_t x_135; lean_object* x_136; 
 x_67 = lean_ctor_get(x_66, 1);
 lean_inc(x_67);
 lean_dec(x_66);
 x_68 = lean_array_get_size(x_17);
-x_134 = lean_unsigned_to_nat(0u);
-x_135 = lean_nat_dec_lt(x_134, x_68);
-x_136 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
+x_133 = lean_unsigned_to_nat(0u);
+x_134 = lean_nat_dec_lt(x_133, x_68);
+x_135 = lean_ctor_get_uint8(x_3, sizeof(void*)*11);
 lean_dec(x_3);
-if (x_135 == 0)
+if (x_134 == 0)
 {
 lean_inc(x_5);
-x_137 = x_5;
-goto block_163;
+x_136 = x_5;
+goto block_162;
 }
 else
 {
-uint8_t x_164; 
-x_164 = lean_nat_dec_le(x_68, x_68);
-if (x_164 == 0)
+uint8_t x_163; 
+x_163 = lean_nat_dec_le(x_68, x_68);
+if (x_163 == 0)
 {
 lean_inc(x_5);
-x_137 = x_5;
-goto block_163;
+x_136 = x_5;
+goto block_162;
 }
 else
 {
-size_t x_165; size_t x_166; lean_object* x_167; 
-x_165 = 0;
-x_166 = lean_usize_of_nat(x_68);
+size_t x_164; size_t x_165; lean_object* x_166; 
+x_164 = 0;
+x_165 = lean_usize_of_nat(x_68);
 lean_inc(x_5);
-x_167 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__10(x_17, x_165, x_166, x_5);
-x_137 = x_167;
-goto block_163;
+x_166 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__10(x_17, x_164, x_165, x_5);
+x_136 = x_166;
+goto block_162;
 }
 }
-block_133:
+block_132:
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; uint8_t x_75; lean_object* x_76; 
+lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; lean_object* x_75; 
 x_71 = lean_array_to_list(lean_box(0), x_69);
 x_72 = l_List_map___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__1(x_71);
 x_73 = lean_ctor_get(x_61, 1);
 lean_inc(x_73);
 lean_dec(x_61);
 x_74 = 0;
-x_75 = 1;
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_9);
-x_76 = l_Lean_Elab_Term_applyAttributesAt(x_55, x_73, x_74, x_75, x_9, x_10, x_11, x_12, x_13, x_14, x_70);
+x_75 = l_Lean_Elab_Term_applyAttributesAt(x_55, x_73, x_74, x_9, x_10, x_11, x_12, x_13, x_14, x_70);
 lean_dec(x_73);
-if (lean_obj_tag(x_76) == 0)
+if (lean_obj_tag(x_75) == 0)
 {
-lean_object* x_77; lean_object* x_78; 
-x_77 = lean_ctor_get(x_76, 1);
-lean_inc(x_77);
-lean_dec(x_76);
-x_78 = l_List_forM___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__3(x_72, x_9, x_10, x_11, x_12, x_13, x_14, x_77);
-if (lean_obj_tag(x_78) == 0)
+lean_object* x_76; lean_object* x_77; 
+x_76 = lean_ctor_get(x_75, 1);
+lean_inc(x_76);
+lean_dec(x_75);
+x_77 = l_List_forM___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__3(x_72, x_9, x_10, x_11, x_12, x_13, x_14, x_76);
+if (lean_obj_tag(x_77) == 0)
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; size_t x_83; lean_object* x_84; 
-x_79 = lean_ctor_get(x_78, 1);
+lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; size_t x_82; lean_object* x_83; 
+x_78 = lean_ctor_get(x_77, 1);
+lean_inc(x_78);
+lean_dec(x_77);
+x_79 = lean_ctor_get(x_11, 1);
 lean_inc(x_79);
-lean_dec(x_78);
-x_80 = lean_ctor_get(x_11, 1);
-lean_inc(x_80);
-x_81 = lean_unsigned_to_nat(0u);
-x_82 = lean_nat_dec_lt(x_81, x_68);
-x_83 = 0;
-if (x_82 == 0)
+x_80 = lean_unsigned_to_nat(0u);
+x_81 = lean_nat_dec_lt(x_80, x_68);
+x_82 = 0;
+if (x_81 == 0)
 {
-x_84 = x_5;
-goto block_121;
+x_83 = x_5;
+goto block_120;
 }
 else
 {
-uint8_t x_122; 
-x_122 = lean_nat_dec_le(x_68, x_68);
-if (x_122 == 0)
+uint8_t x_121; 
+x_121 = lean_nat_dec_le(x_68, x_68);
+if (x_121 == 0)
 {
-x_84 = x_5;
-goto block_121;
+x_83 = x_5;
+goto block_120;
 }
 else
 {
-size_t x_123; lean_object* x_124; 
-x_123 = lean_usize_of_nat(x_68);
-x_124 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__7(x_17, x_83, x_123, x_5);
-x_84 = x_124;
-goto block_121;
+size_t x_122; lean_object* x_123; 
+x_122 = lean_usize_of_nat(x_68);
+x_123 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__7(x_17, x_82, x_122, x_5);
+x_83 = x_123;
+goto block_120;
 }
 }
-block_121:
+block_120:
 {
-lean_object* x_85; size_t x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_85 = lean_array_get_size(x_84);
-x_86 = lean_usize_of_nat(x_85);
-lean_dec(x_85);
-x_87 = x_84;
-x_88 = lean_box_usize(x_86);
-x_89 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___boxed__const__1;
-x_90 = lean_alloc_closure((void*)(l_Array_mapMUnsafe_map___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__4___boxed), 10, 3);
-lean_closure_set(x_90, 0, x_88);
-lean_closure_set(x_90, 1, x_89);
-lean_closure_set(x_90, 2, x_87);
-x_91 = x_90;
+lean_object* x_84; size_t x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_84 = lean_array_get_size(x_83);
+x_85 = lean_usize_of_nat(x_84);
+lean_dec(x_84);
+x_86 = x_83;
+x_87 = lean_box_usize(x_85);
+x_88 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___boxed__const__1;
+x_89 = lean_alloc_closure((void*)(l_Array_mapMUnsafe_map___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__4___boxed), 10, 3);
+lean_closure_set(x_89, 0, x_87);
+lean_closure_set(x_89, 1, x_88);
+lean_closure_set(x_89, 2, x_86);
+x_90 = x_89;
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_92 = lean_apply_7(x_91, x_9, x_10, x_11, x_12, x_13, x_14, x_79);
-if (lean_obj_tag(x_92) == 0)
+x_91 = lean_apply_7(x_90, x_9, x_10, x_11, x_12, x_13, x_14, x_78);
+if (lean_obj_tag(x_91) == 0)
 {
-lean_object* x_93; lean_object* x_94; uint8_t x_95; 
-x_93 = lean_ctor_get(x_92, 0);
+lean_object* x_92; lean_object* x_93; uint8_t x_94; 
+x_92 = lean_ctor_get(x_91, 0);
+lean_inc(x_92);
+x_93 = lean_ctor_get(x_91, 1);
 lean_inc(x_93);
-x_94 = lean_ctor_get(x_92, 1);
-lean_inc(x_94);
-lean_dec(x_92);
-x_95 = lean_nat_dec_lt(x_81, x_59);
-if (x_95 == 0)
+lean_dec(x_91);
+x_94 = lean_nat_dec_lt(x_80, x_59);
+if (x_94 == 0)
 {
 lean_dec(x_59);
 lean_dec(x_45);
-if (x_82 == 0)
+if (x_81 == 0)
 {
-lean_object* x_96; 
+lean_object* x_95; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_96 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_80, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_96;
+x_95 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_79, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_95;
 }
 else
 {
-uint8_t x_97; 
-x_97 = lean_nat_dec_le(x_68, x_68);
-if (x_97 == 0)
+uint8_t x_96; 
+x_96 = lean_nat_dec_le(x_68, x_68);
+if (x_96 == 0)
 {
-lean_object* x_98; 
+lean_object* x_97; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_98 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_80, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_98;
+x_97 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_79, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_97;
 }
 else
 {
-size_t x_99; lean_object* x_100; lean_object* x_101; 
-x_99 = lean_usize_of_nat(x_68);
+size_t x_98; lean_object* x_99; lean_object* x_100; 
+x_98 = lean_usize_of_nat(x_68);
 lean_dec(x_68);
-x_100 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_83, x_99, x_80);
+x_99 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_82, x_98, x_79);
 lean_dec(x_17);
-x_101 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_100, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_101;
+x_100 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_99, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_100;
 }
 }
 }
 else
 {
-uint8_t x_102; 
-x_102 = lean_nat_dec_le(x_59, x_59);
-if (x_102 == 0)
+uint8_t x_101; 
+x_101 = lean_nat_dec_le(x_59, x_59);
+if (x_101 == 0)
 {
 lean_dec(x_59);
 lean_dec(x_45);
-if (x_82 == 0)
+if (x_81 == 0)
 {
-lean_object* x_103; 
+lean_object* x_102; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_103 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_80, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_103;
+x_102 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_79, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_102;
 }
 else
 {
-uint8_t x_104; 
-x_104 = lean_nat_dec_le(x_68, x_68);
-if (x_104 == 0)
+uint8_t x_103; 
+x_103 = lean_nat_dec_le(x_68, x_68);
+if (x_103 == 0)
 {
-lean_object* x_105; 
+lean_object* x_104; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_105 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_80, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_105;
+x_104 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_79, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_104;
 }
 else
 {
-size_t x_106; lean_object* x_107; lean_object* x_108; 
-x_106 = lean_usize_of_nat(x_68);
+size_t x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_usize_of_nat(x_68);
 lean_dec(x_68);
-x_107 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_83, x_106, x_80);
+x_106 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_82, x_105, x_79);
 lean_dec(x_17);
-x_108 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_107, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_108;
+x_107 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_106, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_107;
 }
 }
 }
 else
 {
-size_t x_109; lean_object* x_110; 
-x_109 = lean_usize_of_nat(x_59);
+size_t x_108; lean_object* x_109; 
+x_108 = lean_usize_of_nat(x_59);
 lean_dec(x_59);
-x_110 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__6(x_45, x_83, x_109, x_80);
+x_109 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__6(x_45, x_82, x_108, x_79);
 lean_dec(x_45);
-if (x_82 == 0)
+if (x_81 == 0)
 {
-lean_object* x_111; 
+lean_object* x_110; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_111 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_110, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_111;
+x_110 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_109, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_110;
 }
 else
 {
-uint8_t x_112; 
-x_112 = lean_nat_dec_le(x_68, x_68);
-if (x_112 == 0)
+uint8_t x_111; 
+x_111 = lean_nat_dec_le(x_68, x_68);
+if (x_111 == 0)
 {
-lean_object* x_113; 
+lean_object* x_112; 
 lean_dec(x_68);
 lean_dec(x_17);
-x_113 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_110, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_113;
+x_112 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_109, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_112;
 }
 else
 {
-size_t x_114; lean_object* x_115; lean_object* x_116; 
-x_114 = lean_usize_of_nat(x_68);
+size_t x_113; lean_object* x_114; lean_object* x_115; 
+x_113 = lean_usize_of_nat(x_68);
 lean_dec(x_68);
-x_115 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_83, x_114, x_110);
+x_114 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5(x_17, x_82, x_113, x_109);
 lean_dec(x_17);
-x_116 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_115, x_93, x_9, x_10, x_11, x_12, x_13, x_14, x_94);
-return x_116;
+x_115 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults(x_114, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_93);
+return x_115;
 }
 }
 }
@@ -15792,8 +15758,8 @@ return x_116;
 }
 else
 {
-uint8_t x_117; 
-lean_dec(x_80);
+uint8_t x_116; 
+lean_dec(x_79);
 lean_dec(x_68);
 lean_dec(x_59);
 lean_dec(x_45);
@@ -15804,30 +15770,30 @@ lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-x_117 = !lean_is_exclusive(x_92);
-if (x_117 == 0)
+x_116 = !lean_is_exclusive(x_91);
+if (x_116 == 0)
 {
-return x_92;
+return x_91;
 }
 else
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; 
-x_118 = lean_ctor_get(x_92, 0);
-x_119 = lean_ctor_get(x_92, 1);
-lean_inc(x_119);
+lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+x_117 = lean_ctor_get(x_91, 0);
+x_118 = lean_ctor_get(x_91, 1);
 lean_inc(x_118);
-lean_dec(x_92);
-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;
+lean_inc(x_117);
+lean_dec(x_91);
+x_119 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_119, 0, x_117);
+lean_ctor_set(x_119, 1, x_118);
+return x_119;
 }
 }
 }
 }
 else
 {
-uint8_t x_125; 
+uint8_t x_124; 
 lean_dec(x_68);
 lean_dec(x_59);
 lean_dec(x_45);
@@ -15839,29 +15805,29 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_125 = !lean_is_exclusive(x_78);
-if (x_125 == 0)
+x_124 = !lean_is_exclusive(x_77);
+if (x_124 == 0)
 {
-return x_78;
+return x_77;
 }
 else
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-x_126 = lean_ctor_get(x_78, 0);
-x_127 = lean_ctor_get(x_78, 1);
-lean_inc(x_127);
+lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+x_125 = lean_ctor_get(x_77, 0);
+x_126 = lean_ctor_get(x_77, 1);
 lean_inc(x_126);
-lean_dec(x_78);
-x_128 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_128, 0, x_126);
-lean_ctor_set(x_128, 1, x_127);
-return x_128;
+lean_inc(x_125);
+lean_dec(x_77);
+x_127 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_127, 0, x_125);
+lean_ctor_set(x_127, 1, x_126);
+return x_127;
 }
 }
 }
 else
 {
-uint8_t x_129; 
+uint8_t x_128; 
 lean_dec(x_72);
 lean_dec(x_68);
 lean_dec(x_59);
@@ -15874,75 +15840,75 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_129 = !lean_is_exclusive(x_76);
-if (x_129 == 0)
+x_128 = !lean_is_exclusive(x_75);
+if (x_128 == 0)
 {
-return x_76;
+return x_75;
 }
 else
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-x_130 = lean_ctor_get(x_76, 0);
-x_131 = lean_ctor_get(x_76, 1);
-lean_inc(x_131);
+lean_object* x_129; lean_object* x_130; lean_object* x_131; 
+x_129 = lean_ctor_get(x_75, 0);
+x_130 = lean_ctor_get(x_75, 1);
 lean_inc(x_130);
-lean_dec(x_76);
-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;
+lean_inc(x_129);
+lean_dec(x_75);
+x_131 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_131, 0, x_129);
+lean_ctor_set(x_131, 1, x_130);
+return x_131;
 }
 }
 }
-block_163:
+block_162:
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_array_to_list(lean_box(0), x_137);
-x_139 = l_List_map___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__8(x_138);
+lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+x_137 = lean_array_to_list(lean_box(0), x_136);
+x_138 = l_List_map___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__8(x_137);
 lean_inc(x_9);
 lean_inc(x_55);
-x_140 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addProjections(x_55, x_139, x_136, x_9, x_10, x_11, x_12, x_13, x_14, x_67);
-if (lean_obj_tag(x_140) == 0)
+x_139 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addProjections(x_55, x_138, x_135, x_9, x_10, x_11, x_12, x_13, x_14, x_67);
+if (lean_obj_tag(x_139) == 0)
 {
-lean_object* x_141; lean_object* x_142; 
-x_141 = lean_ctor_get(x_140, 1);
-lean_inc(x_141);
-lean_dec(x_140);
+lean_object* x_140; lean_object* x_141; 
+x_140 = lean_ctor_get(x_139, 1);
+lean_inc(x_140);
+lean_dec(x_139);
 lean_inc(x_13);
 lean_inc(x_9);
-x_142 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_mkAuxConstructions(x_55, x_9, x_10, x_11, x_12, x_13, x_14, x_141);
-if (lean_obj_tag(x_142) == 0)
+x_141 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_mkAuxConstructions(x_55, x_9, x_10, x_11, x_12, x_13, x_14, x_140);
+if (lean_obj_tag(x_141) == 0)
 {
-if (x_135 == 0)
+if (x_134 == 0)
 {
-lean_object* x_143; 
-x_143 = lean_ctor_get(x_142, 1);
+lean_object* x_142; 
+x_142 = lean_ctor_get(x_141, 1);
+lean_inc(x_142);
+lean_dec(x_141);
+lean_inc(x_5);
+x_69 = x_5;
+x_70 = x_142;
+goto block_132;
+}
+else
+{
+lean_object* x_143; uint8_t x_144; 
+x_143 = lean_ctor_get(x_141, 1);
 lean_inc(x_143);
-lean_dec(x_142);
+lean_dec(x_141);
+x_144 = lean_nat_dec_le(x_68, x_68);
+if (x_144 == 0)
+{
 lean_inc(x_5);
 x_69 = x_5;
 x_70 = x_143;
-goto block_133;
+goto block_132;
 }
 else
 {
-lean_object* x_144; uint8_t x_145; 
-x_144 = lean_ctor_get(x_142, 1);
-lean_inc(x_144);
-lean_dec(x_142);
-x_145 = lean_nat_dec_le(x_68, x_68);
-if (x_145 == 0)
-{
-lean_inc(x_5);
-x_69 = x_5;
-x_70 = x_144;
-goto block_133;
-}
-else
-{
-size_t x_146; size_t x_147; lean_object* x_148; 
-x_146 = 0;
-x_147 = lean_usize_of_nat(x_68);
+size_t x_145; size_t x_146; lean_object* x_147; 
+x_145 = 0;
+x_146 = lean_usize_of_nat(x_68);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
@@ -15950,22 +15916,22 @@ lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_5);
-x_148 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__9(x_17, x_146, x_147, x_5, x_9, x_10, x_11, x_12, x_13, x_14, x_144);
-if (lean_obj_tag(x_148) == 0)
+x_147 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__9(x_17, x_145, x_146, x_5, x_9, x_10, x_11, x_12, x_13, x_14, x_143);
+if (lean_obj_tag(x_147) == 0)
 {
-lean_object* x_149; lean_object* x_150; 
-x_149 = lean_ctor_get(x_148, 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);
-x_150 = lean_ctor_get(x_148, 1);
-lean_inc(x_150);
-lean_dec(x_148);
-x_69 = x_149;
-x_70 = x_150;
-goto block_133;
+lean_dec(x_147);
+x_69 = x_148;
+x_70 = x_149;
+goto block_132;
 }
 else
 {
-uint8_t x_151; 
+uint8_t x_150; 
 lean_dec(x_68);
 lean_dec(x_61);
 lean_dec(x_59);
@@ -15979,23 +15945,23 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_151 = !lean_is_exclusive(x_148);
-if (x_151 == 0)
+x_150 = !lean_is_exclusive(x_147);
+if (x_150 == 0)
 {
-return x_148;
+return x_147;
 }
 else
 {
-lean_object* x_152; lean_object* x_153; lean_object* x_154; 
-x_152 = lean_ctor_get(x_148, 0);
-x_153 = lean_ctor_get(x_148, 1);
-lean_inc(x_153);
+lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+x_151 = lean_ctor_get(x_147, 0);
+x_152 = lean_ctor_get(x_147, 1);
 lean_inc(x_152);
-lean_dec(x_148);
-x_154 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_154, 0, x_152);
-lean_ctor_set(x_154, 1, x_153);
-return x_154;
+lean_inc(x_151);
+lean_dec(x_147);
+x_153 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_153, 0, x_151);
+lean_ctor_set(x_153, 1, x_152);
+return x_153;
 }
 }
 }
@@ -16003,7 +15969,7 @@ return x_154;
 }
 else
 {
-uint8_t x_155; 
+uint8_t x_154; 
 lean_dec(x_68);
 lean_dec(x_61);
 lean_dec(x_59);
@@ -16017,29 +15983,29 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_155 = !lean_is_exclusive(x_142);
-if (x_155 == 0)
+x_154 = !lean_is_exclusive(x_141);
+if (x_154 == 0)
 {
-return x_142;
+return x_141;
 }
 else
 {
-lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_156 = lean_ctor_get(x_142, 0);
-x_157 = lean_ctor_get(x_142, 1);
-lean_inc(x_157);
+lean_object* x_155; lean_object* x_156; lean_object* x_157; 
+x_155 = lean_ctor_get(x_141, 0);
+x_156 = lean_ctor_get(x_141, 1);
 lean_inc(x_156);
-lean_dec(x_142);
-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;
+lean_inc(x_155);
+lean_dec(x_141);
+x_157 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_157, 0, x_155);
+lean_ctor_set(x_157, 1, x_156);
+return x_157;
 }
 }
 }
 else
 {
-uint8_t x_159; 
+uint8_t x_158; 
 lean_dec(x_68);
 lean_dec(x_61);
 lean_dec(x_59);
@@ -16053,30 +16019,30 @@ lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
-x_159 = !lean_is_exclusive(x_140);
-if (x_159 == 0)
+x_158 = !lean_is_exclusive(x_139);
+if (x_158 == 0)
 {
-return x_140;
+return x_139;
 }
 else
 {
-lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-x_160 = lean_ctor_get(x_140, 0);
-x_161 = lean_ctor_get(x_140, 1);
-lean_inc(x_161);
+lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_159 = lean_ctor_get(x_139, 0);
+x_160 = lean_ctor_get(x_139, 1);
 lean_inc(x_160);
-lean_dec(x_140);
-x_162 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_162, 0, x_160);
-lean_ctor_set(x_162, 1, x_161);
-return x_162;
+lean_inc(x_159);
+lean_dec(x_139);
+x_161 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_161, 0, x_159);
+lean_ctor_set(x_161, 1, x_160);
+return x_161;
 }
 }
 }
 }
 else
 {
-uint8_t x_168; 
+uint8_t x_167; 
 lean_dec(x_61);
 lean_dec(x_59);
 lean_dec(x_55);
@@ -16090,29 +16056,29 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_3);
-x_168 = !lean_is_exclusive(x_66);
-if (x_168 == 0)
+x_167 = !lean_is_exclusive(x_66);
+if (x_167 == 0)
 {
 return x_66;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-x_169 = lean_ctor_get(x_66, 0);
-x_170 = lean_ctor_get(x_66, 1);
-lean_inc(x_170);
+lean_object* x_168; lean_object* x_169; lean_object* x_170; 
+x_168 = lean_ctor_get(x_66, 0);
+x_169 = lean_ctor_get(x_66, 1);
 lean_inc(x_169);
+lean_inc(x_168);
 lean_dec(x_66);
-x_171 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_171, 0, x_169);
-lean_ctor_set(x_171, 1, x_170);
-return x_171;
+x_170 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_170, 0, x_168);
+lean_ctor_set(x_170, 1, x_169);
+return x_170;
 }
 }
 }
 else
 {
-uint8_t x_172; 
+uint8_t x_171; 
 lean_dec(x_63);
 lean_dec(x_61);
 lean_dec(x_59);
@@ -16127,29 +16093,29 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_3);
-x_172 = !lean_is_exclusive(x_64);
-if (x_172 == 0)
+x_171 = !lean_is_exclusive(x_64);
+if (x_171 == 0)
 {
 return x_64;
 }
 else
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; 
-x_173 = lean_ctor_get(x_64, 0);
-x_174 = lean_ctor_get(x_64, 1);
-lean_inc(x_174);
+lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_172 = lean_ctor_get(x_64, 0);
+x_173 = lean_ctor_get(x_64, 1);
 lean_inc(x_173);
+lean_inc(x_172);
 lean_dec(x_64);
-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;
+x_174 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_174, 0, x_172);
+lean_ctor_set(x_174, 1, x_173);
+return x_174;
 }
 }
 }
 else
 {
-uint8_t x_176; 
+uint8_t x_175; 
 lean_dec(x_47);
 lean_dec(x_45);
 lean_dec(x_44);
@@ -16162,29 +16128,29 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_3);
-x_176 = !lean_is_exclusive(x_52);
-if (x_176 == 0)
+x_175 = !lean_is_exclusive(x_52);
+if (x_175 == 0)
 {
 return x_52;
 }
 else
 {
-lean_object* x_177; lean_object* x_178; lean_object* x_179; 
-x_177 = lean_ctor_get(x_52, 0);
-x_178 = lean_ctor_get(x_52, 1);
-lean_inc(x_178);
+lean_object* x_176; lean_object* x_177; lean_object* x_178; 
+x_176 = lean_ctor_get(x_52, 0);
+x_177 = lean_ctor_get(x_52, 1);
 lean_inc(x_177);
+lean_inc(x_176);
 lean_dec(x_52);
-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;
+x_178 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_178, 0, x_176);
+lean_ctor_set(x_178, 1, x_177);
+return x_178;
 }
 }
 }
 else
 {
-uint8_t x_180; 
+uint8_t x_179; 
 lean_dec(x_47);
 lean_dec(x_45);
 lean_dec(x_44);
@@ -16197,29 +16163,29 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_3);
-x_180 = !lean_is_exclusive(x_49);
-if (x_180 == 0)
+x_179 = !lean_is_exclusive(x_49);
+if (x_179 == 0)
 {
 return x_49;
 }
 else
 {
-lean_object* x_181; lean_object* x_182; lean_object* x_183; 
-x_181 = lean_ctor_get(x_49, 0);
-x_182 = lean_ctor_get(x_49, 1);
-lean_inc(x_182);
+lean_object* x_180; lean_object* x_181; lean_object* x_182; 
+x_180 = lean_ctor_get(x_49, 0);
+x_181 = lean_ctor_get(x_49, 1);
 lean_inc(x_181);
+lean_inc(x_180);
 lean_dec(x_49);
-x_183 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_183, 0, x_181);
-lean_ctor_set(x_183, 1, x_182);
-return x_183;
+x_182 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_182, 0, x_180);
+lean_ctor_set(x_182, 1, x_181);
+return x_182;
 }
 }
 }
 else
 {
-uint8_t x_184; 
+uint8_t x_183; 
 lean_dec(x_45);
 lean_dec(x_44);
 lean_dec(x_19);
@@ -16232,30 +16198,30 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_3);
-x_184 = !lean_is_exclusive(x_46);
-if (x_184 == 0)
+x_183 = !lean_is_exclusive(x_46);
+if (x_183 == 0)
 {
 return x_46;
 }
 else
 {
-lean_object* x_185; lean_object* x_186; lean_object* x_187; 
-x_185 = lean_ctor_get(x_46, 0);
-x_186 = lean_ctor_get(x_46, 1);
-lean_inc(x_186);
+lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_184 = lean_ctor_get(x_46, 0);
+x_185 = lean_ctor_get(x_46, 1);
 lean_inc(x_185);
+lean_inc(x_184);
 lean_dec(x_46);
-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_186 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_186, 0, x_184);
+lean_ctor_set(x_186, 1, x_185);
+return x_186;
 }
 }
 }
 }
 else
 {
-uint8_t x_188; 
+uint8_t x_187; 
 lean_dec(x_19);
 lean_dec(x_17);
 lean_dec(x_14);
@@ -16267,61 +16233,61 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_3);
-x_188 = !lean_is_exclusive(x_22);
-if (x_188 == 0)
+x_187 = !lean_is_exclusive(x_22);
+if (x_187 == 0)
 {
 return x_22;
 }
 else
 {
-lean_object* x_189; lean_object* x_190; lean_object* x_191; 
-x_189 = lean_ctor_get(x_22, 0);
-x_190 = lean_ctor_get(x_22, 1);
-lean_inc(x_190);
+lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_188 = lean_ctor_get(x_22, 0);
+x_189 = lean_ctor_get(x_22, 1);
 lean_inc(x_189);
+lean_inc(x_188);
 lean_dec(x_22);
-x_191 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_191, 0, x_189);
-lean_ctor_set(x_191, 1, x_190);
-return x_191;
+x_190 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_190, 0, x_188);
+lean_ctor_set(x_190, 1, x_189);
+return x_190;
 }
 }
 }
-block_203:
+block_202:
 {
-if (x_193 == 0)
+if (x_192 == 0)
 {
-x_21 = x_194;
-goto block_192;
+x_21 = x_193;
+goto block_191;
 }
 else
 {
-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_201; lean_object* x_202; 
+lean_object* x_194; 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_201; 
 lean_inc(x_19);
-x_195 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_195, 0, x_19);
-x_196 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__4;
-x_197 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_197, 0, x_196);
-lean_ctor_set(x_197, 1, x_195);
-x_198 = l_Lean_KernelException_toMessageData___closed__15;
-x_199 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_199, 0, x_197);
-lean_ctor_set(x_199, 1, x_198);
-x_200 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__2;
-x_201 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_200, x_199, x_9, x_10, x_11, x_12, x_13, x_14, x_194);
-x_202 = lean_ctor_get(x_201, 1);
-lean_inc(x_202);
-lean_dec(x_201);
-x_21 = x_202;
-goto block_192;
+x_194 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_194, 0, x_19);
+x_195 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__4;
+x_196 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_196, 0, x_195);
+lean_ctor_set(x_196, 1, x_194);
+x_197 = l_Lean_KernelException_toMessageData___closed__15;
+x_198 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_198, 0, x_196);
+lean_ctor_set(x_198, 1, x_197);
+x_199 = l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___lambda__1___closed__2;
+x_200 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_199, x_198, x_9, x_10, x_11, x_12, x_13, x_14, x_193);
+x_201 = lean_ctor_get(x_200, 1);
+lean_inc(x_201);
+lean_dec(x_200);
+x_21 = x_201;
+goto block_191;
 }
 }
 }
 }
 else
 {
-uint8_t x_245; 
+uint8_t x_244; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -16332,23 +16298,23 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_3);
-x_245 = !lean_is_exclusive(x_16);
-if (x_245 == 0)
+x_244 = !lean_is_exclusive(x_16);
+if (x_244 == 0)
 {
 return x_16;
 }
 else
 {
-lean_object* x_246; lean_object* x_247; lean_object* x_248; 
-x_246 = lean_ctor_get(x_16, 0);
-x_247 = lean_ctor_get(x_16, 1);
-lean_inc(x_247);
+lean_object* x_245; lean_object* x_246; lean_object* x_247; 
+x_245 = lean_ctor_get(x_16, 0);
+x_246 = lean_ctor_get(x_16, 1);
 lean_inc(x_246);
+lean_inc(x_245);
 lean_dec(x_16);
-x_248 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_248, 0, x_246);
-lean_ctor_set(x_248, 1, x_247);
-return x_248;
+x_247 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_247, 0, x_245);
+lean_ctor_set(x_247, 1, x_246);
+return x_247;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/Syntax.c b/stage0/stdlib/Lean/Elab/Syntax.c
index a277cf45bc..9c333e8f81 100644
--- a/stage0/stdlib/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Lean/Elab/Syntax.c
@@ -117,6 +117,7 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__5;
 lean_object* l_Lean_Elab_Command_elabSyntax_match__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__13;
 extern lean_object* l_Lean_Elab_throwUnsupportedSyntax___rarg___closed__1;
+lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabMacroRulesAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
 lean_object* l_Lean_Elab_Command_expandElab___closed__12;
@@ -160,6 +161,7 @@ extern lean_object* l___regBuiltin_Lean_Elab_Term_Quotation_elabTacticQuot___clo
 lean_object* lean_environment_find(lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__26;
 lean_object* l_Lean_Elab_Command_expandMixfix___closed__24;
+lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__15;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
@@ -211,7 +213,6 @@ lean_object* l_Lean_Elab_Command_mkSimpleDelab_go___closed__26;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__2___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__33;
 uint8_t l_Char_isWhitespace(uint32_t);
-lean_object* l_Lean_Elab_Command_expandMixfix___closed__35;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_elabKindPrio___closed__3;
 lean_object* l_Lean_Elab_Command_mkSimpleDelab_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkSimpleDelab___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -249,7 +250,6 @@ lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__12;
 lean_object* l_Lean_Elab_Command_mkNameFromParserSyntax(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_USize_decLt(size_t, size_t);
-lean_object* l_Lean_Elab_Command_expandMixfix___closed__39;
 lean_object* l_Lean_Elab_Command_expandMacro___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__29;
 lean_object* l_Lean_Elab_Command_expandElab___closed__17;
@@ -272,7 +272,6 @@ lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Term_toParserDescrAux___spe
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_getVarDecls(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_checkLeftRec___spec__2(lean_object*);
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_expandMixfix___closed__38;
 lean_object* l_Lean_Elab_Command_expandMixfix___closed__21;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__27;
 lean_object* l_Lean_Elab_Command_expandElab___closed__28;
@@ -389,7 +388,7 @@ lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQ
 lean_object* l_Lean_Elab_Term_toParserDescrAux_match__5___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_capitalize(lean_object*);
 lean_object* l___private_Lean_Elab_Util_0__Lean_Elab_expandMacro_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534_(lean_object*);
+lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558_(lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax_match__2___rarg(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__8;
 lean_object* l_Lean_Elab_Command_expandElab___closed__26;
@@ -641,10 +640,10 @@ extern lean_object* l_myMacro____x40_Init_Notation___hyg_9707____closed__17;
 lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Command_mkSimpleDelab_go___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMixfix___closed__17;
 uint8_t l_Lean_Parser_isParserCategory(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux_match__3(lean_object*);
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Elab_instToFormatAttribute___closed__4;
 lean_object* l_Lean_Elab_Term_checkLeftRec___lambda__2___closed__4;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__31;
 lean_object* l_Lean_Parser_ensureConstantParserAlias(lean_object*, lean_object*);
@@ -667,8 +666,6 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__24;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___closed__21;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___closed__38;
 lean_object* l_Lean_Elab_Command_expandElab___closed__48;
-lean_object* l_Lean_Elab_Command_expandMixfix___closed__36;
-lean_object* l_Lean_Elab_Command_expandMixfix___closed__37;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Term_withNestedParser___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_checkLeftRec(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
@@ -718,6 +715,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___lambda__2(lean_object*, lean_ob
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_11167____closed__4;
 lean_object* l_Lean_Elab_Command_withExpectedType_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax_match__3(lean_object*);
+extern lean_object* l_Lean_Elab_toAttributeKind___closed__1;
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* l_Lean_Elab_Command_elabNoKindMacroRulesAux___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandElab___closed__51;
@@ -735,6 +733,7 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___lambda__1(lean_object*, lea
 lean_object* l_Lean_Elab_Command_elabSyntaxAbbrev___closed__4;
 lean_object* l_Lean_throwUnknownConstant___at_Lean_Elab_Term_toParserDescrAux___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__3;
+extern lean_object* l_Lean_Elab_toAttributeKind___closed__2;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___closed__17;
 lean_object* l_Lean_Elab_Term_expandOptPrecedence(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___closed__4;
@@ -875,7 +874,6 @@ lean_object* l_Lean_Elab_Command_expandMacroArgIntoSyntaxItem___boxed(lean_objec
 lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24;
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabMacroRulesAux___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Command_mkSimpleDelab_go___closed__27;
-lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1;
 lean_object* l_Lean_Elab_Command_elabDeclareSyntaxCat(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_mkMacroAttributeUnsafe___closed__8;
 extern lean_object* l_Array_findSomeM_x3f___rarg___closed__1;
@@ -11940,7 +11938,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_2 = l_Lean_Elab_instToFormatAttribute___closed__4;
+x_2 = l_Lean_Elab_toAttributeKind___closed__1;
 x_3 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -11961,7 +11959,7 @@ static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__9
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_nullKind___closed__2;
+x_1 = l_Lean_Elab_toAttributeKind___closed__2;
 x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__8;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -11982,27 +11980,49 @@ return x_3;
 static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__11() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("Lean.TrailingParserDescr");
-return x_1;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_nullKind___closed__2;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__10;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__11;
-x_2 = lean_string_utf8_byte_size(x_1);
-return x_2;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Array_empty___closed__1;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__11;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__13() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("Lean.TrailingParserDescr");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__13;
+x_2 = lean_string_utf8_byte_size(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__15() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__11;
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__13;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
+x_3 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -12010,7 +12030,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -12020,31 +12040,31 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__15() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__18() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__15;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__17;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__17() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19() {
 _start:
 {
 lean_object* x_1; 
@@ -12052,22 +12072,22 @@ x_1 = lean_mk_string("ParserDescr.trailingNode");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__18() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__20() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__17;
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__17;
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__18;
+x_3 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__20;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -12075,7 +12095,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__20() {
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__22() {
 _start:
 {
 lean_object* x_1; 
@@ -12083,35 +12103,13 @@ x_1 = lean_mk_string("trailingNode");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__4;
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__20;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__22() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__6;
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__20;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
 static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
+x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__4;
 x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__22;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
+x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
@@ -12119,8 +12117,30 @@ static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__2
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Subarray_forInUnsafe_loop___at___private_Lean_Elab_Syntax_0__Lean_Elab_Term_mkParserSeq___spec__1___closed__6;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__22;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23;
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -12336,7 +12356,7 @@ lean_inc(x_124);
 x_125 = lean_ctor_get(x_123, 1);
 lean_inc(x_125);
 lean_dec(x_123);
-x_126 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__10;
+x_126 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
 x_127 = lean_array_push(x_126, x_18);
 x_128 = l_Nat_repr(x_5);
 x_129 = l_Lean_numLitKind;
@@ -12518,12 +12538,12 @@ lean_ctor_set(x_240, 1, x_238);
 x_241 = lean_array_push(x_216, x_240);
 x_242 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__22;
 x_243 = lean_array_push(x_242, x_35);
-x_244 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14;
+x_244 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16;
 lean_inc(x_205);
 lean_inc(x_208);
 x_245 = l_Lean_addMacroScope(x_208, x_244, x_205);
-x_246 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__13;
-x_247 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16;
+x_246 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__15;
+x_247 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__18;
 x_248 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_248, 0, x_214);
 lean_ctor_set(x_248, 1, x_246);
@@ -12545,10 +12565,10 @@ x_257 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_257, 0, x_256);
 lean_ctor_set(x_257, 1, x_255);
 x_258 = lean_array_push(x_243, x_257);
-x_259 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21;
+x_259 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23;
 x_260 = l_Lean_addMacroScope(x_208, x_259, x_205);
-x_261 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19;
-x_262 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24;
+x_261 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21;
+x_262 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26;
 x_263 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_263, 0, x_214);
 lean_ctor_set(x_263, 1, x_261);
@@ -12604,7 +12624,7 @@ lean_inc(x_291);
 x_292 = lean_ctor_get(x_290, 1);
 lean_inc(x_292);
 lean_dec(x_290);
-x_293 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__10;
+x_293 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
 x_294 = lean_array_push(x_293, x_18);
 x_295 = l_Nat_repr(x_5);
 x_296 = l_Lean_numLitKind;
@@ -12651,12 +12671,12 @@ lean_ctor_set(x_324, 1, x_322);
 x_325 = lean_array_push(x_299, x_324);
 x_326 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__22;
 x_327 = lean_array_push(x_326, x_35);
-x_328 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__14;
+x_328 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16;
 lean_inc(x_288);
 lean_inc(x_291);
 x_329 = l_Lean_addMacroScope(x_291, x_328, x_288);
-x_330 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__13;
-x_331 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__16;
+x_330 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__15;
+x_331 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__18;
 x_332 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_332, 0, x_297);
 lean_ctor_set(x_332, 1, x_330);
@@ -12678,10 +12698,10 @@ x_341 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_341, 0, x_340);
 lean_ctor_set(x_341, 1, x_339);
 x_342 = lean_array_push(x_327, x_341);
-x_343 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21;
+x_343 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23;
 x_344 = l_Lean_addMacroScope(x_291, x_343, x_288);
-x_345 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__19;
-x_346 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24;
+x_345 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__21;
+x_346 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26;
 x_347 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_347, 0, x_297);
 lean_ctor_set(x_347, 1, x_345);
@@ -16302,32 +16322,22 @@ return x_3;
 static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_instToFormatAttribute___closed__4;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__4() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("prefix");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__5() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__4;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__6() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__5() {
 _start:
 {
 lean_object* x_1; 
@@ -16335,17 +16345,17 @@ x_1 = lean_mk_string("postfix");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__7() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__6;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__5;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__8() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -16353,17 +16363,17 @@ x_1 = lean_mk_string("precedence");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__9() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_myMacro____x40_Init_Notation___hyg_38____closed__4;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__8;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__7;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__10() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__9() {
 _start:
 {
 lean_object* x_1; 
@@ -16371,101 +16381,57 @@ x_1 = lean_mk_string("notation");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__11() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__10;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__9;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__11() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_instInhabitedSourceInfo___closed__1;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_3 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
 static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__3;
-x_2 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__8;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
 static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__13() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__12;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__14() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_nullKind___closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__13;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__15() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__14;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__16() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__10;
-x_3 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__17() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__15;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__16;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__18() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("identPrec");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__19() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__18;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__13;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__20() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__15() {
 _start:
 {
 lean_object* x_1; 
@@ -16473,22 +16439,22 @@ x_1 = lean_mk_string("arg");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__21() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__20;
+x_1 = l_Lean_Elab_Command_expandMixfix___closed__15;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__22() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__20;
+x_1 = l_Lean_Elab_Command_expandMixfix___closed__15;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Command_expandMixfix___closed__21;
+x_3 = l_Lean_Elab_Command_expandMixfix___closed__16;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -16496,17 +16462,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__23() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__18() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__20;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__15;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__24() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__19() {
 _start:
 {
 lean_object* x_1; 
@@ -16514,17 +16480,17 @@ x_1 = lean_mk_string("infixr");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__25() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__20() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__24;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__19;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__26() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__21() {
 _start:
 {
 lean_object* x_1; 
@@ -16532,17 +16498,17 @@ x_1 = lean_mk_string("infixl");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__27() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__22() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__26;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__21;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__28() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__23() {
 _start:
 {
 lean_object* x_1; 
@@ -16550,22 +16516,22 @@ x_1 = lean_mk_string("lhs");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__29() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__28;
+x_1 = l_Lean_Elab_Command_expandMixfix___closed__23;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__30() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__25() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__28;
+x_1 = l_Lean_Elab_Command_expandMixfix___closed__23;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Command_expandMixfix___closed__29;
+x_3 = l_Lean_Elab_Command_expandMixfix___closed__24;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -16573,17 +16539,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__31() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__26() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__28;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__23;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__32() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__27() {
 _start:
 {
 lean_object* x_1; 
@@ -16591,76 +16557,76 @@ x_1 = lean_mk_string("infix");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__33() {
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__28() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__2;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__32;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__27;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__29() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_instInhabitedSourceInfo___closed__1;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__21;
+x_3 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__30() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Array_empty___closed__1;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__29;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__31() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__32() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__33() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__7;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
 static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__34() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__26;
-x_3 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__35() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__34;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__36() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__27;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__35;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__37() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__15;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__36;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__38() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__7;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__16;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Elab_Command_expandMixfix___closed__39() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1121____closed__7;
-x_2 = l_Lean_Elab_Command_expandMixfix___closed__36;
+x_2 = l_Lean_Elab_Command_expandMixfix___closed__31;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -16739,7 +16705,7 @@ lean_object* x_731; lean_object* x_732; lean_object* x_733; lean_object* x_1004;
 lean_dec(x_15);
 x_731 = lean_unsigned_to_nat(1u);
 x_732 = l_Lean_Syntax_getArg(x_1, x_731);
-x_1327 = l_Lean_Elab_Command_expandMixfix___closed__33;
+x_1327 = l_Lean_Elab_Command_expandMixfix___closed__28;
 lean_inc(x_732);
 x_1328 = l_Lean_Syntax_isOfKind(x_732, x_1327);
 if (x_1328 == 0)
@@ -16808,7 +16774,7 @@ else
 lean_object* x_1344; lean_object* x_1345; uint8_t x_1346; 
 x_1344 = l_Lean_Syntax_getArg(x_1335, x_14);
 lean_dec(x_1335);
-x_1345 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_1345 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_1344);
 x_1346 = l_Lean_Syntax_isOfKind(x_1344, x_1345);
 if (x_1346 == 0)
@@ -16891,7 +16857,7 @@ x_1406 = lean_array_push(x_1405, x_1404);
 x_1407 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1407, 0, x_724);
 lean_ctor_set(x_1407, 1, x_1406);
-x_1408 = l_Lean_Elab_Command_expandMixfix___closed__39;
+x_1408 = l_Lean_Elab_Command_expandMixfix___closed__34;
 x_1409 = lean_array_push(x_1408, x_1407);
 x_1410 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_1411 = lean_array_push(x_1409, x_1410);
@@ -16966,7 +16932,7 @@ x_1375 = lean_array_push(x_1374, x_1373);
 x_1376 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1376, 0, x_724);
 lean_ctor_set(x_1376, 1, x_1375);
-x_1377 = l_Lean_Elab_Command_expandMixfix___closed__39;
+x_1377 = l_Lean_Elab_Command_expandMixfix___closed__34;
 x_1378 = lean_array_push(x_1377, x_1376);
 x_1379 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_1380 = lean_array_push(x_1379, x_1366);
@@ -17000,13 +16966,13 @@ block_1003:
 {
 lean_object* x_734; uint8_t x_735; 
 lean_dec(x_733);
-x_734 = l_Lean_Elab_Command_expandMixfix___closed__5;
+x_734 = l_Lean_Elab_Command_expandMixfix___closed__4;
 lean_inc(x_732);
 x_735 = l_Lean_Syntax_isOfKind(x_732, x_734);
 if (x_735 == 0)
 {
 lean_object* x_736; uint8_t x_737; 
-x_736 = l_Lean_Elab_Command_expandMixfix___closed__7;
+x_736 = l_Lean_Elab_Command_expandMixfix___closed__6;
 lean_inc(x_732);
 x_737 = l_Lean_Syntax_isOfKind(x_732, x_736);
 if (x_737 == 0)
@@ -17085,7 +17051,7 @@ else
 lean_object* x_755; lean_object* x_756; uint8_t x_757; 
 x_755 = l_Lean_Syntax_getArg(x_746, x_14);
 lean_dec(x_746);
-x_756 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_756 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_755);
 x_757 = l_Lean_Syntax_isOfKind(x_755, x_756);
 if (x_757 == 0)
@@ -17175,15 +17141,15 @@ x_841 = lean_array_push(x_840, x_839);
 x_842 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_842, 0, x_724);
 lean_ctor_set(x_842, 1, x_841);
-x_843 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_843 = l_Lean_Elab_Command_expandMixfix___closed__33;
 x_844 = lean_array_push(x_843, x_842);
 x_845 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_846 = lean_array_push(x_844, x_845);
-x_847 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_847 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_848 = l_Lean_addMacroScope(x_836, x_847, x_835);
 x_849 = lean_box(0);
 x_850 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_851 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_851 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_852 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_852, 0, x_850);
 lean_ctor_set(x_852, 1, x_851);
@@ -17192,7 +17158,7 @@ lean_ctor_set(x_852, 3, x_849);
 x_853 = lean_array_push(x_840, x_852);
 lean_inc(x_853);
 x_854 = lean_array_push(x_853, x_845);
-x_855 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_855 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_856 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_856, 0, x_855);
 lean_ctor_set(x_856, 1, x_854);
@@ -17214,7 +17180,7 @@ x_867 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_867, 0, x_866);
 lean_ctor_set(x_867, 1, x_865);
 x_868 = lean_array_push(x_862, x_867);
-x_869 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_869 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_870 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_870, 0, x_869);
 lean_ctor_set(x_870, 1, x_868);
@@ -17289,7 +17255,7 @@ x_788 = lean_array_push(x_787, x_786);
 x_789 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_789, 0, x_724);
 lean_ctor_set(x_789, 1, x_788);
-x_790 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_790 = l_Lean_Elab_Command_expandMixfix___closed__33;
 x_791 = lean_array_push(x_790, x_789);
 x_792 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_793 = lean_array_push(x_792, x_777);
@@ -17299,11 +17265,11 @@ x_796 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_796, 0, x_724);
 lean_ctor_set(x_796, 1, x_795);
 x_797 = lean_array_push(x_791, x_796);
-x_798 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_798 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_799 = l_Lean_addMacroScope(x_783, x_798, x_782);
 x_800 = lean_box(0);
 x_801 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_802 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_802 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_803 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_803, 0, x_801);
 lean_ctor_set(x_803, 1, x_802);
@@ -17313,7 +17279,7 @@ x_804 = lean_array_push(x_787, x_803);
 x_805 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_804);
 x_806 = lean_array_push(x_804, x_805);
-x_807 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_807 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_808 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_808, 0, x_807);
 lean_ctor_set(x_808, 1, x_806);
@@ -17335,7 +17301,7 @@ x_819 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_819, 0, x_818);
 lean_ctor_set(x_819, 1, x_817);
 x_820 = lean_array_push(x_814, x_819);
-x_821 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_821 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_822 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_822, 0, x_821);
 lean_ctor_set(x_822, 1, x_820);
@@ -17417,7 +17383,7 @@ else
 lean_object* x_887; lean_object* x_888; uint8_t x_889; 
 x_887 = l_Lean_Syntax_getArg(x_878, x_14);
 lean_dec(x_878);
-x_888 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_888 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_887);
 x_889 = l_Lean_Syntax_isOfKind(x_887, x_888);
 if (x_889 == 0)
@@ -17507,17 +17473,17 @@ x_972 = lean_array_push(x_971, x_970);
 x_973 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_973, 0, x_724);
 lean_ctor_set(x_973, 1, x_972);
-x_974 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_974 = l_Lean_Elab_Command_expandMixfix___closed__33;
 lean_inc(x_973);
 x_975 = lean_array_push(x_974, x_973);
 x_976 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_977 = lean_array_push(x_975, x_976);
 x_978 = lean_array_push(x_971, x_963);
-x_979 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_979 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_980 = l_Lean_addMacroScope(x_967, x_979, x_966);
 x_981 = lean_box(0);
 x_982 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_983 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_983 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_984 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_984, 0, x_982);
 lean_ctor_set(x_984, 1, x_983);
@@ -17526,7 +17492,7 @@ lean_ctor_set(x_984, 3, x_981);
 x_985 = lean_array_push(x_971, x_984);
 lean_inc(x_985);
 x_986 = lean_array_push(x_985, x_973);
-x_987 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_987 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_988 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_988, 0, x_987);
 lean_ctor_set(x_988, 1, x_986);
@@ -17547,7 +17513,7 @@ x_998 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_998, 0, x_997);
 lean_ctor_set(x_998, 1, x_996);
 x_999 = lean_array_push(x_993, x_998);
-x_1000 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_1000 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_1001 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1001, 0, x_1000);
 lean_ctor_set(x_1001, 1, x_999);
@@ -17622,7 +17588,7 @@ x_920 = lean_array_push(x_919, x_918);
 x_921 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_921, 0, x_724);
 lean_ctor_set(x_921, 1, x_920);
-x_922 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_922 = l_Lean_Elab_Command_expandMixfix___closed__33;
 lean_inc(x_921);
 x_923 = lean_array_push(x_922, x_921);
 x_924 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
@@ -17634,11 +17600,11 @@ lean_ctor_set(x_928, 0, x_724);
 lean_ctor_set(x_928, 1, x_927);
 x_929 = lean_array_push(x_923, x_928);
 x_930 = lean_array_push(x_919, x_911);
-x_931 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_931 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_932 = l_Lean_addMacroScope(x_915, x_931, x_914);
 x_933 = lean_box(0);
 x_934 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_935 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_935 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_936 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_936, 0, x_934);
 lean_ctor_set(x_936, 1, x_935);
@@ -17647,7 +17613,7 @@ lean_ctor_set(x_936, 3, x_933);
 x_937 = lean_array_push(x_919, x_936);
 lean_inc(x_937);
 x_938 = lean_array_push(x_937, x_921);
-x_939 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_939 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_940 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_940, 0, x_939);
 lean_ctor_set(x_940, 1, x_938);
@@ -17668,7 +17634,7 @@ x_950 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_950, 0, x_949);
 lean_ctor_set(x_950, 1, x_948);
 x_951 = lean_array_push(x_945, x_950);
-x_952 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_952 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_953 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_953, 0, x_952);
 lean_ctor_set(x_953, 1, x_951);
@@ -17690,13 +17656,13 @@ block_1326:
 {
 lean_object* x_1005; uint8_t x_1006; 
 lean_dec(x_1004);
-x_1005 = l_Lean_Elab_Command_expandMixfix___closed__25;
+x_1005 = l_Lean_Elab_Command_expandMixfix___closed__20;
 lean_inc(x_732);
 x_1006 = l_Lean_Syntax_isOfKind(x_732, x_1005);
 if (x_1006 == 0)
 {
 lean_object* x_1007; uint8_t x_1008; 
-x_1007 = l_Lean_Elab_Command_expandMixfix___closed__27;
+x_1007 = l_Lean_Elab_Command_expandMixfix___closed__22;
 lean_inc(x_732);
 x_1008 = l_Lean_Syntax_isOfKind(x_732, x_1007);
 if (x_1008 == 0)
@@ -17766,7 +17732,7 @@ else
 lean_object* x_1024; lean_object* x_1025; uint8_t x_1026; 
 x_1024 = l_Lean_Syntax_getArg(x_1015, x_14);
 lean_dec(x_1015);
-x_1025 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_1025 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_1024);
 x_1026 = l_Lean_Syntax_isOfKind(x_1024, x_1025);
 if (x_1026 == 0)
@@ -17863,16 +17829,16 @@ x_1134 = lean_array_push(x_1133, x_1132);
 x_1135 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1135, 0, x_724);
 lean_ctor_set(x_1135, 1, x_1134);
-x_1136 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_1136 = l_Lean_Elab_Command_expandMixfix___closed__33;
 x_1137 = lean_array_push(x_1136, x_1135);
 x_1138 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_1139 = lean_array_push(x_1137, x_1138);
-x_1140 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_1140 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_1128);
 lean_inc(x_1129);
 x_1141 = l_Lean_addMacroScope(x_1129, x_1140, x_1128);
 x_1142 = lean_box(0);
-x_1143 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_1143 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_1144 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_1144, 0, x_1126);
 lean_ctor_set(x_1144, 1, x_1143);
@@ -17881,7 +17847,7 @@ lean_ctor_set(x_1144, 3, x_1142);
 x_1145 = lean_array_push(x_1133, x_1144);
 lean_inc(x_1145);
 x_1146 = lean_array_push(x_1145, x_1138);
-x_1147 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_1147 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_1148 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1148, 0, x_1147);
 lean_ctor_set(x_1148, 1, x_1146);
@@ -17927,7 +17893,7 @@ x_1172 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1172, 0, x_1171);
 lean_ctor_set(x_1172, 1, x_1170);
 x_1173 = lean_array_push(x_1166, x_1172);
-x_1174 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_1174 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_1175 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1175, 0, x_1174);
 lean_ctor_set(x_1175, 1, x_1173);
@@ -18009,7 +17975,7 @@ x_1063 = lean_array_push(x_1062, x_1061);
 x_1064 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1064, 0, x_724);
 lean_ctor_set(x_1064, 1, x_1063);
-x_1065 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_1065 = l_Lean_Elab_Command_expandMixfix___closed__33;
 x_1066 = lean_array_push(x_1065, x_1064);
 x_1067 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_1068 = lean_array_push(x_1067, x_1046);
@@ -18019,12 +17985,12 @@ x_1071 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1071, 0, x_724);
 lean_ctor_set(x_1071, 1, x_1070);
 x_1072 = lean_array_push(x_1066, x_1071);
-x_1073 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_1073 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_1057);
 lean_inc(x_1058);
 x_1074 = l_Lean_addMacroScope(x_1058, x_1073, x_1057);
 x_1075 = lean_box(0);
-x_1076 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_1076 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_1077 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_1077, 0, x_1055);
 lean_ctor_set(x_1077, 1, x_1076);
@@ -18034,7 +18000,7 @@ x_1078 = lean_array_push(x_1062, x_1077);
 x_1079 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_1078);
 x_1080 = lean_array_push(x_1078, x_1079);
-x_1081 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_1081 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_1082 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1082, 0, x_1081);
 lean_ctor_set(x_1082, 1, x_1080);
@@ -18080,7 +18046,7 @@ x_1106 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1106, 0, x_1105);
 lean_ctor_set(x_1106, 1, x_1104);
 x_1107 = lean_array_push(x_1100, x_1106);
-x_1108 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_1108 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_1109 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1109, 0, x_1108);
 lean_ctor_set(x_1109, 1, x_1107);
@@ -18158,7 +18124,7 @@ else
 lean_object* x_1191; lean_object* x_1192; uint8_t x_1193; 
 x_1191 = l_Lean_Syntax_getArg(x_1182, x_14);
 lean_dec(x_1182);
-x_1192 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_1192 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_1191);
 x_1193 = l_Lean_Syntax_isOfKind(x_1191, x_1192);
 if (x_1193 == 0)
@@ -18248,18 +18214,18 @@ x_1286 = lean_array_push(x_1285, x_1284);
 x_1287 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1287, 0, x_724);
 lean_ctor_set(x_1287, 1, x_1286);
-x_1288 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_1288 = l_Lean_Elab_Command_expandMixfix___closed__33;
 lean_inc(x_1287);
 x_1289 = lean_array_push(x_1288, x_1287);
 x_1290 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_1291 = lean_array_push(x_1289, x_1290);
-x_1292 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_1292 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_1280);
 lean_inc(x_1281);
 x_1293 = l_Lean_addMacroScope(x_1281, x_1292, x_1280);
 x_1294 = lean_box(0);
 x_1295 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_1296 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_1296 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_1297 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_1297, 0, x_1295);
 lean_ctor_set(x_1297, 1, x_1296);
@@ -18268,7 +18234,7 @@ lean_ctor_set(x_1297, 3, x_1294);
 x_1298 = lean_array_push(x_1285, x_1297);
 lean_inc(x_1298);
 x_1299 = lean_array_push(x_1298, x_1290);
-x_1300 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_1300 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_1301 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1301, 0, x_1300);
 lean_ctor_set(x_1301, 1, x_1299);
@@ -18306,7 +18272,7 @@ x_1321 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1321, 0, x_1320);
 lean_ctor_set(x_1321, 1, x_1319);
 x_1322 = lean_array_push(x_1315, x_1321);
-x_1323 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_1323 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_1324 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1324, 0, x_1323);
 lean_ctor_set(x_1324, 1, x_1322);
@@ -18381,7 +18347,7 @@ x_1224 = lean_array_push(x_1223, x_1222);
 x_1225 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1225, 0, x_724);
 lean_ctor_set(x_1225, 1, x_1224);
-x_1226 = l_Lean_Elab_Command_expandMixfix___closed__38;
+x_1226 = l_Lean_Elab_Command_expandMixfix___closed__33;
 lean_inc(x_1225);
 x_1227 = lean_array_push(x_1226, x_1225);
 x_1228 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
@@ -18392,13 +18358,13 @@ x_1232 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1232, 0, x_724);
 lean_ctor_set(x_1232, 1, x_1231);
 x_1233 = lean_array_push(x_1227, x_1232);
-x_1234 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_1234 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_1218);
 lean_inc(x_1219);
 x_1235 = l_Lean_addMacroScope(x_1219, x_1234, x_1218);
 x_1236 = lean_box(0);
 x_1237 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_1238 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_1238 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_1239 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_1239, 0, x_1237);
 lean_ctor_set(x_1239, 1, x_1238);
@@ -18408,7 +18374,7 @@ x_1240 = lean_array_push(x_1223, x_1239);
 x_1241 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_1240);
 x_1242 = lean_array_push(x_1240, x_1241);
-x_1243 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_1243 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_1244 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1244, 0, x_1243);
 lean_ctor_set(x_1244, 1, x_1242);
@@ -18446,7 +18412,7 @@ x_1264 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1264, 0, x_1263);
 lean_ctor_set(x_1264, 1, x_1262);
 x_1265 = lean_array_push(x_1258, x_1264);
-x_1266 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_1266 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_1267 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1267, 0, x_1266);
 lean_ctor_set(x_1267, 1, x_1265);
@@ -18511,7 +18477,7 @@ else
 lean_object* x_27; lean_object* x_28; uint8_t x_29; 
 x_27 = l_Lean_Syntax_getArg(x_15, x_14);
 lean_dec(x_15);
-x_28 = l_Lean_Elab_Command_expandMixfix___closed__3;
+x_28 = l_Lean_Elab_toAttributeKind___closed__2;
 lean_inc(x_27);
 x_29 = l_Lean_Syntax_isOfKind(x_27, x_28);
 if (x_29 == 0)
@@ -18550,7 +18516,7 @@ else
 {
 lean_object* x_37; lean_object* x_38; lean_object* x_309; lean_object* x_632; uint8_t x_633; 
 x_37 = l_Lean_Syntax_getArg(x_1, x_23);
-x_632 = l_Lean_Elab_Command_expandMixfix___closed__33;
+x_632 = l_Lean_Elab_Command_expandMixfix___closed__28;
 lean_inc(x_37);
 x_633 = l_Lean_Syntax_isOfKind(x_37, x_632);
 if (x_633 == 0)
@@ -18619,7 +18585,7 @@ else
 lean_object* x_649; lean_object* x_650; uint8_t x_651; 
 x_649 = l_Lean_Syntax_getArg(x_640, x_14);
 lean_dec(x_640);
-x_650 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_650 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_649);
 x_651 = l_Lean_Syntax_isOfKind(x_649, x_650);
 if (x_651 == 0)
@@ -18702,7 +18668,7 @@ x_711 = lean_array_push(x_710, x_709);
 x_712 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_712, 0, x_17);
 lean_ctor_set(x_712, 1, x_711);
-x_713 = l_Lean_Elab_Command_expandMixfix___closed__37;
+x_713 = l_Lean_Elab_Command_expandMixfix___closed__32;
 x_714 = lean_array_push(x_713, x_712);
 x_715 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_716 = lean_array_push(x_714, x_715);
@@ -18777,7 +18743,7 @@ x_680 = lean_array_push(x_679, x_678);
 x_681 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_681, 0, x_17);
 lean_ctor_set(x_681, 1, x_680);
-x_682 = l_Lean_Elab_Command_expandMixfix___closed__37;
+x_682 = l_Lean_Elab_Command_expandMixfix___closed__32;
 x_683 = lean_array_push(x_682, x_681);
 x_684 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_685 = lean_array_push(x_684, x_671);
@@ -18811,13 +18777,13 @@ block_308:
 {
 lean_object* x_39; uint8_t x_40; 
 lean_dec(x_38);
-x_39 = l_Lean_Elab_Command_expandMixfix___closed__5;
+x_39 = l_Lean_Elab_Command_expandMixfix___closed__4;
 lean_inc(x_37);
 x_40 = l_Lean_Syntax_isOfKind(x_37, x_39);
 if (x_40 == 0)
 {
 lean_object* x_41; uint8_t x_42; 
-x_41 = l_Lean_Elab_Command_expandMixfix___closed__7;
+x_41 = l_Lean_Elab_Command_expandMixfix___closed__6;
 lean_inc(x_37);
 x_42 = l_Lean_Syntax_isOfKind(x_37, x_41);
 if (x_42 == 0)
@@ -18896,7 +18862,7 @@ else
 lean_object* x_60; lean_object* x_61; uint8_t x_62; 
 x_60 = l_Lean_Syntax_getArg(x_51, x_14);
 lean_dec(x_51);
-x_61 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_61 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_60);
 x_62 = l_Lean_Syntax_isOfKind(x_60, x_61);
 if (x_62 == 0)
@@ -18986,15 +18952,15 @@ x_146 = lean_array_push(x_145, x_144);
 x_147 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_147, 0, x_17);
 lean_ctor_set(x_147, 1, x_146);
-x_148 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_148 = l_Lean_Elab_Command_expandMixfix___closed__12;
 x_149 = lean_array_push(x_148, x_147);
 x_150 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_151 = lean_array_push(x_149, x_150);
-x_152 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_152 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_153 = l_Lean_addMacroScope(x_141, x_152, x_140);
 x_154 = lean_box(0);
 x_155 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_156 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_156 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_157 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_157, 0, x_155);
 lean_ctor_set(x_157, 1, x_156);
@@ -19003,7 +18969,7 @@ lean_ctor_set(x_157, 3, x_154);
 x_158 = lean_array_push(x_145, x_157);
 lean_inc(x_158);
 x_159 = lean_array_push(x_158, x_150);
-x_160 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_160 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_161 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_161, 0, x_160);
 lean_ctor_set(x_161, 1, x_159);
@@ -19025,7 +18991,7 @@ x_172 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_172, 0, x_171);
 lean_ctor_set(x_172, 1, x_170);
 x_173 = lean_array_push(x_167, x_172);
-x_174 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_174 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_175 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_175, 0, x_174);
 lean_ctor_set(x_175, 1, x_173);
@@ -19100,7 +19066,7 @@ x_93 = lean_array_push(x_92, x_91);
 x_94 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_94, 0, x_17);
 lean_ctor_set(x_94, 1, x_93);
-x_95 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_95 = l_Lean_Elab_Command_expandMixfix___closed__12;
 x_96 = lean_array_push(x_95, x_94);
 x_97 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_98 = lean_array_push(x_97, x_82);
@@ -19110,11 +19076,11 @@ x_101 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_101, 0, x_17);
 lean_ctor_set(x_101, 1, x_100);
 x_102 = lean_array_push(x_96, x_101);
-x_103 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_103 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_104 = l_Lean_addMacroScope(x_88, x_103, x_87);
 x_105 = lean_box(0);
 x_106 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_107 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_107 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_108 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_108, 0, x_106);
 lean_ctor_set(x_108, 1, x_107);
@@ -19124,7 +19090,7 @@ x_109 = lean_array_push(x_92, x_108);
 x_110 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_109);
 x_111 = lean_array_push(x_109, x_110);
-x_112 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_112 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_113 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_113, 0, x_112);
 lean_ctor_set(x_113, 1, x_111);
@@ -19146,7 +19112,7 @@ x_124 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_124, 0, x_123);
 lean_ctor_set(x_124, 1, x_122);
 x_125 = lean_array_push(x_119, x_124);
-x_126 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_126 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_127 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_127, 0, x_126);
 lean_ctor_set(x_127, 1, x_125);
@@ -19228,7 +19194,7 @@ else
 lean_object* x_192; lean_object* x_193; uint8_t x_194; 
 x_192 = l_Lean_Syntax_getArg(x_183, x_14);
 lean_dec(x_183);
-x_193 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_193 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_192);
 x_194 = l_Lean_Syntax_isOfKind(x_192, x_193);
 if (x_194 == 0)
@@ -19318,17 +19284,17 @@ x_277 = lean_array_push(x_276, x_275);
 x_278 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_278, 0, x_17);
 lean_ctor_set(x_278, 1, x_277);
-x_279 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_279 = l_Lean_Elab_Command_expandMixfix___closed__12;
 lean_inc(x_278);
 x_280 = lean_array_push(x_279, x_278);
 x_281 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_282 = lean_array_push(x_280, x_281);
 x_283 = lean_array_push(x_276, x_268);
-x_284 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_284 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_285 = l_Lean_addMacroScope(x_272, x_284, x_271);
 x_286 = lean_box(0);
 x_287 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_288 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_288 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_289 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_289, 0, x_287);
 lean_ctor_set(x_289, 1, x_288);
@@ -19337,7 +19303,7 @@ lean_ctor_set(x_289, 3, x_286);
 x_290 = lean_array_push(x_276, x_289);
 lean_inc(x_290);
 x_291 = lean_array_push(x_290, x_278);
-x_292 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_292 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_293 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_293, 0, x_292);
 lean_ctor_set(x_293, 1, x_291);
@@ -19358,7 +19324,7 @@ x_303 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_303, 0, x_302);
 lean_ctor_set(x_303, 1, x_301);
 x_304 = lean_array_push(x_298, x_303);
-x_305 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_305 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_306 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_306, 0, x_305);
 lean_ctor_set(x_306, 1, x_304);
@@ -19433,7 +19399,7 @@ x_225 = lean_array_push(x_224, x_223);
 x_226 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_226, 0, x_17);
 lean_ctor_set(x_226, 1, x_225);
-x_227 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_227 = l_Lean_Elab_Command_expandMixfix___closed__12;
 lean_inc(x_226);
 x_228 = lean_array_push(x_227, x_226);
 x_229 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
@@ -19445,11 +19411,11 @@ lean_ctor_set(x_233, 0, x_17);
 lean_ctor_set(x_233, 1, x_232);
 x_234 = lean_array_push(x_228, x_233);
 x_235 = lean_array_push(x_224, x_216);
-x_236 = l_Lean_Elab_Command_expandMixfix___closed__23;
+x_236 = l_Lean_Elab_Command_expandMixfix___closed__18;
 x_237 = l_Lean_addMacroScope(x_220, x_236, x_219);
 x_238 = lean_box(0);
 x_239 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_240 = l_Lean_Elab_Command_expandMixfix___closed__22;
+x_240 = l_Lean_Elab_Command_expandMixfix___closed__17;
 x_241 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_241, 0, x_239);
 lean_ctor_set(x_241, 1, x_240);
@@ -19458,7 +19424,7 @@ lean_ctor_set(x_241, 3, x_238);
 x_242 = lean_array_push(x_224, x_241);
 lean_inc(x_242);
 x_243 = lean_array_push(x_242, x_226);
-x_244 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_244 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_245 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_245, 0, x_244);
 lean_ctor_set(x_245, 1, x_243);
@@ -19479,7 +19445,7 @@ x_255 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_255, 0, x_254);
 lean_ctor_set(x_255, 1, x_253);
 x_256 = lean_array_push(x_250, x_255);
-x_257 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_257 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_258 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_258, 0, x_257);
 lean_ctor_set(x_258, 1, x_256);
@@ -19501,13 +19467,13 @@ block_631:
 {
 lean_object* x_310; uint8_t x_311; 
 lean_dec(x_309);
-x_310 = l_Lean_Elab_Command_expandMixfix___closed__25;
+x_310 = l_Lean_Elab_Command_expandMixfix___closed__20;
 lean_inc(x_37);
 x_311 = l_Lean_Syntax_isOfKind(x_37, x_310);
 if (x_311 == 0)
 {
 lean_object* x_312; uint8_t x_313; 
-x_312 = l_Lean_Elab_Command_expandMixfix___closed__27;
+x_312 = l_Lean_Elab_Command_expandMixfix___closed__22;
 lean_inc(x_37);
 x_313 = l_Lean_Syntax_isOfKind(x_37, x_312);
 if (x_313 == 0)
@@ -19577,7 +19543,7 @@ else
 lean_object* x_329; lean_object* x_330; uint8_t x_331; 
 x_329 = l_Lean_Syntax_getArg(x_320, x_14);
 lean_dec(x_320);
-x_330 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_330 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_329);
 x_331 = l_Lean_Syntax_isOfKind(x_329, x_330);
 if (x_331 == 0)
@@ -19674,16 +19640,16 @@ x_439 = lean_array_push(x_438, x_437);
 x_440 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_440, 0, x_17);
 lean_ctor_set(x_440, 1, x_439);
-x_441 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_441 = l_Lean_Elab_Command_expandMixfix___closed__12;
 x_442 = lean_array_push(x_441, x_440);
 x_443 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_444 = lean_array_push(x_442, x_443);
-x_445 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_445 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_433);
 lean_inc(x_434);
 x_446 = l_Lean_addMacroScope(x_434, x_445, x_433);
 x_447 = lean_box(0);
-x_448 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_448 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_449 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_449, 0, x_431);
 lean_ctor_set(x_449, 1, x_448);
@@ -19692,7 +19658,7 @@ lean_ctor_set(x_449, 3, x_447);
 x_450 = lean_array_push(x_438, x_449);
 lean_inc(x_450);
 x_451 = lean_array_push(x_450, x_443);
-x_452 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_452 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_453 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_453, 0, x_452);
 lean_ctor_set(x_453, 1, x_451);
@@ -19738,7 +19704,7 @@ x_477 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_477, 0, x_476);
 lean_ctor_set(x_477, 1, x_475);
 x_478 = lean_array_push(x_471, x_477);
-x_479 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_479 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_480 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_480, 0, x_479);
 lean_ctor_set(x_480, 1, x_478);
@@ -19820,7 +19786,7 @@ x_368 = lean_array_push(x_367, x_366);
 x_369 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_369, 0, x_17);
 lean_ctor_set(x_369, 1, x_368);
-x_370 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_370 = l_Lean_Elab_Command_expandMixfix___closed__12;
 x_371 = lean_array_push(x_370, x_369);
 x_372 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
 x_373 = lean_array_push(x_372, x_351);
@@ -19830,12 +19796,12 @@ x_376 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_376, 0, x_17);
 lean_ctor_set(x_376, 1, x_375);
 x_377 = lean_array_push(x_371, x_376);
-x_378 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_378 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_362);
 lean_inc(x_363);
 x_379 = l_Lean_addMacroScope(x_363, x_378, x_362);
 x_380 = lean_box(0);
-x_381 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_381 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_382 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_382, 0, x_360);
 lean_ctor_set(x_382, 1, x_381);
@@ -19845,7 +19811,7 @@ x_383 = lean_array_push(x_367, x_382);
 x_384 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_383);
 x_385 = lean_array_push(x_383, x_384);
-x_386 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_386 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_387 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_387, 0, x_386);
 lean_ctor_set(x_387, 1, x_385);
@@ -19891,7 +19857,7 @@ x_411 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_411, 0, x_410);
 lean_ctor_set(x_411, 1, x_409);
 x_412 = lean_array_push(x_405, x_411);
-x_413 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_413 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_414 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_414, 0, x_413);
 lean_ctor_set(x_414, 1, x_412);
@@ -19969,7 +19935,7 @@ else
 lean_object* x_496; lean_object* x_497; uint8_t x_498; 
 x_496 = l_Lean_Syntax_getArg(x_487, x_14);
 lean_dec(x_487);
-x_497 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_497 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_496);
 x_498 = l_Lean_Syntax_isOfKind(x_496, x_497);
 if (x_498 == 0)
@@ -20059,18 +20025,18 @@ x_591 = lean_array_push(x_590, x_589);
 x_592 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_592, 0, x_17);
 lean_ctor_set(x_592, 1, x_591);
-x_593 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_593 = l_Lean_Elab_Command_expandMixfix___closed__12;
 lean_inc(x_592);
 x_594 = lean_array_push(x_593, x_592);
 x_595 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 x_596 = lean_array_push(x_594, x_595);
-x_597 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_597 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_585);
 lean_inc(x_586);
 x_598 = l_Lean_addMacroScope(x_586, x_597, x_585);
 x_599 = lean_box(0);
 x_600 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_601 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_601 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_602 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_602, 0, x_600);
 lean_ctor_set(x_602, 1, x_601);
@@ -20079,7 +20045,7 @@ lean_ctor_set(x_602, 3, x_599);
 x_603 = lean_array_push(x_590, x_602);
 lean_inc(x_603);
 x_604 = lean_array_push(x_603, x_595);
-x_605 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_605 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_606 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_606, 0, x_605);
 lean_ctor_set(x_606, 1, x_604);
@@ -20117,7 +20083,7 @@ x_626 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_626, 0, x_625);
 lean_ctor_set(x_626, 1, x_624);
 x_627 = lean_array_push(x_620, x_626);
-x_628 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_628 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_629 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_629, 0, x_628);
 lean_ctor_set(x_629, 1, x_627);
@@ -20192,7 +20158,7 @@ x_529 = lean_array_push(x_528, x_527);
 x_530 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_530, 0, x_17);
 lean_ctor_set(x_530, 1, x_529);
-x_531 = l_Lean_Elab_Command_expandMixfix___closed__17;
+x_531 = l_Lean_Elab_Command_expandMixfix___closed__12;
 lean_inc(x_530);
 x_532 = lean_array_push(x_531, x_530);
 x_533 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3418____closed__9;
@@ -20203,13 +20169,13 @@ x_537 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_537, 0, x_17);
 lean_ctor_set(x_537, 1, x_536);
 x_538 = lean_array_push(x_532, x_537);
-x_539 = l_Lean_Elab_Command_expandMixfix___closed__31;
+x_539 = l_Lean_Elab_Command_expandMixfix___closed__26;
 lean_inc(x_523);
 lean_inc(x_524);
 x_540 = l_Lean_addMacroScope(x_524, x_539, x_523);
 x_541 = lean_box(0);
 x_542 = l_Lean_instInhabitedSourceInfo___closed__1;
-x_543 = l_Lean_Elab_Command_expandMixfix___closed__30;
+x_543 = l_Lean_Elab_Command_expandMixfix___closed__25;
 x_544 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_544, 0, x_542);
 lean_ctor_set(x_544, 1, x_543);
@@ -20219,7 +20185,7 @@ x_545 = lean_array_push(x_528, x_544);
 x_546 = l_myMacro____x40_Init_Notation___hyg_11836____closed__22;
 lean_inc(x_545);
 x_547 = lean_array_push(x_545, x_546);
-x_548 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_548 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_549 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_549, 0, x_548);
 lean_ctor_set(x_549, 1, x_547);
@@ -20257,7 +20223,7 @@ x_569 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_569, 0, x_568);
 lean_ctor_set(x_569, 1, x_567);
 x_570 = lean_array_push(x_563, x_569);
-x_571 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_571 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_572 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_572, 0, x_571);
 lean_ctor_set(x_572, 1, x_570);
@@ -20510,7 +20476,7 @@ _start:
 lean_object* x_5; lean_object* x_6; uint8_t x_7; 
 lean_inc(x_1);
 x_5 = l_Lean_Syntax_getKind(x_1);
-x_6 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_6 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_7 = lean_name_eq(x_5, x_6);
 if (x_7 == 0)
 {
@@ -20648,7 +20614,7 @@ _start:
 lean_object* x_5; lean_object* x_6; uint8_t x_7; 
 lean_inc(x_1);
 x_5 = l_Lean_Syntax_getKind(x_1);
-x_6 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_6 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_7 = lean_name_eq(x_5, x_6);
 if (x_7 == 0)
 {
@@ -25330,7 +25296,7 @@ lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; size_t x_10;
 x_6 = lean_array_uget(x_1, x_2);
 lean_inc(x_6);
 x_7 = l_Lean_Syntax_getKind(x_6);
-x_8 = l_Lean_Elab_Command_expandMixfix___closed__19;
+x_8 = l_Lean_Elab_Command_expandMixfix___closed__14;
 x_9 = lean_name_eq(x_7, x_8);
 lean_dec(x_7);
 x_10 = 1;
@@ -25556,7 +25522,7 @@ static lean_object* _init_l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_expa
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Command_expandMixfix___closed__15;
+x_1 = l_Lean_Elab_Command_elabSyntax___lambda__3___closed__12;
 x_2 = l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_expandNotationAux___closed__1;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
@@ -25817,7 +25783,7 @@ lean_inc(x_117);
 lean_dec(x_116);
 x_118 = l_myMacro____x40_Init_Notation___hyg_11836____closed__11;
 x_119 = lean_array_push(x_118, x_113);
-x_120 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_120 = l_Lean_Elab_Command_expandMixfix___closed__8;
 x_121 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_121, 0, x_120);
 lean_ctor_set(x_121, 1, x_119);
@@ -25884,7 +25850,7 @@ lean_inc(x_158);
 lean_dec(x_157);
 x_159 = l_myMacro____x40_Init_Notation___hyg_11836____closed__11;
 x_160 = lean_array_push(x_159, x_154);
-x_161 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_161 = l_Lean_Elab_Command_expandMixfix___closed__8;
 x_162 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_162, 0, x_161);
 lean_ctor_set(x_162, 1, x_160);
@@ -26090,7 +26056,7 @@ lean_dec(x_5);
 x_8 = lean_ctor_get(x_6, 2);
 lean_inc(x_8);
 lean_dec(x_6);
-x_9 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_9 = l_Lean_Elab_Command_expandMixfix___closed__10;
 lean_inc(x_1);
 x_10 = l_Lean_Syntax_isOfKind(x_1, x_9);
 if (x_10 == 0)
@@ -26325,7 +26291,7 @@ lean_object* x_186; lean_object* x_187; uint8_t x_188;
 lean_dec(x_143);
 x_186 = l_Lean_Syntax_getArg(x_139, x_17);
 lean_dec(x_139);
-x_187 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_187 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_186);
 x_188 = l_Lean_Syntax_isOfKind(x_186, x_187);
 if (x_188 == 0)
@@ -26535,7 +26501,7 @@ else
 lean_object* x_28; lean_object* x_29; uint8_t x_30; 
 x_28 = l_Lean_Syntax_getArg(x_18, x_17);
 lean_dec(x_18);
-x_29 = l_Lean_Elab_Command_expandMixfix___closed__3;
+x_29 = l_Lean_Elab_toAttributeKind___closed__2;
 lean_inc(x_28);
 x_30 = l_Lean_Syntax_isOfKind(x_28, x_29);
 if (x_30 == 0)
@@ -26739,7 +26705,7 @@ lean_object* x_83; lean_object* x_84; uint8_t x_85;
 lean_dec(x_41);
 x_83 = l_Lean_Syntax_getArg(x_37, x_17);
 lean_dec(x_37);
-x_84 = l_Lean_Elab_Command_expandMixfix___closed__9;
+x_84 = l_Lean_Elab_Command_expandMixfix___closed__8;
 lean_inc(x_83);
 x_85 = l_Lean_Syntax_isOfKind(x_83, x_84);
 if (x_85 == 0)
@@ -26943,7 +26909,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Command_commandElabAttribute;
-x_3 = l_Lean_Elab_Command_expandMixfix___closed__11;
+x_3 = l_Lean_Elab_Command_expandMixfix___closed__10;
 x_4 = l___regBuiltin_Lean_Elab_Command_expandNotation___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -28757,7 +28723,7 @@ x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1() {
+static lean_object* _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -28767,11 +28733,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1;
+x_2 = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -32958,6 +32924,10 @@ l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23 = _init_l_Lean_Elab_Comm
 lean_mark_persistent(l_Lean_Elab_Command_elabSyntax___lambda__3___closed__23);
 l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24 = _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24();
 lean_mark_persistent(l_Lean_Elab_Command_elabSyntax___lambda__3___closed__24);
+l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25 = _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25();
+lean_mark_persistent(l_Lean_Elab_Command_elabSyntax___lambda__3___closed__25);
+l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26 = _init_l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26();
+lean_mark_persistent(l_Lean_Elab_Command_elabSyntax___lambda__3___closed__26);
 l___regBuiltin_Lean_Elab_Command_elabSyntax___closed__1 = _init_l___regBuiltin_Lean_Elab_Command_elabSyntax___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Command_elabSyntax___closed__1);
 l___regBuiltin_Lean_Elab_Command_elabSyntax___closed__2 = _init_l___regBuiltin_Lean_Elab_Command_elabSyntax___closed__2();
@@ -33167,16 +33137,6 @@ l_Lean_Elab_Command_expandMixfix___closed__33 = _init_l_Lean_Elab_Command_expand
 lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__33);
 l_Lean_Elab_Command_expandMixfix___closed__34 = _init_l_Lean_Elab_Command_expandMixfix___closed__34();
 lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__34);
-l_Lean_Elab_Command_expandMixfix___closed__35 = _init_l_Lean_Elab_Command_expandMixfix___closed__35();
-lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__35);
-l_Lean_Elab_Command_expandMixfix___closed__36 = _init_l_Lean_Elab_Command_expandMixfix___closed__36();
-lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__36);
-l_Lean_Elab_Command_expandMixfix___closed__37 = _init_l_Lean_Elab_Command_expandMixfix___closed__37();
-lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__37);
-l_Lean_Elab_Command_expandMixfix___closed__38 = _init_l_Lean_Elab_Command_expandMixfix___closed__38();
-lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__38);
-l_Lean_Elab_Command_expandMixfix___closed__39 = _init_l_Lean_Elab_Command_expandMixfix___closed__39();
-lean_mark_persistent(l_Lean_Elab_Command_expandMixfix___closed__39);
 l___regBuiltin_Lean_Elab_Command_expandMixfix___closed__1 = _init_l___regBuiltin_Lean_Elab_Command_expandMixfix___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Command_expandMixfix___closed__1);
 res = l___regBuiltin_Lean_Elab_Command_expandMixfix(lean_io_mk_world());
@@ -33280,9 +33240,9 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Command_elabMacro___closed__2);
 res = l___regBuiltin_Lean_Elab_Command_elabMacro(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534____closed__1);
-res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17534_(lean_io_mk_world());
+l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1 = _init_l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558____closed__1);
+res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Syntax___hyg_17558_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Command_withExpectedType___closed__1 = _init_l_Lean_Elab_Command_withExpectedType___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/Term.c b/stage0/stdlib/Lean/Elab/Term.c
index 222d6c165c..a8e605dcdb 100644
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
@@ -61,7 +61,7 @@ lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_isExplicitApp___boxed(
 lean_object* l___regBuiltin_Lean_Elab_Term_elabBadCDot___closed__2;
 lean_object* lean_erase_macro_scopes(lean_object*);
 lean_object* l_ReaderT_read___at_Lean_Elab_Term_instMonadLogTermElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object*, lean_object*, uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1034____closed__3;
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_mkFreshTypeMVarFor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -98,7 +98,6 @@ lean_object* l_Lean_Meta_getLevel___at___private_Lean_Elab_Term_0__Lean_Elab_Ter
 lean_object* l_Lean_Meta_mkFreshExprMVar___at___private_Lean_Elab_Term_0__Lean_Elab_Term_tryCoe___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply(lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_mkSorry___rarg___lambda__1___closed__3;
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
 uint8_t l_USize_decEq(size_t, size_t);
@@ -249,10 +248,9 @@ lean_object* l_Lean_MessageData_ofList(lean_object*);
 extern lean_object* l_Lean_Elab_logException___rarg___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_liftLevelM_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_run___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__2___rarg(lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Meta_instMonadLCtxMetaM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1(lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_logUnassignedUsingErrorInfos___spec__4(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Lean_Elab_Term_instInhabitedTermElabResult___closed__1;
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
@@ -283,7 +281,6 @@ lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryCoeSort___closed__1
 lean_object* l_Lean_Elab_Term_elabStrLit_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabByTactic(lean_object*);
 lean_object* l_Lean_mkAtom(lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instInhabitedState___closed__1;
 lean_object* l_Lean_Elab_Term_withLevelNames(lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadLiftTMetaMTermElabM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -335,7 +332,6 @@ lean_object* l_Lean_Elab_Term_elabTypeWithAutoBoundImplicit_loop___rarg(lean_obj
 lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError___closed__7;
 lean_object* l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__3;
 extern lean_object* l_Lean_Elab_logDbgTrace___rarg___closed__1;
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBadCDot___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_9707____closed__21;
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1(lean_object*);
@@ -349,7 +345,7 @@ lean_object* l_Lean_Elab_Term_saveAllState___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_instInhabitedTermElabM___closed__1;
 lean_object* l_Lean_Elab_Term_instMonadLogTermElabM___closed__3;
 lean_object* l_List_foldlM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_mkConsts___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux_match__2___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_9707____closed__13;
 uint8_t lean_metavar_ctx_is_expr_assigned(lean_object*, lean_object*);
@@ -389,9 +385,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_addAutoBoundImplicits_
 uint8_t l_Array_contains___at_Lean_Elab_Term_logUnassignedUsingErrorInfos___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadLogTermElabM___closed__7;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_mkConsts___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_throwAppTypeMismatch___rarg___lambda__1___closed__2;
 lean_object* l_List_foldlM___at_Lean_Elab_Term_logUnassignedUsingErrorInfos___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveLocalName_loop(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -473,7 +467,6 @@ extern lean_object* l_Lean_Meta_instMetaEvalMetaM___rarg___closed__2;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkInstMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isScientificLit_x3f(lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe_match__6(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabEnsureExpectedType(lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -549,7 +542,7 @@ lean_object* l_Lean_Elab_Term_mkTypeMismatchError_match__1___rarg(lean_object*,
 lean_object* l___regBuiltin_Lean_Elab_Term_elabCharLit(lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabOptLevel___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFnsAux_match__2___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882_(lean_object*);
 lean_object* l_Lean_Elab_Term_setElabConfig(lean_object*);
 lean_object* l_Lean_Elab_Term_getLetRecsToLift(lean_object*);
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -610,7 +603,6 @@ lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_logUnassignedUsingErrorI
 lean_object* l_Lean_Elab_Term_elabLevel___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_localDeclDependsOn(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_instMetaEvalTermElabM___spec__10(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1;
 lean_object* l_Lean_Elab_Term_tryCoeThunk_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -622,14 +614,12 @@ lean_object* l_Lean_Elab_throwAutoBoundImplicitLocal___at_Lean_Elab_Term_resolve
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwPostpone___at_Lean_Elab_Term_tryPostpone___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Meta_AppBuilder_0__Lean_Meta_mkEqNDRecImp___closed__6;
 extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux_match__3___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_liftLevelM(lean_object*);
 lean_object* l_Lean_Elab_Term_elabProp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError___closed__5;
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1;
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 extern lean_object* l_Lean_firstFrontendMacroScope;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabTypeOf___closed__3;
@@ -652,7 +642,6 @@ lean_object* l_Std_PersistentArray_forMAux___at_Lean_Elab_Term_instMetaEvalTermE
 lean_object* l_Lean_Elab_Term_isLetRecAuxMVar___closed__6;
 uint8_t l_Lean_Expr_isForall(lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermEnsuringType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabEnsureExpectedType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_isTypeApp_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -680,7 +669,6 @@ lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_0_
 lean_object* l_Lean_Elab_Term_ensureHasTypeAux_match__1(lean_object*);
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Term_Context_autoBoundImplicit___default;
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3;
 lean_object* l_Lean_mkLevelMVar(lean_object*);
 lean_object* l_Lean_Elab_Term_registerMVarErrorImplicitArgInfo___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwTypeMismatchError(lean_object*);
@@ -826,9 +814,10 @@ uint8_t l_Lean_Name_isAnonymous(lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_assignLevelMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributes(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributes(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNumLit_match__1(lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1;
 lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_metavar_ctx_assign_level(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_savingMCtx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -880,7 +869,7 @@ lean_object* l_Lean_Elab_Term_elabSort(lean_object*, lean_object*, lean_object*,
 uint8_t l_Lean_Elab_Term_levelMVarToParam___lambda__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSyntheticHole___closed__2;
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_match__2(lean_object*);
 lean_object* l_Lean_Elab_Term_mkTypeMismatchError___closed__2;
 lean_object* l_Lean_Elab_Term_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -906,7 +895,7 @@ lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Term_resolveName___spec__1(
 lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__3;
 lean_object* l_Lean_mkForall(lean_object*, uint8_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_evalNat_visit___closed__3;
-lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_mkSorry___rarg___lambda__1___closed__4;
 lean_object* l_Lean_Elab_Term_tryCoeThunk_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadLogTermElabM___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1004,7 +993,7 @@ lean_object* l_IO_println___at_Lean_instEval___spec__1(lean_object*, lean_object
 lean_object* l_Lean_Elab_Term_logUnassignedUsingErrorInfos_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwErrorIfErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706_(lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622_(lean_object*);
 lean_object* l_Lean_Elab_Term_elabByTactic_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addAutoBoundImplicits(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withAutoBoundImplicitLocal___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1136,7 +1125,7 @@ lean_object* l_Lean_Elab_Term_elabSyntheticHole___closed__3;
 lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryPureCoe_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBadCDot___rarg___closed__1;
-lean_object* l_Lean_Elab_Term_applyAttributesAt___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributesAt___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkAppOptM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_tryPureCoe_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMetaEvalTermElabM(lean_object*);
@@ -1164,13 +1153,14 @@ lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe_match__5
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1034____closed__2;
 lean_object* l_Lean_Elab_Term_observing___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_toIO(lean_object*);
-lean_object* l_Lean_Elab_Term_applyAttributes___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_applyAttributes___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_isMonad_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_dropTermParens(lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_isMonad_x3f_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshBinderName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBadCDot___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_elabBadCDot(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
 lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Term_addAutoBoundImplicits___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
@@ -8386,73 +8376,6 @@ lean_dec(x_2);
 return x_9;
 }
 }
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg(uint8_t x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-if (x_1 == 0)
-{
-lean_dec(x_5);
-lean_dec(x_3);
-if (x_2 == 0)
-{
-lean_object* x_7; lean_object* x_8; 
-lean_dec(x_4);
-x_7 = lean_box(0);
-x_8 = lean_apply_1(x_6, x_7);
-return x_8;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; 
-lean_dec(x_6);
-x_9 = lean_box(0);
-x_10 = lean_apply_1(x_4, x_9);
-return x_10;
-}
-}
-else
-{
-lean_dec(x_6);
-lean_dec(x_4);
-if (x_2 == 0)
-{
-lean_object* x_11; lean_object* x_12; 
-lean_dec(x_3);
-x_11 = lean_box(0);
-x_12 = lean_apply_1(x_5, x_11);
-return x_12;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; 
-lean_dec(x_5);
-x_13 = lean_box(0);
-x_14 = lean_apply_1(x_3, x_13);
-return x_14;
-}
-}
-}
-}
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg___boxed), 6, 0);
-return x_2;
-}
-}
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg___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) {
-_start:
-{
-uint8_t x_7; uint8_t x_8; lean_object* x_9; 
-x_7 = lean_unbox(x_1);
-lean_dec(x_1);
-x_8 = lean_unbox(x_2);
-lean_dec(x_2);
-x_9 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply_match__1___rarg(x_7, x_8, x_3, x_4, x_5, x_6);
-return x_9;
-}
-}
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -8517,490 +8440,334 @@ x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Term_0__Lean_Elab_Term_ap
 return x_2;
 }
 }
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, 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_11) {
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t 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_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_ctor_get(x_1, 1);
-lean_inc(x_12);
-lean_dec(x_1);
-x_13 = lean_box(x_4);
-x_14 = lean_apply_6(x_12, x_2, x_3, x_13, x_9, x_10, x_11);
-return x_14;
-}
-}
-static lean_object* _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1() {
-_start:
+lean_object* x_14; lean_object* x_15; uint8_t x_21; 
+x_21 = x_5 < x_4;
+if (x_21 == 0)
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("scoped local attributes are not allowed");
-return x_1;
-}
-}
-static lean_object* _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, uint8_t 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_11, lean_object* x_12) {
-_start:
-{
-if (x_5 == 0)
-{
-if (x_3 == 0)
-{
-uint8_t x_13; lean_object* x_14; 
-x_13 = 1;
-x_14 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(x_1, x_2, x_4, x_13, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_6);
-return x_14;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-lean_dec(x_4);
+lean_object* x_22; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_7);
 lean_dec(x_2);
 lean_dec(x_1);
-x_15 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3;
-x_16 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-x_17 = !lean_is_exclusive(x_16);
-if (x_17 == 0)
-{
-return x_16;
-}
-else
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_16, 0);
-x_19 = lean_ctor_get(x_16, 1);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_dec(x_16);
-x_20 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-return x_20;
-}
-}
-}
-else
-{
-if (x_3 == 0)
-{
-uint8_t x_21; lean_object* x_22; 
-x_21 = 0;
-x_22 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(x_1, x_2, x_4, x_21, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_6);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_6);
+lean_ctor_set(x_22, 1, x_13);
 return x_22;
 }
 else
 {
-uint8_t x_23; lean_object* x_24; 
-x_23 = 2;
-x_24 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(x_1, x_2, x_4, x_23, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+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_dec(x_6);
-return x_24;
-}
-}
-}
-}
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
-_start:
-{
-uint8_t x_12; lean_object* x_13; 
-x_12 = lean_unbox(x_4);
-lean_dec(x_4);
-x_13 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___lambda__1(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-return x_13;
-}
-}
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
-_start:
-{
-uint8_t x_13; uint8_t x_14; lean_object* x_15; 
-x_13 = lean_unbox(x_3);
-lean_dec(x_3);
-x_14 = lean_unbox(x_5);
-lean_dec(x_5);
-x_15 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply(x_1, x_2, x_13, x_4, x_14, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_15;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, size_t x_5, size_t x_6, 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, lean_object* x_14) {
-_start:
-{
-lean_object* x_15; lean_object* x_16; uint8_t x_22; 
-x_22 = x_6 < x_5;
-if (x_22 == 0)
-{
-lean_object* x_23; 
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_8);
-lean_dec(x_2);
-lean_dec(x_1);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_7);
-lean_ctor_set(x_23, 1, x_14);
-return x_23;
-}
-else
-{
-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_dec(x_7);
-x_24 = lean_array_uget(x_4, x_6);
-x_25 = lean_st_ref_get(x_13, x_14);
-x_26 = lean_ctor_get(x_25, 0);
+x_23 = lean_array_uget(x_3, x_5);
+x_24 = lean_st_ref_get(x_12, x_13);
+x_25 = lean_ctor_get(x_24, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_24, 1);
 lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
+lean_dec(x_24);
+x_27 = lean_ctor_get(x_25, 0);
 lean_inc(x_27);
 lean_dec(x_25);
-x_28 = lean_ctor_get(x_26, 0);
+x_28 = lean_ctor_get(x_23, 0);
 lean_inc(x_28);
-lean_dec(x_26);
-x_29 = lean_ctor_get(x_24, 0);
-lean_inc(x_29);
-x_30 = l_Lean_getAttributeImpl(x_28, x_29);
-lean_dec(x_28);
-if (lean_obj_tag(x_30) == 0)
+x_29 = l_Lean_getAttributeImpl(x_27, x_28);
+lean_dec(x_27);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-lean_dec(x_24);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+lean_dec(x_23);
 lean_dec(x_2);
 lean_dec(x_1);
-x_31 = lean_ctor_get(x_30, 0);
-lean_inc(x_31);
-lean_dec(x_30);
-x_32 = lean_alloc_ctor(2, 1, 0);
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+lean_dec(x_29);
+x_31 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_31, 0, x_30);
+x_32 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
-x_33 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_33, 0, x_32);
-x_34 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_33, x_8, x_9, x_10, x_11, x_12, x_13, x_27);
-lean_dec(x_13);
+x_33 = l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1___rarg(x_32, x_7, x_8, x_9, x_10, x_11, x_12, x_26);
 lean_dec(x_12);
-x_35 = !lean_is_exclusive(x_34);
-if (x_35 == 0)
+lean_dec(x_11);
+x_34 = !lean_is_exclusive(x_33);
+if (x_34 == 0)
 {
-return x_34;
+return x_33;
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_34, 0);
-x_37 = lean_ctor_get(x_34, 1);
-lean_inc(x_37);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_33, 0);
+x_36 = lean_ctor_get(x_33, 1);
 lean_inc(x_36);
-lean_dec(x_34);
-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_inc(x_35);
+lean_dec(x_33);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_35);
+lean_ctor_set(x_37, 1, x_36);
+return x_37;
 }
 }
 else
 {
 if (lean_obj_tag(x_2) == 0)
 {
-lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; 
-x_39 = lean_ctor_get(x_30, 0);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; 
+x_38 = lean_ctor_get(x_29, 0);
+lean_inc(x_38);
+lean_dec(x_29);
+x_39 = lean_ctor_get(x_38, 1);
 lean_inc(x_39);
-lean_dec(x_30);
-x_40 = lean_ctor_get_uint8(x_24, sizeof(void*)*2);
-x_41 = lean_ctor_get(x_24, 1);
-lean_inc(x_41);
-lean_dec(x_24);
-lean_inc(x_13);
+lean_dec(x_38);
+x_40 = lean_ctor_get(x_23, 1);
+lean_inc(x_40);
+x_41 = lean_ctor_get_uint8(x_23, sizeof(void*)*2);
+lean_dec(x_23);
+x_42 = lean_box(x_41);
 lean_inc(x_12);
-lean_inc(x_8);
+lean_inc(x_11);
 lean_inc(x_1);
-x_42 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply(x_39, x_1, x_40, x_41, x_3, x_8, x_9, x_10, x_11, x_12, x_13, x_27);
-if (lean_obj_tag(x_42) == 0)
+x_43 = lean_apply_6(x_39, x_1, x_40, x_42, x_11, x_12, x_26);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_43; lean_object* x_44; 
-x_43 = lean_ctor_get(x_42, 1);
-lean_inc(x_43);
-lean_dec(x_42);
-x_44 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
+lean_object* x_44; lean_object* x_45; 
+x_44 = lean_ctor_get(x_43, 1);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
+x_14 = x_45;
 x_15 = x_44;
-x_16 = x_43;
-goto block_21;
+goto block_20;
 }
 else
 {
-uint8_t x_45; 
-lean_dec(x_13);
+uint8_t x_46; 
 lean_dec(x_12);
-lean_dec(x_8);
+lean_dec(x_11);
+lean_dec(x_7);
 lean_dec(x_1);
-x_45 = !lean_is_exclusive(x_42);
-if (x_45 == 0)
+x_46 = !lean_is_exclusive(x_43);
+if (x_46 == 0)
 {
-return x_42;
+return x_43;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_42, 0);
-x_47 = lean_ctor_get(x_42, 1);
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_43, 0);
+x_48 = lean_ctor_get(x_43, 1);
+lean_inc(x_48);
 lean_inc(x_47);
-lean_inc(x_46);
-lean_dec(x_42);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
+lean_dec(x_43);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
 }
 }
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; uint8_t x_53; uint8_t x_54; 
-x_49 = lean_ctor_get(x_30, 0);
-lean_inc(x_49);
-lean_dec(x_30);
-x_50 = lean_ctor_get(x_2, 0);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; uint8_t x_54; uint8_t x_55; 
+x_50 = lean_ctor_get(x_29, 0);
 lean_inc(x_50);
-x_51 = lean_ctor_get(x_49, 0);
+lean_dec(x_29);
+x_51 = lean_ctor_get(x_2, 0);
 lean_inc(x_51);
-x_52 = lean_ctor_get_uint8(x_51, sizeof(void*)*2);
+x_52 = lean_ctor_get(x_50, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get_uint8(x_52, sizeof(void*)*2);
+lean_dec(x_52);
+x_54 = lean_unbox(x_51);
 lean_dec(x_51);
-x_53 = lean_unbox(x_50);
+x_55 = l_Lean_AttributeApplicationTime_beq(x_54, x_53);
+if (x_55 == 0)
+{
+lean_object* x_56; 
 lean_dec(x_50);
-x_54 = l_Lean_AttributeApplicationTime_beq(x_53, x_52);
-if (x_54 == 0)
-{
-lean_object* x_55; 
-lean_dec(x_49);
-lean_dec(x_24);
-x_55 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
-x_15 = x_55;
-x_16 = x_27;
-goto block_21;
+lean_dec(x_23);
+x_56 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
+x_14 = x_56;
+x_15 = x_26;
+goto block_20;
 }
 else
 {
-uint8_t x_56; lean_object* x_57; lean_object* x_58; 
-x_56 = lean_ctor_get_uint8(x_24, sizeof(void*)*2);
-x_57 = lean_ctor_get(x_24, 1);
+lean_object* x_57; lean_object* x_58; uint8_t x_59; lean_object* x_60; lean_object* x_61; 
+x_57 = lean_ctor_get(x_50, 1);
 lean_inc(x_57);
-lean_dec(x_24);
-lean_inc(x_13);
+lean_dec(x_50);
+x_58 = lean_ctor_get(x_23, 1);
+lean_inc(x_58);
+x_59 = lean_ctor_get_uint8(x_23, sizeof(void*)*2);
+lean_dec(x_23);
+x_60 = lean_box(x_59);
 lean_inc(x_12);
-lean_inc(x_8);
+lean_inc(x_11);
 lean_inc(x_1);
-x_58 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply(x_49, x_1, x_56, x_57, x_3, x_8, x_9, x_10, x_11, x_12, x_13, x_27);
-if (lean_obj_tag(x_58) == 0)
+x_61 = lean_apply_6(x_57, x_1, x_58, x_60, x_11, x_12, x_26);
+if (lean_obj_tag(x_61) == 0)
 {
-lean_object* x_59; lean_object* x_60; 
-x_59 = lean_ctor_get(x_58, 1);
-lean_inc(x_59);
-lean_dec(x_58);
-x_60 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
-x_15 = x_60;
-x_16 = x_59;
-goto block_21;
+lean_object* x_62; lean_object* x_63; 
+x_62 = lean_ctor_get(x_61, 1);
+lean_inc(x_62);
+lean_dec(x_61);
+x_63 = l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
+x_14 = x_63;
+x_15 = x_62;
+goto block_20;
 }
 else
 {
-uint8_t x_61; 
-lean_dec(x_13);
+uint8_t x_64; 
 lean_dec(x_12);
-lean_dec(x_8);
+lean_dec(x_11);
+lean_dec(x_7);
 lean_dec(x_2);
 lean_dec(x_1);
-x_61 = !lean_is_exclusive(x_58);
-if (x_61 == 0)
+x_64 = !lean_is_exclusive(x_61);
+if (x_64 == 0)
 {
-return x_58;
+return x_61;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_58, 0);
-x_63 = lean_ctor_get(x_58, 1);
-lean_inc(x_63);
-lean_inc(x_62);
-lean_dec(x_58);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
+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);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_61);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
 }
 }
 }
 }
 }
 }
-block_21:
+block_20:
 {
-lean_object* x_17; size_t x_18; size_t x_19; 
-x_17 = lean_ctor_get(x_15, 0);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = 1;
-x_19 = x_6 + x_18;
-x_6 = x_19;
-x_7 = x_17;
-x_14 = x_16;
+lean_object* x_16; size_t x_17; size_t x_18; 
+x_16 = lean_ctor_get(x_14, 0);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = 1;
+x_18 = x_5 + x_17;
+x_5 = x_18;
+x_6 = x_16;
+x_13 = x_15;
 goto _start;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, 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_11) {
+lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(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, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_12; size_t x_13; size_t x_14; lean_object* x_15; lean_object* x_16; 
-x_12 = lean_array_get_size(x_2);
-x_13 = lean_usize_of_nat(x_12);
-lean_dec(x_12);
-x_14 = 0;
-x_15 = lean_box(0);
-x_16 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_1, x_3, x_4, x_2, x_13, x_14, x_15, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-if (lean_obj_tag(x_16) == 0)
-{
-uint8_t x_17; 
-x_17 = !lean_is_exclusive(x_16);
-if (x_17 == 0)
-{
-return x_16;
-}
-else
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_16, 0);
-x_19 = lean_ctor_get(x_16, 1);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_dec(x_16);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-return x_20;
-}
-}
-else
-{
-uint8_t x_21; 
-x_21 = !lean_is_exclusive(x_16);
-if (x_21 == 0)
-{
-return x_16;
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_16, 0);
-x_23 = lean_ctor_get(x_16, 1);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_16);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
-}
-}
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
-_start:
-{
-uint8_t x_15; size_t x_16; size_t x_17; lean_object* x_18; 
-x_15 = lean_unbox(x_3);
-lean_dec(x_3);
-x_16 = lean_unbox_usize(x_5);
-lean_dec(x_5);
-x_17 = lean_unbox_usize(x_6);
-lean_dec(x_6);
-x_18 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_1, x_2, x_15, x_4, x_16, x_17, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+lean_object* x_11; size_t x_12; size_t x_13; lean_object* x_14; lean_object* x_15; 
+x_11 = lean_array_get_size(x_2);
+x_12 = lean_usize_of_nat(x_11);
 lean_dec(x_11);
+x_13 = 0;
+x_14 = lean_box(0);
+x_15 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_1, x_3, x_2, x_12, x_13, x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_15) == 0)
+{
+uint8_t x_16; 
+x_16 = !lean_is_exclusive(x_15);
+if (x_16 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_15, 0);
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_dec(x_15);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_17);
+lean_ctor_set(x_19, 1, x_18);
+return x_19;
+}
+}
+else
+{
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_15);
+if (x_20 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_15, 0);
+x_22 = lean_ctor_get(x_15, 1);
+lean_inc(x_22);
+lean_inc(x_21);
+lean_dec(x_15);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
+}
+}
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+_start:
+{
+size_t x_14; size_t x_15; lean_object* x_16; 
+x_14 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_15 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_16 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_1, x_2, x_3, x_14, x_15, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_4);
-return x_18;
+lean_dec(x_8);
+lean_dec(x_3);
+return x_16;
 }
 }
-lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___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, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-uint8_t x_12; lean_object* x_13; 
-x_12 = lean_unbox(x_4);
-lean_dec(x_4);
-x_13 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-lean_dec(x_8);
+lean_object* x_11; 
+x_11 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 lean_dec(x_2);
+return x_11;
+}
+}
+lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object* x_1, lean_object* x_2, uint8_t x_3, 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_object* x_10) {
+_start:
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_box(x_3);
+x_12 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_12, 0, x_11);
+x_13 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_13;
 }
 }
-lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object* x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, 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_11) {
-_start:
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_box(x_3);
-x_13 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_13, 0, x_12);
-x_14 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_13, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-return x_14;
-}
-}
-lean_object* l_Lean_Elab_Term_applyAttributesAt___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
-_start:
-{
-uint8_t x_12; uint8_t x_13; lean_object* x_14; 
-x_12 = lean_unbox(x_3);
-lean_dec(x_3);
-x_13 = lean_unbox(x_4);
-lean_dec(x_4);
-x_14 = l_Lean_Elab_Term_applyAttributesAt(x_1, x_2, x_12, x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_2);
-return x_14;
-}
-}
-lean_object* l_Lean_Elab_Term_applyAttributes(lean_object* x_1, lean_object* x_2, uint8_t x_3, 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_object* x_10) {
-_start:
-{
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_box(0);
-x_12 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-return x_12;
-}
-}
-lean_object* l_Lean_Elab_Term_applyAttributes___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, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_Lean_Elab_Term_applyAttributesAt___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, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_3);
 lean_dec(x_3);
-x_12 = l_Lean_Elab_Term_applyAttributes(x_1, x_2, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_12 = l_Lean_Elab_Term_applyAttributesAt(x_1, x_2, x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
@@ -9008,6 +8775,27 @@ lean_dec(x_2);
 return x_12;
 }
 }
+lean_object* l_Lean_Elab_Term_applyAttributes(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, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_box(0);
+x_11 = l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore(x_1, x_2, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+lean_object* l_Lean_Elab_Term_applyAttributes___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, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_Elab_Term_applyAttributes(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+return x_10;
+}
+}
 lean_object* l_Lean_Elab_Term_mkTypeMismatchError_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -29420,7 +29208,7 @@ lean_dec(x_3);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -29430,11 +29218,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -29605,7 +29393,7 @@ lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lea
 x_97 = lean_ctor_get(x_91, 1);
 lean_inc(x_97);
 lean_dec(x_91);
-x_98 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
+x_98 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 x_99 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_98, x_2, x_3, x_4, x_5, x_6, x_7, x_97);
 x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
@@ -29647,7 +29435,7 @@ lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean
 x_53 = lean_ctor_get(x_47, 1);
 lean_inc(x_53);
 lean_dec(x_47);
-x_54 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
+x_54 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 x_55 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_54, x_2, x_3, x_4, x_5, x_6, x_7, x_53);
 x_56 = lean_ctor_get(x_55, 0);
 lean_inc(x_56);
@@ -29728,7 +29516,7 @@ x_41 = l_Lean_KernelException_toMessageData___closed__15;
 x_42 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
-x_43 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
+x_43 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 x_44 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_43, x_42, x_2, x_3, x_4, x_5, x_6, x_7, x_36);
 x_45 = lean_ctor_get(x_44, 1);
 lean_inc(x_45);
@@ -29790,7 +29578,7 @@ x_79 = l_Lean_KernelException_toMessageData___closed__15;
 x_80 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_80, 0, x_78);
 lean_ctor_set(x_80, 1, x_79);
-x_81 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1;
+x_81 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1;
 x_82 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_81, x_80, x_2, x_3, x_4, x_5, x_6, x_7, x_61);
 x_83 = lean_ctor_get(x_82, 1);
 lean_inc(x_83);
@@ -37925,7 +37713,7 @@ x_8 = l_Lean_Elab_Term_instMetaEvalTermElabM___rarg(x_1, x_2, x_3, x_4, x_7, x_6
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -37935,7 +37723,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706_(lean_object* x_1) {
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -37947,7 +37735,7 @@ lean_object* x_4; lean_object* x_5; lean_object* x_6;
 x_4 = lean_ctor_get(x_3, 1);
 lean_inc(x_4);
 lean_dec(x_3);
-x_5 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1;
+x_5 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1;
 x_6 = l_Lean_registerTraceClass(x_5, x_4);
 if (lean_obj_tag(x_6) == 0)
 {
@@ -38234,12 +38022,6 @@ l_Lean_Elab_Term_mkExplicitBinder___closed__7 = _init_l_Lean_Elab_Term_mkExplici
 lean_mark_persistent(l_Lean_Elab_Term_mkExplicitBinder___closed__7);
 l_Lean_Elab_Term_mkExplicitBinder___closed__8 = _init_l_Lean_Elab_Term_mkExplicitBinder___closed__8();
 lean_mark_persistent(l_Lean_Elab_Term_mkExplicitBinder___closed__8);
-l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1 = _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__1);
-l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2 = _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2();
-lean_mark_persistent(l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__2);
-l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3 = _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3();
-lean_mark_persistent(l___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore_apply___closed__3);
 l_Lean_Elab_Term_mkTypeMismatchError___closed__1 = _init_l_Lean_Elab_Term_mkTypeMismatchError___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_mkTypeMismatchError___closed__1);
 l_Lean_Elab_Term_mkTypeMismatchError___closed__2 = _init_l_Lean_Elab_Term_mkTypeMismatchError___closed__2();
@@ -38386,9 +38168,9 @@ l_Lean_Elab_Term_mkAuxName___closed__2 = _init_l_Lean_Elab_Term_mkAuxName___clos
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__2);
 l_Lean_Elab_Term_mkAuxName___closed__3 = _init_l_Lean_Elab_Term_mkAuxName___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966____closed__1);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5966_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882____closed__1);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5882_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_isLetRecAuxMVar___closed__1 = _init_l_Lean_Elab_Term_isLetRecAuxMVar___closed__1();
@@ -38583,9 +38365,9 @@ l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__2 = _init_l_Lean_Elab_Te
 lean_mark_persistent(l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__2);
 l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__3 = _init_l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__3);
-l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706____closed__1);
-res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7706_(lean_io_mk_world());
+l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622____closed__1);
+res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_7622_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Parser/Command.c b/stage0/stdlib/Lean/Parser/Command.c
index bee268b83b..6b74a6afe7 100644
--- a/stage0/stdlib/Lean/Parser/Command.c
+++ b/stage0/stdlib/Lean/Parser/Command.c
@@ -135,7 +135,6 @@ lean_object* l_Lean_Parser_Command_inductive___elambda__1(lean_object*, lean_obj
 lean_object* l_Lean_Parser_Command_initialize_parenthesizer___closed__5;
 lean_object* l_Lean_Parser_Command_ctor___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Command_structure___elambda__1___closed__14;
-lean_object* l_Lean_Parser_Command_attribute_parenthesizer___closed__6;
 lean_object* l_Lean_Parser_Command_declaration_formatter___closed__3;
 lean_object* l_Lean_Parser_Command_declSig_parenthesizer___closed__1;
 lean_object* l_Lean_Parser_Command_declaration_parenthesizer___closed__23;
@@ -557,7 +556,6 @@ lean_object* l_Lean_Parser_atomicFn(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_declaration___closed__10;
 lean_object* l_Lean_Parser_Command_commentBody___closed__1;
 lean_object* l_Lean_Parser_Command_eval___elambda__1___closed__10;
-lean_object* l_Lean_Parser_Command_attribute___closed__12;
 lean_object* l_Lean_Parser_Command_export___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Command_synth_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_synth___closed__7;
@@ -699,7 +697,6 @@ lean_object* l_Lean_Parser_Command_openSimple___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Command_inductive___elambda__1___closed__20;
 lean_object* l_Lean_Parser_Command_declaration_formatter___closed__10;
 lean_object* l_Lean_Parser_optional_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Parser_Term_local___closed__1;
 lean_object* l_Lean_Parser_Command_instance_parenthesizer___closed__1;
 lean_object* l_Lean_Parser_Command_initialize___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_example___elambda__1___closed__1;
@@ -1132,7 +1129,6 @@ lean_object* l___regBuiltinParser_Lean_Parser_Command_check__failure(lean_object
 lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_section___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Command_export_parenthesizer___closed__3;
-lean_object* l_Lean_Parser_Command_attribute_formatter___closed__9;
 lean_object* l_Lean_Parser_Command_variable_parenthesizer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_doFor_formatter___closed__3;
 lean_object* l_Lean_Parser_Command_theorem_formatter___closed__2;
@@ -1213,7 +1209,6 @@ lean_object* l_Lean_Parser_Command_declValEqns___closed__1;
 lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__9;
 lean_object* l_Lean_Parser_Command_structure___elambda__1___closed__26;
 lean_object* l_Lean_Parser_Command_variables___closed__3;
-lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__19;
 extern lean_object* l_Lean_Parser_Term_doSeq___closed__2;
 lean_object* l_Lean_Parser_Command_openHiding_parenthesizer___closed__2;
 lean_object* l_Lean_Parser_Command_variable___elambda__1___closed__4;
@@ -1256,7 +1251,6 @@ lean_object* l_Lean_Parser_Command_classTk___closed__2;
 lean_object* l_Lean_Parser_Command_declValEqns_formatter___closed__2;
 lean_object* l_Lean_Parser_Command_noncomputable_parenthesizer___closed__2;
 lean_object* l_Lean_Parser_Command_initialize___elambda__1___closed__14;
-extern lean_object* l_Lean_Parser_Term_local_formatter___closed__2;
 lean_object* l_Lean_Parser_Command_structSimpleBinder_formatter___closed__2;
 lean_object* l_Lean_Parser_Command_declaration___elambda__1___closed__11;
 lean_object* l_Lean_Parser_Command_optDeclSig_formatter___closed__2;
@@ -2030,7 +2024,6 @@ lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_structSimpleBinder___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Command_resolve__name_formatter___closed__1;
 lean_object* l_Lean_Parser_Command_openHiding___closed__1;
-extern lean_object* l_Lean_Parser_Tactic_tacticSeqBracketed_parenthesizer___closed__3;
 lean_object* l_Lean_Parser_Command_check__failure___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_def___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_inductive___elambda__1___closed__2;
@@ -2160,7 +2153,6 @@ lean_object* l_Lean_Parser_Command_abbrev___elambda__1___closed__10;
 lean_object* l_Lean_Parser_Command_set__option___closed__2;
 lean_object* l_Lean_Parser_Command_init__quot___elambda__1___closed__6;
 lean_object* l___regBuiltinParser_Lean_Parser_Command_mutual(lean_object*);
-lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__17;
 lean_object* l_Lean_Parser_Command_openOnly___elambda__1___closed__9;
 lean_object* l_Lean_Parser_Command_openSimple___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_openOnly___closed__1;
@@ -2200,7 +2192,6 @@ lean_object* l_Lean_Parser_Command_open_formatter___closed__4;
 lean_object* l_Lean_Parser_Command_def___closed__2;
 lean_object* l_Lean_Parser_mkAntiquot(lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Parser_Command_init__quot___elambda__1___closed__3;
-lean_object* l_Lean_Parser_Command_attribute_formatter___closed__10;
 extern lean_object* l_Lean_Parser_Term_doFor___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_ctor___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_optDeclSig___elambda__1___closed__1;
@@ -2307,7 +2298,6 @@ lean_object* l_Lean_Parser_Command_partial___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_openOnly_formatter(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_openOnly___closed__7;
 lean_object* l_Lean_Parser_Command_attribute_formatter___closed__7;
-extern lean_object* l_Lean_Parser_Term_local___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__14;
 lean_object* l_Lean_Parser_Command_inductive_formatter___closed__7;
 lean_object* l_Lean_Parser_Command_classInductive_formatter___closed__4;
@@ -2627,7 +2617,6 @@ lean_object* l_Lean_Parser_Command_structure_formatter___closed__3;
 extern lean_object* l_Lean_Parser_Term_explicitBinder_formatter___closed__5;
 lean_object* l_Lean_Parser_Command_instance___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_set__option___closed__11;
-lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__18;
 lean_object* l_Lean_Parser_Command_open___elambda__1___closed__9;
 lean_object* l_Lean_Parser_Command_theorem___closed__2;
 lean_object* l_Lean_Parser_Command_check_parenthesizer___closed__1;
@@ -23923,13 +23912,9 @@ return x_4;
 static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__5() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_local___closed__1;
-x_2 = l_Lean_Parser_Term_local___elambda__1___closed__7;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
+lean_object* x_1; 
+x_1 = lean_mk_string("] ");
+return x_1;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__6() {
@@ -23937,78 +23922,61 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__5;
-x_2 = l_Lean_Parser_optional(x_1);
+x_2 = l_String_trim(x_1);
 return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__7() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("] ");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__8() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__7;
-x_2 = l_String_trim(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__9() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__8;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__6;
 x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbolFn___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__10() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_structExplicitBinder___elambda__1___closed__7;
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__9;
+x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__7;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_4, 0, x_3);
 lean_closure_set(x_4, 1, x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__11() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Term_attributes___elambda__1___closed__3;
 x_2 = lean_ctor_get(x_1, 1);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__10;
+x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__8;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_4, 0, x_2);
 lean_closure_set(x_4, 1, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__12() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_mkAntiquotScope___closed__5;
-x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__11;
+x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__9;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__13() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__11() {
 _start:
 {
 lean_object* x_1; 
@@ -24016,69 +23984,55 @@ x_1 = lean_mk_string("attribute ");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__14() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__13;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__11;
 x_2 = l_String_trim(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__15() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__14;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__12;
 x_2 = lean_alloc_closure((void*)(l_Lean_Parser_symbolFn___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__16() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__15;
-x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__12;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__13;
+x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__10;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__17() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__6;
-x_2 = lean_ctor_get(x_1, 1);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__16;
-x_4 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
-lean_closure_set(x_4, 0, x_2);
-lean_closure_set(x_4, 1, x_3);
-return x_4;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__18() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__15() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__2;
-x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__17;
+x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__14;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_nodeFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__19() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___elambda__1___closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_sepByScopeSuffixes___elambda__1___closed__11;
-x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__18;
+x_2 = l_Lean_Parser_Command_attribute___elambda__1___closed__15;
 x_3 = lean_alloc_closure((void*)(l_Lean_Parser_andthenFn), 4, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -24092,7 +24046,7 @@ lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object*
 x_3 = l_Lean_Parser_Command_attribute___elambda__1___closed__4;
 x_4 = lean_ctor_get(x_3, 1);
 lean_inc(x_4);
-x_5 = l_Lean_Parser_Command_attribute___elambda__1___closed__19;
+x_5 = l_Lean_Parser_Command_attribute___elambda__1___closed__16;
 x_6 = 1;
 x_7 = l_Lean_Parser_orelseFnCore(x_4, x_5, x_6, x_1, x_2);
 return x_7;
@@ -24102,7 +24056,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__8;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__6;
 x_2 = l_Lean_Parser_symbolInfo(x_1);
 return x_2;
 }
@@ -24145,7 +24099,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__14;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__12;
 x_2 = l_Lean_Parser_symbolInfo(x_1);
 return x_2;
 }
@@ -24163,48 +24117,36 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_attribute___closed__7() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__6;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_attribute___closed__6;
-x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
-return x_4;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__2;
+x_2 = l_Lean_Parser_Command_attribute___closed__6;
+x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_attribute___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__2;
+x_1 = l_Lean_Parser_epsilonInfo;
 x_2 = l_Lean_Parser_Command_attribute___closed__7;
-x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_attribute___closed__9() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_epsilonInfo;
-x_2 = l_Lean_Parser_Command_attribute___closed__8;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute___closed__10() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__4;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Command_attribute___closed__9;
+x_3 = l_Lean_Parser_Command_attribute___closed__8;
 x_4 = l_Lean_Parser_orelseInfo(x_2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___closed__11() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -24212,12 +24154,12 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Parser_Command_attribute___elambda__1),
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Command_attribute___closed__12() {
+static lean_object* _init_l_Lean_Parser_Command_attribute___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute___closed__10;
-x_2 = l_Lean_Parser_Command_attribute___closed__11;
+x_1 = l_Lean_Parser_Command_attribute___closed__9;
+x_2 = l_Lean_Parser_Command_attribute___closed__10;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -24228,7 +24170,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Command_attribute___closed__12;
+x_1 = l_Lean_Parser_Command_attribute___closed__11;
 return x_1;
 }
 }
@@ -24264,8 +24206,8 @@ static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__2(
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_local_formatter___closed__2;
-x_2 = lean_alloc_closure((void*)(l_Lean_Parser_optional_formatter), 6, 1);
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__11;
+x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_symbol_formatter), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
@@ -24274,7 +24216,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__3(
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__13;
+x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__5;
 x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_symbol_formatter), 6, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -24283,19 +24225,21 @@ return x_2;
 static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__7;
-x_2 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_symbol_formatter), 6, 1);
-lean_closure_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Command_attribute_formatter___closed__3;
+x_2 = l_Lean_Parser_Command_structExplicitBinder_formatter___closed__4;
+x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
+lean_closure_set(x_3, 0, x_1);
+lean_closure_set(x_3, 1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute_formatter___closed__4;
-x_2 = l_Lean_Parser_Command_structExplicitBinder_formatter___closed__4;
+x_1 = l_Lean_Parser_Term_attributes_formatter___closed__4;
+x_2 = l_Lean_Parser_Command_attribute_formatter___closed__4;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
@@ -24306,7 +24250,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__6(
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_attributes_formatter___closed__4;
+x_1 = l_Lean_Parser_mkAntiquotScope_formatter___closed__1;
 x_2 = l_Lean_Parser_Command_attribute_formatter___closed__5;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
@@ -24318,7 +24262,7 @@ static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__7(
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_mkAntiquotScope_formatter___closed__1;
+x_1 = l_Lean_Parser_Command_attribute_formatter___closed__2;
 x_2 = l_Lean_Parser_Command_attribute_formatter___closed__6;
 x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
 lean_closure_set(x_3, 0, x_1);
@@ -24329,34 +24273,10 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__8() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute_formatter___closed__3;
-x_2 = l_Lean_Parser_Command_attribute_formatter___closed__7;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__9() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Command_attribute_formatter___closed__2;
-x_2 = l_Lean_Parser_Command_attribute_formatter___closed__8;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Formatter_andthen_formatter), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute_formatter___closed__10() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Command_attribute_formatter___closed__9;
+x_3 = l_Lean_Parser_Command_attribute_formatter___closed__7;
 x_4 = lean_alloc_closure((void*)(l_Lean_Parser_leadingNode_formatter___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -24369,7 +24289,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Command_attribute_formatter___closed__1;
-x_7 = l_Lean_Parser_Command_attribute_formatter___closed__10;
+x_7 = l_Lean_Parser_Command_attribute_formatter___closed__8;
 x_8 = l_Lean_PrettyPrinter_Formatter_orelse_formatter(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -24445,22 +24365,10 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Command_attribute_parenthesizer___closed__5() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_tacticSeqBracketed_parenthesizer___closed__3;
-x_2 = l_Lean_Parser_Command_attribute_parenthesizer___closed__4;
-x_3 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_andthen_parenthesizer), 7, 2);
-lean_closure_set(x_3, 0, x_1);
-lean_closure_set(x_3, 1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Parser_Command_attribute_parenthesizer___closed__6() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Command_attribute___elambda__1___closed__2;
 x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Command_attribute_parenthesizer___closed__5;
+x_3 = l_Lean_Parser_Command_attribute_parenthesizer___closed__4;
 x_4 = lean_alloc_closure((void*)(l_Lean_PrettyPrinter_Parenthesizer_leadingNode_parenthesizer___boxed), 8, 3);
 lean_closure_set(x_4, 0, x_1);
 lean_closure_set(x_4, 1, x_2);
@@ -24473,7 +24381,7 @@ _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_Parser_Command_attribute_parenthesizer___closed__1;
-x_7 = l_Lean_Parser_Command_attribute_parenthesizer___closed__6;
+x_7 = l_Lean_Parser_Command_attribute_parenthesizer___closed__5;
 x_8 = l_Lean_PrettyPrinter_Parenthesizer_orelse_parenthesizer(x_6, x_7, x_1, x_2, x_3, x_4, x_5);
 return x_8;
 }
@@ -32627,12 +32535,6 @@ l_Lean_Parser_Command_attribute___elambda__1___closed__15 = _init_l_Lean_Parser_
 lean_mark_persistent(l_Lean_Parser_Command_attribute___elambda__1___closed__15);
 l_Lean_Parser_Command_attribute___elambda__1___closed__16 = _init_l_Lean_Parser_Command_attribute___elambda__1___closed__16();
 lean_mark_persistent(l_Lean_Parser_Command_attribute___elambda__1___closed__16);
-l_Lean_Parser_Command_attribute___elambda__1___closed__17 = _init_l_Lean_Parser_Command_attribute___elambda__1___closed__17();
-lean_mark_persistent(l_Lean_Parser_Command_attribute___elambda__1___closed__17);
-l_Lean_Parser_Command_attribute___elambda__1___closed__18 = _init_l_Lean_Parser_Command_attribute___elambda__1___closed__18();
-lean_mark_persistent(l_Lean_Parser_Command_attribute___elambda__1___closed__18);
-l_Lean_Parser_Command_attribute___elambda__1___closed__19 = _init_l_Lean_Parser_Command_attribute___elambda__1___closed__19();
-lean_mark_persistent(l_Lean_Parser_Command_attribute___elambda__1___closed__19);
 l_Lean_Parser_Command_attribute___closed__1 = _init_l_Lean_Parser_Command_attribute___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_attribute___closed__1);
 l_Lean_Parser_Command_attribute___closed__2 = _init_l_Lean_Parser_Command_attribute___closed__2();
@@ -32655,8 +32557,6 @@ l_Lean_Parser_Command_attribute___closed__10 = _init_l_Lean_Parser_Command_attri
 lean_mark_persistent(l_Lean_Parser_Command_attribute___closed__10);
 l_Lean_Parser_Command_attribute___closed__11 = _init_l_Lean_Parser_Command_attribute___closed__11();
 lean_mark_persistent(l_Lean_Parser_Command_attribute___closed__11);
-l_Lean_Parser_Command_attribute___closed__12 = _init_l_Lean_Parser_Command_attribute___closed__12();
-lean_mark_persistent(l_Lean_Parser_Command_attribute___closed__12);
 l_Lean_Parser_Command_attribute = _init_l_Lean_Parser_Command_attribute();
 lean_mark_persistent(l_Lean_Parser_Command_attribute);
 res = l___regBuiltinParser_Lean_Parser_Command_attribute(lean_io_mk_world());
@@ -32678,10 +32578,6 @@ l_Lean_Parser_Command_attribute_formatter___closed__7 = _init_l_Lean_Parser_Comm
 lean_mark_persistent(l_Lean_Parser_Command_attribute_formatter___closed__7);
 l_Lean_Parser_Command_attribute_formatter___closed__8 = _init_l_Lean_Parser_Command_attribute_formatter___closed__8();
 lean_mark_persistent(l_Lean_Parser_Command_attribute_formatter___closed__8);
-l_Lean_Parser_Command_attribute_formatter___closed__9 = _init_l_Lean_Parser_Command_attribute_formatter___closed__9();
-lean_mark_persistent(l_Lean_Parser_Command_attribute_formatter___closed__9);
-l_Lean_Parser_Command_attribute_formatter___closed__10 = _init_l_Lean_Parser_Command_attribute_formatter___closed__10();
-lean_mark_persistent(l_Lean_Parser_Command_attribute_formatter___closed__10);
 l___regBuiltin_Lean_Parser_Command_attribute_formatter___closed__1 = _init_l___regBuiltin_Lean_Parser_Command_attribute_formatter___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Command_attribute_formatter___closed__1);
 res = l___regBuiltin_Lean_Parser_Command_attribute_formatter(lean_io_mk_world());
@@ -32697,8 +32593,6 @@ l_Lean_Parser_Command_attribute_parenthesizer___closed__4 = _init_l_Lean_Parser_
 lean_mark_persistent(l_Lean_Parser_Command_attribute_parenthesizer___closed__4);
 l_Lean_Parser_Command_attribute_parenthesizer___closed__5 = _init_l_Lean_Parser_Command_attribute_parenthesizer___closed__5();
 lean_mark_persistent(l_Lean_Parser_Command_attribute_parenthesizer___closed__5);
-l_Lean_Parser_Command_attribute_parenthesizer___closed__6 = _init_l_Lean_Parser_Command_attribute_parenthesizer___closed__6();
-lean_mark_persistent(l_Lean_Parser_Command_attribute_parenthesizer___closed__6);
 l___regBuiltin_Lean_Parser_Command_attribute_parenthesizer___closed__1 = _init_l___regBuiltin_Lean_Parser_Command_attribute_parenthesizer___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Parser_Command_attribute_parenthesizer___closed__1);
 res = l___regBuiltin_Lean_Parser_Command_attribute_parenthesizer(lean_io_mk_world());