diff --git a/stage0/src/Init/Lean/Compiler/IR/Basic.lean b/stage0/src/Init/Lean/Compiler/IR/Basic.lean
index a6d7a9e468..cb280fb6a6 100644
--- a/stage0/src/Init/Lean/Compiler/IR/Basic.lean
+++ b/stage0/src/Init/Lean/Compiler/IR/Basic.lean
@@ -48,7 +48,7 @@ end JoinPointId
 
 abbrev MData := KVMap
 namespace MData
-abbrev empty : MData := ({} : KVMap)
+abbrev empty : MData := { : KVMap }
 instance : HasEmptyc MData := ⟨empty⟩
 end MData
 
diff --git a/stage0/src/Init/Lean/Data/Options.lean b/stage0/src/Init/Lean/Data/Options.lean
index 145bbae172..f0538671eb 100644
--- a/stage0/src/Init/Lean/Data/Options.lean
+++ b/stage0/src/Init/Lean/Data/Options.lean
@@ -14,7 +14,7 @@ namespace Lean
 def Options := KVMap
 
 namespace Options
-def empty : Options  := ({} : KVMap)
+def empty : Options  := { : KVMap }
 instance : HasEmptyc Options := ⟨empty⟩
 instance : Inhabited Options := ⟨empty⟩
 instance : HasToString Options := inferInstanceAs (HasToString KVMap)
diff --git a/stage0/src/Init/Lean/Elab/Frontend.lean b/stage0/src/Init/Lean/Elab/Frontend.lean
index bdd60cdf88..d146019cc8 100644
--- a/stage0/src/Init/Lean/Elab/Frontend.lean
+++ b/stage0/src/Init/Lean/Elab/Frontend.lean
@@ -88,7 +88,7 @@ EIO.adaptExcept (fun (ex : Empty) => Empty.rec _ ex) $
 def process (input : String) (env : Environment) (opts : Options) (fileName : Option String := none) : IO (Environment × MessageLog) := do
 let fileName   := fileName.getD "<input>";
 let inputCtx   := Parser.mkInputContext input fileName;
-parserStateRef ← IO.mkRef ({} : Parser.ModuleParserState);
+parserStateRef ← IO.mkRef { : Parser.ModuleParserState };
 cmdStateRef    ← IO.mkRef $ Command.mkState env {} opts;
 IO.processCommands inputCtx parserStateRef cmdStateRef;
 cmdState ← cmdStateRef.get;
diff --git a/stage0/src/Init/Lean/Elab/Import.lean b/stage0/src/Init/Lean/Elab/Import.lean
index f862e50dd6..0fddaade24 100644
--- a/stage0/src/Init/Lean/Elab/Import.lean
+++ b/stage0/src/Init/Lean/Elab/Import.lean
@@ -11,7 +11,7 @@ namespace Elab
 
 def headerToImports (header : Syntax) : List Import :=
 let header  := header.asNode;
-let imports := if (header.getArg 0).isNone then [({ module := `Init } : Import)] else [];
+let imports := if (header.getArg 0).isNone then [{ module := `Init : Import }] else [];
 imports ++ (header.getArg 1).getArgs.toList.map (fun stx =>
   -- `stx` is of the form `(Module.import "import" "runtime"? id)
   let runtime := !(stx.getArg 1).isNone;
diff --git a/stage0/src/Init/Lean/Elab/Quotation.lean b/stage0/src/Init/Lean/Elab/Quotation.lean
index 37ccec4585..6ab00149cd 100644
--- a/stage0/src/Init/Lean/Elab/Quotation.lean
+++ b/stage0/src/Init/Lean/Elab/Quotation.lean
@@ -168,7 +168,7 @@ def HeadInfo.generalizes : HeadInfo → HeadInfo → Bool
 
 private def getHeadInfo (alt : Alt) : HeadInfo :=
 let pat := alt.fst.head!;
-let unconditional (rhsFn) := ({ rhsFn := rhsFn } : HeadInfo );
+let unconditional (rhsFn) := { rhsFn := rhsFn : HeadInfo };
 -- variable pattern
 if pat.isOfKind `Lean.Parser.Term.id then unconditional $ fun rhs => `(let $pat := discr; $rhs)
 -- wildcard pattern
diff --git a/stage0/src/Init/Lean/Expr.lean b/stage0/src/Init/Lean/Expr.lean
index 05147d0ac7..6e075dee2c 100644
--- a/stage0/src/Init/Lean/Expr.lean
+++ b/stage0/src/Init/Lean/Expr.lean
@@ -79,7 +79,7 @@ protected def BinderInfo.beq : BinderInfo → BinderInfo → Bool
 instance BinderInfo.hasBeq : HasBeq BinderInfo := ⟨BinderInfo.beq⟩
 
 abbrev MData := KVMap
-abbrev MData.empty : MData := ({} : KVMap)
+abbrev MData.empty : MData := { : KVMap }
 instance MVData.hasEmptc : HasEmptyc MData := ⟨MData.empty⟩
 
 /--
diff --git a/stage0/src/Init/Lean/Meta/SynthInstance.lean b/stage0/src/Init/Lean/Meta/SynthInstance.lean
index 0bf6c7e099..80d0262fdc 100644
--- a/stage0/src/Init/Lean/Meta/SynthInstance.lean
+++ b/stage0/src/Init/Lean/Meta/SynthInstance.lean
@@ -465,7 +465,7 @@ traceCtx `Meta.synthInstance $ do
    mvar ← mkFreshExprMVar type;
    mctx ← getMCtx;
    let key := mkTableKey mctx type;
-   adaptState' (fun (s : Meta.State) => ( { toState := s } : State )) (fun (s : State) => s.toState) $ do {
+   adaptState' (fun (s : Meta.State) => { toState := s : State }) (fun (s : State) => s.toState) $ do {
      newSubgoal mctx key mvar Waiter.root;
      synth fuel
    }
diff --git a/stage0/src/Init/Lean/Parser/Module.lean b/stage0/src/Init/Lean/Parser/Module.lean
index 7a679aafe2..653301a6be 100644
--- a/stage0/src/Init/Lean/Parser/Module.lean
+++ b/stage0/src/Init/Lean/Parser/Module.lean
@@ -44,7 +44,7 @@ let stx := s.stxStack.back;
 match s.errorMsg with
 | some errorMsg =>
   let msg := mkErrorMessage ctx s.pos (toString errorMsg);
-  (stx, { pos := s.pos, recovering := true }, ({} : MessageLog).add msg)
+  (stx, { pos := s.pos, recovering := true }, { : MessageLog }.add msg)
 | none =>
   (stx, { pos := s.pos }, {})
 
diff --git a/stage0/src/Init/Lean/Parser/Term.lean b/stage0/src/Init/Lean/Parser/Term.lean
index 3e0f5593ae..aa6f64dec1 100644
--- a/stage0/src/Init/Lean/Parser/Term.lean
+++ b/stage0/src/Init/Lean/Parser/Term.lean
@@ -75,8 +75,7 @@ def haveAssign := parser! " := " >> termParser
 def structInstArrayRef := parser! "[" >> termParser >>"]"
 def structInstLVal   := (ident <|> fieldIdx <|> structInstArrayRef) >> many (group ("." >> (ident <|> fieldIdx)) <|> structInstArrayRef)
 def structInstField  := parser! structInstLVal >> " := " >> termParser
-def structInstSource := parser! ".." >> optional termParser
-@[builtinTermParser] def structInst := parser! symbol "{" appPrec >> optional (try (ident >> checkWsBefore "expected space '.'" >> " . ")) >> sepBy (structInstField <|> structInstSource) ", " true >> "}"
+@[builtinTermParser] def structInst := parser! symbol "{" appPrec >> optional (try (termParser >> "with")) >> sepBy structInstField ", " true >> optional ".." >> optional (" : " >> termParser) >> "}"
 def typeSpec := parser! " : " >> termParser
 def optType : Parser := optional typeSpec
 @[builtinTermParser] def subtype := parser! "{" >> ident >> optType >> " // " >> termParser >> "}"
diff --git a/stage0/stdlib/Init/Lean/Elab/Binders.c b/stage0/stdlib/Init/Lean/Elab/Binders.c
index 96f93e7fa1..ecb7355db3 100644
--- a/stage0/stdlib/Init/Lean/Elab/Binders.c
+++ b/stage0/stdlib/Init/Lean/Elab/Binders.c
@@ -58,6 +58,7 @@ lean_object* l_Lean_Elab_Term_elabLetDeclAux(lean_object*, lean_object*, lean_ob
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Binders_4__expandBinderModifier___closed__3;
+extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__6;
 lean_object* l___private_Init_Lean_Elab_Binders_6__matchBinder___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabArrow___closed__1;
 lean_object* l_Lean_Elab_Term_elabFunBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -220,7 +221,6 @@ extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__2;
 extern lean_object* l_Lean_Syntax_inhabited;
 lean_object* l_Lean_Elab_Term_elabArrow(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_Binders_6__matchBinder___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
 lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_Binders_6__matchBinder___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__5;
@@ -6671,24 +6671,16 @@ return x_3;
 lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("with");
-return x_1;
-}
-}
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_SourceInfo_inhabited___closed__1;
-x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__6;
 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;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -6700,29 +6692,29 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_empty___closed__1;
-x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_nullKind___closed__2;
-x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
+x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
 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;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -6730,21 +6722,21 @@ x_1 = lean_mk_string("invalid binder, simple identifier expected");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8;
+x_1 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10() {
+lean_object* _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
+x_1 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -6909,9 +6901,9 @@ lean_ctor_set(x_60, 1, x_58);
 x_61 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_62 = lean_array_push(x_61, x_60);
 x_63 = lean_array_push(x_62, x_54);
-x_64 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_64 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_65 = lean_array_push(x_63, x_64);
-x_66 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_66 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_67 = lean_array_push(x_65, x_66);
 lean_inc(x_11);
 x_68 = lean_array_push(x_52, x_11);
@@ -6997,9 +6989,9 @@ lean_ctor_set(x_104, 1, x_102);
 x_105 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_106 = lean_array_push(x_105, x_104);
 x_107 = lean_array_push(x_106, x_98);
-x_108 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_108 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_109 = lean_array_push(x_107, x_108);
-x_110 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_110 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_111 = lean_array_push(x_109, x_110);
 lean_inc(x_11);
 x_112 = lean_array_push(x_96, x_11);
@@ -7082,9 +7074,9 @@ lean_ctor_set(x_142, 1, x_140);
 x_143 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_144 = lean_array_push(x_143, x_142);
 x_145 = lean_array_push(x_144, x_136);
-x_146 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_146 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_147 = lean_array_push(x_145, x_146);
-x_148 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_148 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_149 = lean_array_push(x_147, x_148);
 lean_inc(x_11);
 x_150 = lean_array_push(x_134, x_11);
@@ -7184,7 +7176,7 @@ lean_object* x_179; lean_object* x_180; uint8_t x_181;
 lean_dec(x_178);
 lean_dec(x_176);
 lean_dec(x_2);
-x_179 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_179 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_180 = l_Lean_Elab_Term_throwError___rarg(x_11, x_179, x_5, x_6);
 lean_dec(x_11);
 x_181 = !lean_is_exclusive(x_180);
@@ -7290,9 +7282,9 @@ lean_ctor_set(x_217, 1, x_215);
 x_218 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_219 = lean_array_push(x_218, x_217);
 x_220 = lean_array_push(x_219, x_211);
-x_221 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_221 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_222 = lean_array_push(x_220, x_221);
-x_223 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_223 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_224 = lean_array_push(x_222, x_223);
 lean_inc(x_11);
 x_225 = lean_array_push(x_209, x_11);
@@ -7378,9 +7370,9 @@ lean_ctor_set(x_261, 1, x_259);
 x_262 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_263 = lean_array_push(x_262, x_261);
 x_264 = lean_array_push(x_263, x_255);
-x_265 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_265 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_266 = lean_array_push(x_264, x_265);
-x_267 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_267 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_268 = lean_array_push(x_266, x_267);
 lean_inc(x_11);
 x_269 = lean_array_push(x_253, x_11);
@@ -7463,9 +7455,9 @@ lean_ctor_set(x_299, 1, x_297);
 x_300 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_301 = lean_array_push(x_300, x_299);
 x_302 = lean_array_push(x_301, x_293);
-x_303 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_303 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_304 = lean_array_push(x_302, x_303);
-x_305 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_305 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_306 = lean_array_push(x_304, x_305);
 lean_inc(x_11);
 x_307 = lean_array_push(x_291, x_11);
@@ -7566,7 +7558,7 @@ lean_object* x_336; lean_object* x_337; uint8_t x_338;
 lean_dec(x_335);
 lean_dec(x_333);
 lean_dec(x_2);
-x_336 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_336 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_337 = l_Lean_Elab_Term_throwError___rarg(x_188, x_336, x_5, x_6);
 lean_dec(x_188);
 x_338 = !lean_is_exclusive(x_337);
@@ -7674,9 +7666,9 @@ lean_ctor_set(x_374, 1, x_372);
 x_375 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_376 = lean_array_push(x_375, x_374);
 x_377 = lean_array_push(x_376, x_368);
-x_378 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_378 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_379 = lean_array_push(x_377, x_378);
-x_380 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_380 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_381 = lean_array_push(x_379, x_380);
 lean_inc(x_11);
 x_382 = lean_array_push(x_366, x_11);
@@ -7762,9 +7754,9 @@ lean_ctor_set(x_418, 1, x_416);
 x_419 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_420 = lean_array_push(x_419, x_418);
 x_421 = lean_array_push(x_420, x_412);
-x_422 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_422 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_423 = lean_array_push(x_421, x_422);
-x_424 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_424 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_425 = lean_array_push(x_423, x_424);
 lean_inc(x_11);
 x_426 = lean_array_push(x_410, x_11);
@@ -7847,9 +7839,9 @@ lean_ctor_set(x_456, 1, x_454);
 x_457 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_458 = lean_array_push(x_457, x_456);
 x_459 = lean_array_push(x_458, x_450);
-x_460 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_460 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_461 = lean_array_push(x_459, x_460);
-x_462 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_462 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_463 = lean_array_push(x_461, x_462);
 lean_inc(x_11);
 x_464 = lean_array_push(x_448, x_11);
@@ -7950,7 +7942,7 @@ lean_object* x_493; lean_object* x_494; uint8_t x_495;
 lean_dec(x_492);
 lean_dec(x_490);
 lean_dec(x_2);
-x_493 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_493 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_494 = l_Lean_Elab_Term_throwError___rarg(x_345, x_493, x_5, x_6);
 lean_dec(x_345);
 x_495 = !lean_is_exclusive(x_494);
@@ -8074,9 +8066,9 @@ lean_ctor_set(x_537, 1, x_535);
 x_538 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_539 = lean_array_push(x_538, x_537);
 x_540 = lean_array_push(x_539, x_531);
-x_541 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_541 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_542 = lean_array_push(x_540, x_541);
-x_543 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_543 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_544 = lean_array_push(x_542, x_543);
 lean_inc(x_11);
 x_545 = lean_array_push(x_529, x_11);
@@ -8162,9 +8154,9 @@ lean_ctor_set(x_581, 1, x_579);
 x_582 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_583 = lean_array_push(x_582, x_581);
 x_584 = lean_array_push(x_583, x_575);
-x_585 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_585 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_586 = lean_array_push(x_584, x_585);
-x_587 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_587 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_588 = lean_array_push(x_586, x_587);
 lean_inc(x_11);
 x_589 = lean_array_push(x_573, x_11);
@@ -8247,9 +8239,9 @@ lean_ctor_set(x_619, 1, x_617);
 x_620 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_621 = lean_array_push(x_620, x_619);
 x_622 = lean_array_push(x_621, x_613);
-x_623 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_623 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_624 = lean_array_push(x_622, x_623);
-x_625 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_625 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_626 = lean_array_push(x_624, x_625);
 lean_inc(x_11);
 x_627 = lean_array_push(x_611, x_11);
@@ -8350,7 +8342,7 @@ lean_object* x_656; lean_object* x_657; uint8_t x_658;
 lean_dec(x_655);
 lean_dec(x_653);
 lean_dec(x_2);
-x_656 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_656 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_657 = l_Lean_Elab_Term_throwError___rarg(x_508, x_656, x_5, x_6);
 lean_dec(x_508);
 x_658 = !lean_is_exclusive(x_657);
@@ -8476,9 +8468,9 @@ lean_ctor_set(x_703, 1, x_701);
 x_704 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_705 = lean_array_push(x_704, x_703);
 x_706 = lean_array_push(x_705, x_697);
-x_707 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_707 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_708 = lean_array_push(x_706, x_707);
-x_709 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_709 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_710 = lean_array_push(x_708, x_709);
 lean_inc(x_11);
 x_711 = lean_array_push(x_695, x_11);
@@ -8564,9 +8556,9 @@ lean_ctor_set(x_747, 1, x_745);
 x_748 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_749 = lean_array_push(x_748, x_747);
 x_750 = lean_array_push(x_749, x_741);
-x_751 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_751 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_752 = lean_array_push(x_750, x_751);
-x_753 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_753 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_754 = lean_array_push(x_752, x_753);
 lean_inc(x_11);
 x_755 = lean_array_push(x_739, x_11);
@@ -8649,9 +8641,9 @@ lean_ctor_set(x_785, 1, x_783);
 x_786 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_787 = lean_array_push(x_786, x_785);
 x_788 = lean_array_push(x_787, x_779);
-x_789 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_789 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_790 = lean_array_push(x_788, x_789);
-x_791 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_791 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_792 = lean_array_push(x_790, x_791);
 lean_inc(x_11);
 x_793 = lean_array_push(x_777, x_11);
@@ -8796,9 +8788,9 @@ lean_ctor_set(x_842, 1, x_840);
 x_843 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_844 = lean_array_push(x_843, x_842);
 x_845 = lean_array_push(x_844, x_836);
-x_846 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_846 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_847 = lean_array_push(x_845, x_846);
-x_848 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_848 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_849 = lean_array_push(x_847, x_848);
 lean_inc(x_11);
 x_850 = lean_array_push(x_834, x_11);
@@ -8884,9 +8876,9 @@ lean_ctor_set(x_886, 1, x_884);
 x_887 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_888 = lean_array_push(x_887, x_886);
 x_889 = lean_array_push(x_888, x_880);
-x_890 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_890 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_891 = lean_array_push(x_889, x_890);
-x_892 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_892 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_893 = lean_array_push(x_891, x_892);
 lean_inc(x_11);
 x_894 = lean_array_push(x_878, x_11);
@@ -8969,9 +8961,9 @@ lean_ctor_set(x_924, 1, x_922);
 x_925 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_926 = lean_array_push(x_925, x_924);
 x_927 = lean_array_push(x_926, x_918);
-x_928 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_928 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_929 = lean_array_push(x_927, x_928);
-x_930 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_930 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_931 = lean_array_push(x_929, x_930);
 lean_inc(x_11);
 x_932 = lean_array_push(x_916, x_11);
@@ -9130,9 +9122,9 @@ lean_ctor_set(x_985, 1, x_983);
 x_986 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_987 = lean_array_push(x_986, x_985);
 x_988 = lean_array_push(x_987, x_979);
-x_989 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_989 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_990 = lean_array_push(x_988, x_989);
-x_991 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_991 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_992 = lean_array_push(x_990, x_991);
 lean_inc(x_11);
 x_993 = lean_array_push(x_977, x_11);
@@ -9218,9 +9210,9 @@ lean_ctor_set(x_1029, 1, x_1027);
 x_1030 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1031 = lean_array_push(x_1030, x_1029);
 x_1032 = lean_array_push(x_1031, x_1023);
-x_1033 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1033 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1034 = lean_array_push(x_1032, x_1033);
-x_1035 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1035 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1036 = lean_array_push(x_1034, x_1035);
 lean_inc(x_11);
 x_1037 = lean_array_push(x_1021, x_11);
@@ -9303,9 +9295,9 @@ lean_ctor_set(x_1067, 1, x_1065);
 x_1068 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1069 = lean_array_push(x_1068, x_1067);
 x_1070 = lean_array_push(x_1069, x_1061);
-x_1071 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1071 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1072 = lean_array_push(x_1070, x_1071);
-x_1073 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1073 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1074 = lean_array_push(x_1072, x_1073);
 lean_inc(x_11);
 x_1075 = lean_array_push(x_1059, x_11);
@@ -9440,9 +9432,9 @@ lean_ctor_set(x_1120, 1, x_1118);
 x_1121 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1122 = lean_array_push(x_1121, x_1120);
 x_1123 = lean_array_push(x_1122, x_1114);
-x_1124 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1124 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1125 = lean_array_push(x_1123, x_1124);
-x_1126 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1126 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1127 = lean_array_push(x_1125, x_1126);
 lean_inc(x_11);
 x_1128 = lean_array_push(x_1112, x_11);
@@ -9528,9 +9520,9 @@ lean_ctor_set(x_1164, 1, x_1162);
 x_1165 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1166 = lean_array_push(x_1165, x_1164);
 x_1167 = lean_array_push(x_1166, x_1158);
-x_1168 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1168 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1169 = lean_array_push(x_1167, x_1168);
-x_1170 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1170 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1171 = lean_array_push(x_1169, x_1170);
 lean_inc(x_11);
 x_1172 = lean_array_push(x_1156, x_11);
@@ -9613,9 +9605,9 @@ lean_ctor_set(x_1202, 1, x_1200);
 x_1203 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1204 = lean_array_push(x_1203, x_1202);
 x_1205 = lean_array_push(x_1204, x_1196);
-x_1206 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1206 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1207 = lean_array_push(x_1205, x_1206);
-x_1208 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1208 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1209 = lean_array_push(x_1207, x_1208);
 lean_inc(x_11);
 x_1210 = lean_array_push(x_1194, x_11);
@@ -9850,9 +9842,9 @@ lean_ctor_set(x_1279, 1, x_1277);
 x_1280 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1281 = lean_array_push(x_1280, x_1279);
 x_1282 = lean_array_push(x_1281, x_1273);
-x_1283 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1283 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1284 = lean_array_push(x_1282, x_1283);
-x_1285 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1285 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1286 = lean_array_push(x_1284, x_1285);
 lean_inc(x_11);
 x_1287 = lean_array_push(x_1271, x_11);
@@ -9957,7 +9949,7 @@ lean_object* x_1316; lean_object* x_1317; lean_object* x_1318; lean_object* x_13
 lean_dec(x_1315);
 lean_dec(x_1313);
 lean_dec(x_2);
-x_1316 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1316 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1317 = l_Lean_Elab_Term_throwError___rarg(x_11, x_1316, x_5, x_6);
 lean_dec(x_11);
 x_1318 = lean_ctor_get(x_1317, 0);
@@ -10080,9 +10072,9 @@ lean_ctor_set(x_1356, 1, x_1354);
 x_1357 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1358 = lean_array_push(x_1357, x_1356);
 x_1359 = lean_array_push(x_1358, x_1350);
-x_1360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1361 = lean_array_push(x_1359, x_1360);
-x_1362 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1362 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1363 = lean_array_push(x_1361, x_1362);
 lean_inc(x_11);
 x_1364 = lean_array_push(x_1348, x_11);
@@ -10188,7 +10180,7 @@ lean_object* x_1393; lean_object* x_1394; lean_object* x_1395; lean_object* x_13
 lean_dec(x_1392);
 lean_dec(x_1390);
 lean_dec(x_2);
-x_1393 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1393 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1394 = l_Lean_Elab_Term_throwError___rarg(x_1326, x_1393, x_5, x_6);
 lean_dec(x_1326);
 x_1395 = lean_ctor_get(x_1394, 0);
@@ -10313,9 +10305,9 @@ lean_ctor_set(x_1433, 1, x_1431);
 x_1434 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1435 = lean_array_push(x_1434, x_1433);
 x_1436 = lean_array_push(x_1435, x_1427);
-x_1437 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1437 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1438 = lean_array_push(x_1436, x_1437);
-x_1439 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1439 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1440 = lean_array_push(x_1438, x_1439);
 lean_inc(x_11);
 x_1441 = lean_array_push(x_1425, x_11);
@@ -10421,7 +10413,7 @@ lean_object* x_1470; lean_object* x_1471; lean_object* x_1472; lean_object* x_14
 lean_dec(x_1469);
 lean_dec(x_1467);
 lean_dec(x_2);
-x_1470 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1470 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1471 = l_Lean_Elab_Term_throwError___rarg(x_1403, x_1470, x_5, x_6);
 lean_dec(x_1403);
 x_1472 = lean_ctor_get(x_1471, 0);
@@ -10562,9 +10554,9 @@ lean_ctor_set(x_1516, 1, x_1514);
 x_1517 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1518 = lean_array_push(x_1517, x_1516);
 x_1519 = lean_array_push(x_1518, x_1510);
-x_1520 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1520 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1521 = lean_array_push(x_1519, x_1520);
-x_1522 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1522 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1523 = lean_array_push(x_1521, x_1522);
 lean_inc(x_11);
 x_1524 = lean_array_push(x_1508, x_11);
@@ -10670,7 +10662,7 @@ lean_object* x_1553; lean_object* x_1554; lean_object* x_1555; lean_object* x_15
 lean_dec(x_1552);
 lean_dec(x_1550);
 lean_dec(x_2);
-x_1553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1554 = l_Lean_Elab_Term_throwError___rarg(x_1486, x_1553, x_5, x_6);
 lean_dec(x_1486);
 x_1555 = lean_ctor_get(x_1554, 0);
@@ -10808,9 +10800,9 @@ lean_ctor_set(x_1601, 1, x_1599);
 x_1602 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1603 = lean_array_push(x_1602, x_1601);
 x_1604 = lean_array_push(x_1603, x_1595);
-x_1605 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1605 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1606 = lean_array_push(x_1604, x_1605);
-x_1607 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1607 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1608 = lean_array_push(x_1606, x_1607);
 lean_inc(x_11);
 x_1609 = lean_array_push(x_1593, x_11);
@@ -10971,9 +10963,9 @@ lean_ctor_set(x_1659, 1, x_1657);
 x_1660 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1661 = lean_array_push(x_1660, x_1659);
 x_1662 = lean_array_push(x_1661, x_1653);
-x_1663 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1663 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1664 = lean_array_push(x_1662, x_1663);
-x_1665 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1665 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1666 = lean_array_push(x_1664, x_1665);
 lean_inc(x_11);
 x_1667 = lean_array_push(x_1651, x_11);
@@ -11148,9 +11140,9 @@ lean_ctor_set(x_1721, 1, x_1719);
 x_1722 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1723 = lean_array_push(x_1722, x_1721);
 x_1724 = lean_array_push(x_1723, x_1715);
-x_1725 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1725 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1726 = lean_array_push(x_1724, x_1725);
-x_1727 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1727 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1728 = lean_array_push(x_1726, x_1727);
 lean_inc(x_11);
 x_1729 = lean_array_push(x_1713, x_11);
@@ -11301,9 +11293,9 @@ lean_ctor_set(x_1775, 1, x_1773);
 x_1776 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1777 = lean_array_push(x_1776, x_1775);
 x_1778 = lean_array_push(x_1777, x_1769);
-x_1779 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1779 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1780 = lean_array_push(x_1778, x_1779);
-x_1781 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1781 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1782 = lean_array_push(x_1780, x_1781);
 lean_inc(x_11);
 x_1783 = lean_array_push(x_1767, x_11);
@@ -11552,9 +11544,9 @@ lean_ctor_set(x_1855, 1, x_1853);
 x_1856 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1857 = lean_array_push(x_1856, x_1855);
 x_1858 = lean_array_push(x_1857, x_1849);
-x_1859 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1859 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1860 = lean_array_push(x_1858, x_1859);
-x_1861 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1861 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1862 = lean_array_push(x_1860, x_1861);
 lean_inc(x_11);
 x_1863 = lean_array_push(x_1847, x_11);
@@ -11659,7 +11651,7 @@ lean_object* x_1892; lean_object* x_1893; lean_object* x_1894; lean_object* x_18
 lean_dec(x_1891);
 lean_dec(x_1889);
 lean_dec(x_2);
-x_1892 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1892 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1893 = l_Lean_Elab_Term_throwError___rarg(x_11, x_1892, x_5, x_6);
 lean_dec(x_11);
 x_1894 = lean_ctor_get(x_1893, 0);
@@ -11790,9 +11782,9 @@ lean_ctor_set(x_1933, 1, x_1931);
 x_1934 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_1935 = lean_array_push(x_1934, x_1933);
 x_1936 = lean_array_push(x_1935, x_1927);
-x_1937 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_1937 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_1938 = lean_array_push(x_1936, x_1937);
-x_1939 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_1939 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_1940 = lean_array_push(x_1938, x_1939);
 lean_inc(x_11);
 x_1941 = lean_array_push(x_1925, x_11);
@@ -11898,7 +11890,7 @@ lean_object* x_1970; lean_object* x_1971; lean_object* x_1972; lean_object* x_19
 lean_dec(x_1969);
 lean_dec(x_1967);
 lean_dec(x_2);
-x_1970 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_1970 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_1971 = l_Lean_Elab_Term_throwError___rarg(x_1903, x_1970, x_5, x_6);
 lean_dec(x_1903);
 x_1972 = lean_ctor_get(x_1971, 0);
@@ -12030,9 +12022,9 @@ lean_ctor_set(x_2011, 1, x_2009);
 x_2012 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2013 = lean_array_push(x_2012, x_2011);
 x_2014 = lean_array_push(x_2013, x_2005);
-x_2015 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2015 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2016 = lean_array_push(x_2014, x_2015);
-x_2017 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2017 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2018 = lean_array_push(x_2016, x_2017);
 lean_inc(x_11);
 x_2019 = lean_array_push(x_2003, x_11);
@@ -12138,7 +12130,7 @@ lean_object* x_2048; lean_object* x_2049; lean_object* x_2050; lean_object* x_20
 lean_dec(x_2047);
 lean_dec(x_2045);
 lean_dec(x_2);
-x_2048 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2048 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2049 = l_Lean_Elab_Term_throwError___rarg(x_1981, x_2048, x_5, x_6);
 lean_dec(x_1981);
 x_2050 = lean_ctor_get(x_2049, 0);
@@ -12286,9 +12278,9 @@ lean_ctor_set(x_2095, 1, x_2093);
 x_2096 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2097 = lean_array_push(x_2096, x_2095);
 x_2098 = lean_array_push(x_2097, x_2089);
-x_2099 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2099 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2100 = lean_array_push(x_2098, x_2099);
-x_2101 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2101 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2102 = lean_array_push(x_2100, x_2101);
 lean_inc(x_11);
 x_2103 = lean_array_push(x_2087, x_11);
@@ -12394,7 +12386,7 @@ lean_object* x_2132; lean_object* x_2133; lean_object* x_2134; lean_object* x_21
 lean_dec(x_2131);
 lean_dec(x_2129);
 lean_dec(x_2);
-x_2132 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2132 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2133 = l_Lean_Elab_Term_throwError___rarg(x_2065, x_2132, x_5, x_6);
 lean_dec(x_2065);
 x_2134 = lean_ctor_get(x_2133, 0);
@@ -12532,9 +12524,9 @@ lean_ctor_set(x_2180, 1, x_2178);
 x_2181 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2182 = lean_array_push(x_2181, x_2180);
 x_2183 = lean_array_push(x_2182, x_2174);
-x_2184 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2184 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2185 = lean_array_push(x_2183, x_2184);
-x_2186 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2186 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2187 = lean_array_push(x_2185, x_2186);
 lean_inc(x_11);
 x_2188 = lean_array_push(x_2172, x_11);
@@ -12695,9 +12687,9 @@ lean_ctor_set(x_2238, 1, x_2236);
 x_2239 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2240 = lean_array_push(x_2239, x_2238);
 x_2241 = lean_array_push(x_2240, x_2232);
-x_2242 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2242 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2243 = lean_array_push(x_2241, x_2242);
-x_2244 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2244 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2245 = lean_array_push(x_2243, x_2244);
 lean_inc(x_11);
 x_2246 = lean_array_push(x_2230, x_11);
@@ -12872,9 +12864,9 @@ lean_ctor_set(x_2300, 1, x_2298);
 x_2301 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2302 = lean_array_push(x_2301, x_2300);
 x_2303 = lean_array_push(x_2302, x_2294);
-x_2304 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2304 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2305 = lean_array_push(x_2303, x_2304);
-x_2306 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2306 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2307 = lean_array_push(x_2305, x_2306);
 lean_inc(x_11);
 x_2308 = lean_array_push(x_2292, x_11);
@@ -13025,9 +13017,9 @@ lean_ctor_set(x_2354, 1, x_2352);
 x_2355 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2356 = lean_array_push(x_2355, x_2354);
 x_2357 = lean_array_push(x_2356, x_2348);
-x_2358 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2358 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2359 = lean_array_push(x_2357, x_2358);
-x_2360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2361 = lean_array_push(x_2359, x_2360);
 lean_inc(x_11);
 x_2362 = lean_array_push(x_2346, x_11);
@@ -13287,9 +13279,9 @@ lean_ctor_set(x_2437, 1, x_2435);
 x_2438 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2439 = lean_array_push(x_2438, x_2437);
 x_2440 = lean_array_push(x_2439, x_2431);
-x_2441 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2441 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2442 = lean_array_push(x_2440, x_2441);
-x_2443 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2443 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2444 = lean_array_push(x_2442, x_2443);
 lean_inc(x_11);
 x_2445 = lean_array_push(x_2429, x_11);
@@ -13394,7 +13386,7 @@ lean_object* x_2474; lean_object* x_2475; lean_object* x_2476; lean_object* x_24
 lean_dec(x_2473);
 lean_dec(x_2471);
 lean_dec(x_2);
-x_2474 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2474 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2475 = l_Lean_Elab_Term_throwError___rarg(x_11, x_2474, x_5, x_6);
 lean_dec(x_11);
 x_2476 = lean_ctor_get(x_2475, 0);
@@ -13533,9 +13525,9 @@ lean_ctor_set(x_2516, 1, x_2514);
 x_2517 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2518 = lean_array_push(x_2517, x_2516);
 x_2519 = lean_array_push(x_2518, x_2510);
-x_2520 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2520 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2521 = lean_array_push(x_2519, x_2520);
-x_2522 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2522 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2523 = lean_array_push(x_2521, x_2522);
 lean_inc(x_11);
 x_2524 = lean_array_push(x_2508, x_11);
@@ -13641,7 +13633,7 @@ lean_object* x_2553; lean_object* x_2554; lean_object* x_2555; lean_object* x_25
 lean_dec(x_2552);
 lean_dec(x_2550);
 lean_dec(x_2);
-x_2553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2554 = l_Lean_Elab_Term_throwError___rarg(x_2486, x_2553, x_5, x_6);
 lean_dec(x_2486);
 x_2555 = lean_ctor_get(x_2554, 0);
@@ -13781,9 +13773,9 @@ lean_ctor_set(x_2595, 1, x_2593);
 x_2596 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2597 = lean_array_push(x_2596, x_2595);
 x_2598 = lean_array_push(x_2597, x_2589);
-x_2599 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2599 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2600 = lean_array_push(x_2598, x_2599);
-x_2601 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2601 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2602 = lean_array_push(x_2600, x_2601);
 lean_inc(x_11);
 x_2603 = lean_array_push(x_2587, x_11);
@@ -13889,7 +13881,7 @@ lean_object* x_2632; lean_object* x_2633; lean_object* x_2634; lean_object* x_26
 lean_dec(x_2631);
 lean_dec(x_2629);
 lean_dec(x_2);
-x_2632 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2632 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2633 = l_Lean_Elab_Term_throwError___rarg(x_2565, x_2632, x_5, x_6);
 lean_dec(x_2565);
 x_2634 = lean_ctor_get(x_2633, 0);
@@ -14044,9 +14036,9 @@ lean_ctor_set(x_2680, 1, x_2678);
 x_2681 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2682 = lean_array_push(x_2681, x_2680);
 x_2683 = lean_array_push(x_2682, x_2674);
-x_2684 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2684 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2685 = lean_array_push(x_2683, x_2684);
-x_2686 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2686 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2687 = lean_array_push(x_2685, x_2686);
 lean_inc(x_11);
 x_2688 = lean_array_push(x_2672, x_11);
@@ -14152,7 +14144,7 @@ lean_object* x_2717; lean_object* x_2718; lean_object* x_2719; lean_object* x_27
 lean_dec(x_2716);
 lean_dec(x_2714);
 lean_dec(x_2);
-x_2717 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_2717 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_2718 = l_Lean_Elab_Term_throwError___rarg(x_2650, x_2717, x_5, x_6);
 lean_dec(x_2650);
 x_2719 = lean_ctor_get(x_2718, 0);
@@ -14290,9 +14282,9 @@ lean_ctor_set(x_2765, 1, x_2763);
 x_2766 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2767 = lean_array_push(x_2766, x_2765);
 x_2768 = lean_array_push(x_2767, x_2759);
-x_2769 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2769 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2770 = lean_array_push(x_2768, x_2769);
-x_2771 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2771 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2772 = lean_array_push(x_2770, x_2771);
 lean_inc(x_11);
 x_2773 = lean_array_push(x_2757, x_11);
@@ -14453,9 +14445,9 @@ lean_ctor_set(x_2823, 1, x_2821);
 x_2824 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2825 = lean_array_push(x_2824, x_2823);
 x_2826 = lean_array_push(x_2825, x_2817);
-x_2827 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2827 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2828 = lean_array_push(x_2826, x_2827);
-x_2829 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2829 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2830 = lean_array_push(x_2828, x_2829);
 lean_inc(x_11);
 x_2831 = lean_array_push(x_2815, x_11);
@@ -14630,9 +14622,9 @@ lean_ctor_set(x_2885, 1, x_2883);
 x_2886 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2887 = lean_array_push(x_2886, x_2885);
 x_2888 = lean_array_push(x_2887, x_2879);
-x_2889 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2889 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2890 = lean_array_push(x_2888, x_2889);
-x_2891 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2891 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2892 = lean_array_push(x_2890, x_2891);
 lean_inc(x_11);
 x_2893 = lean_array_push(x_2877, x_11);
@@ -14783,9 +14775,9 @@ lean_ctor_set(x_2939, 1, x_2937);
 x_2940 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_2941 = lean_array_push(x_2940, x_2939);
 x_2942 = lean_array_push(x_2941, x_2933);
-x_2943 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_2943 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_2944 = lean_array_push(x_2942, x_2943);
-x_2945 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2945 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_2946 = lean_array_push(x_2944, x_2945);
 lean_inc(x_11);
 x_2947 = lean_array_push(x_2931, x_11);
@@ -15056,9 +15048,9 @@ lean_ctor_set(x_3025, 1, x_3023);
 x_3026 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3027 = lean_array_push(x_3026, x_3025);
 x_3028 = lean_array_push(x_3027, x_3019);
-x_3029 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3029 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3030 = lean_array_push(x_3028, x_3029);
-x_3031 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3031 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3032 = lean_array_push(x_3030, x_3031);
 lean_inc(x_11);
 x_3033 = lean_array_push(x_3017, x_11);
@@ -15163,7 +15155,7 @@ lean_object* x_3062; lean_object* x_3063; lean_object* x_3064; lean_object* x_30
 lean_dec(x_3061);
 lean_dec(x_3059);
 lean_dec(x_2);
-x_3062 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3062 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3063 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3062, x_5, x_6);
 lean_dec(x_11);
 x_3064 = lean_ctor_get(x_3063, 0);
@@ -15309,9 +15301,9 @@ lean_ctor_set(x_3105, 1, x_3103);
 x_3106 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3107 = lean_array_push(x_3106, x_3105);
 x_3108 = lean_array_push(x_3107, x_3099);
-x_3109 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3109 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3110 = lean_array_push(x_3108, x_3109);
-x_3111 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3111 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3112 = lean_array_push(x_3110, x_3111);
 lean_inc(x_11);
 x_3113 = lean_array_push(x_3097, x_11);
@@ -15417,7 +15409,7 @@ lean_object* x_3142; lean_object* x_3143; lean_object* x_3144; lean_object* x_31
 lean_dec(x_3141);
 lean_dec(x_3139);
 lean_dec(x_2);
-x_3142 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3142 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3143 = l_Lean_Elab_Term_throwError___rarg(x_3075, x_3142, x_5, x_6);
 lean_dec(x_3075);
 x_3144 = lean_ctor_get(x_3143, 0);
@@ -15564,9 +15556,9 @@ lean_ctor_set(x_3185, 1, x_3183);
 x_3186 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3187 = lean_array_push(x_3186, x_3185);
 x_3188 = lean_array_push(x_3187, x_3179);
-x_3189 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3189 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3190 = lean_array_push(x_3188, x_3189);
-x_3191 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3191 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3192 = lean_array_push(x_3190, x_3191);
 lean_inc(x_11);
 x_3193 = lean_array_push(x_3177, x_11);
@@ -15672,7 +15664,7 @@ lean_object* x_3222; lean_object* x_3223; lean_object* x_3224; lean_object* x_32
 lean_dec(x_3221);
 lean_dec(x_3219);
 lean_dec(x_2);
-x_3222 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3222 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3223 = l_Lean_Elab_Term_throwError___rarg(x_3155, x_3222, x_5, x_6);
 lean_dec(x_3155);
 x_3224 = lean_ctor_get(x_3223, 0);
@@ -15834,9 +15826,9 @@ lean_ctor_set(x_3271, 1, x_3269);
 x_3272 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3273 = lean_array_push(x_3272, x_3271);
 x_3274 = lean_array_push(x_3273, x_3265);
-x_3275 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3275 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3276 = lean_array_push(x_3274, x_3275);
-x_3277 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3277 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3278 = lean_array_push(x_3276, x_3277);
 lean_inc(x_11);
 x_3279 = lean_array_push(x_3263, x_11);
@@ -15942,7 +15934,7 @@ lean_object* x_3308; lean_object* x_3309; lean_object* x_3310; lean_object* x_33
 lean_dec(x_3307);
 lean_dec(x_3305);
 lean_dec(x_2);
-x_3308 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3308 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3309 = l_Lean_Elab_Term_throwError___rarg(x_3241, x_3308, x_5, x_6);
 lean_dec(x_3241);
 x_3310 = lean_ctor_get(x_3309, 0);
@@ -16080,9 +16072,9 @@ lean_ctor_set(x_3356, 1, x_3354);
 x_3357 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3358 = lean_array_push(x_3357, x_3356);
 x_3359 = lean_array_push(x_3358, x_3350);
-x_3360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3360 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3361 = lean_array_push(x_3359, x_3360);
-x_3362 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3362 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3363 = lean_array_push(x_3361, x_3362);
 lean_inc(x_11);
 x_3364 = lean_array_push(x_3348, x_11);
@@ -16243,9 +16235,9 @@ lean_ctor_set(x_3414, 1, x_3412);
 x_3415 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3416 = lean_array_push(x_3415, x_3414);
 x_3417 = lean_array_push(x_3416, x_3408);
-x_3418 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3418 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3419 = lean_array_push(x_3417, x_3418);
-x_3420 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3420 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3421 = lean_array_push(x_3419, x_3420);
 lean_inc(x_11);
 x_3422 = lean_array_push(x_3406, x_11);
@@ -16420,9 +16412,9 @@ lean_ctor_set(x_3476, 1, x_3474);
 x_3477 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3478 = lean_array_push(x_3477, x_3476);
 x_3479 = lean_array_push(x_3478, x_3470);
-x_3480 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3480 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3481 = lean_array_push(x_3479, x_3480);
-x_3482 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3482 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3483 = lean_array_push(x_3481, x_3482);
 lean_inc(x_11);
 x_3484 = lean_array_push(x_3468, x_11);
@@ -16573,9 +16565,9 @@ lean_ctor_set(x_3530, 1, x_3528);
 x_3531 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3532 = lean_array_push(x_3531, x_3530);
 x_3533 = lean_array_push(x_3532, x_3524);
-x_3534 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3534 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3535 = lean_array_push(x_3533, x_3534);
-x_3536 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3536 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3537 = lean_array_push(x_3535, x_3536);
 lean_inc(x_11);
 x_3538 = lean_array_push(x_3522, x_11);
@@ -16790,9 +16782,9 @@ lean_ctor_set(x_3602, 1, x_3600);
 x_3603 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3604 = lean_array_push(x_3603, x_3602);
 x_3605 = lean_array_push(x_3604, x_3596);
-x_3606 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3606 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3607 = lean_array_push(x_3605, x_3606);
-x_3608 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3608 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3609 = lean_array_push(x_3607, x_3608);
 lean_inc(x_11);
 x_3610 = lean_array_push(x_3594, x_11);
@@ -16878,9 +16870,9 @@ lean_ctor_set(x_3646, 1, x_3644);
 x_3647 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3648 = lean_array_push(x_3647, x_3646);
 x_3649 = lean_array_push(x_3648, x_3640);
-x_3650 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3650 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3651 = lean_array_push(x_3649, x_3650);
-x_3652 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3652 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3653 = lean_array_push(x_3651, x_3652);
 lean_inc(x_11);
 x_3654 = lean_array_push(x_3638, x_11);
@@ -16963,9 +16955,9 @@ lean_ctor_set(x_3684, 1, x_3682);
 x_3685 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3686 = lean_array_push(x_3685, x_3684);
 x_3687 = lean_array_push(x_3686, x_3678);
-x_3688 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3688 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3689 = lean_array_push(x_3687, x_3688);
-x_3690 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3690 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3691 = lean_array_push(x_3689, x_3690);
 lean_inc(x_11);
 x_3692 = lean_array_push(x_3676, x_11);
@@ -17065,7 +17057,7 @@ lean_object* x_3721; lean_object* x_3722; uint8_t x_3723;
 lean_dec(x_3720);
 lean_dec(x_3718);
 lean_dec(x_2);
-x_3721 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3721 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3722 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3721, x_5, x_6);
 lean_dec(x_11);
 x_3723 = !lean_is_exclusive(x_3722);
@@ -17166,9 +17158,9 @@ lean_ctor_set(x_3756, 1, x_3754);
 x_3757 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3758 = lean_array_push(x_3757, x_3756);
 x_3759 = lean_array_push(x_3758, x_3750);
-x_3760 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3760 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3761 = lean_array_push(x_3759, x_3760);
-x_3762 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3762 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3763 = lean_array_push(x_3761, x_3762);
 lean_inc(x_11);
 x_3764 = lean_array_push(x_3748, x_11);
@@ -17254,9 +17246,9 @@ lean_ctor_set(x_3800, 1, x_3798);
 x_3801 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3802 = lean_array_push(x_3801, x_3800);
 x_3803 = lean_array_push(x_3802, x_3794);
-x_3804 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3804 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3805 = lean_array_push(x_3803, x_3804);
-x_3806 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3806 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3807 = lean_array_push(x_3805, x_3806);
 lean_inc(x_11);
 x_3808 = lean_array_push(x_3792, x_11);
@@ -17339,9 +17331,9 @@ lean_ctor_set(x_3838, 1, x_3836);
 x_3839 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3840 = lean_array_push(x_3839, x_3838);
 x_3841 = lean_array_push(x_3840, x_3832);
-x_3842 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3842 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3843 = lean_array_push(x_3841, x_3842);
-x_3844 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3844 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3845 = lean_array_push(x_3843, x_3844);
 lean_inc(x_11);
 x_3846 = lean_array_push(x_3830, x_11);
@@ -17441,7 +17433,7 @@ lean_object* x_3875; lean_object* x_3876; uint8_t x_3877;
 lean_dec(x_3874);
 lean_dec(x_3872);
 lean_dec(x_2);
-x_3875 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_3875 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_3876 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3875, x_5, x_6);
 lean_dec(x_11);
 x_3877 = !lean_is_exclusive(x_3876);
@@ -17541,9 +17533,9 @@ lean_ctor_set(x_3910, 1, x_3908);
 x_3911 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3912 = lean_array_push(x_3911, x_3910);
 x_3913 = lean_array_push(x_3912, x_3904);
-x_3914 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3914 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3915 = lean_array_push(x_3913, x_3914);
-x_3916 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3916 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3917 = lean_array_push(x_3915, x_3916);
 lean_inc(x_11);
 x_3918 = lean_array_push(x_3902, x_11);
@@ -17629,9 +17621,9 @@ lean_ctor_set(x_3954, 1, x_3952);
 x_3955 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3956 = lean_array_push(x_3955, x_3954);
 x_3957 = lean_array_push(x_3956, x_3948);
-x_3958 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3958 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3959 = lean_array_push(x_3957, x_3958);
-x_3960 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3960 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3961 = lean_array_push(x_3959, x_3960);
 lean_inc(x_11);
 x_3962 = lean_array_push(x_3946, x_11);
@@ -17714,9 +17706,9 @@ lean_ctor_set(x_3992, 1, x_3990);
 x_3993 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_3994 = lean_array_push(x_3993, x_3992);
 x_3995 = lean_array_push(x_3994, x_3986);
-x_3996 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_3996 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_3997 = lean_array_push(x_3995, x_3996);
-x_3998 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_3998 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3999 = lean_array_push(x_3997, x_3998);
 lean_inc(x_11);
 x_4000 = lean_array_push(x_3984, x_11);
@@ -17816,7 +17808,7 @@ lean_object* x_4029; lean_object* x_4030; uint8_t x_4031;
 lean_dec(x_4028);
 lean_dec(x_4026);
 lean_dec(x_2);
-x_4029 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_4029 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_4030 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4029, x_5, x_6);
 lean_dec(x_11);
 x_4031 = !lean_is_exclusive(x_4030);
@@ -17915,9 +17907,9 @@ lean_ctor_set(x_4064, 1, x_4062);
 x_4065 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4066 = lean_array_push(x_4065, x_4064);
 x_4067 = lean_array_push(x_4066, x_4058);
-x_4068 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4068 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4069 = lean_array_push(x_4067, x_4068);
-x_4070 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4070 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4071 = lean_array_push(x_4069, x_4070);
 lean_inc(x_11);
 x_4072 = lean_array_push(x_4056, x_11);
@@ -18003,9 +17995,9 @@ lean_ctor_set(x_4108, 1, x_4106);
 x_4109 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4110 = lean_array_push(x_4109, x_4108);
 x_4111 = lean_array_push(x_4110, x_4102);
-x_4112 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4112 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4113 = lean_array_push(x_4111, x_4112);
-x_4114 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4114 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4115 = lean_array_push(x_4113, x_4114);
 lean_inc(x_11);
 x_4116 = lean_array_push(x_4100, x_11);
@@ -18088,9 +18080,9 @@ lean_ctor_set(x_4146, 1, x_4144);
 x_4147 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4148 = lean_array_push(x_4147, x_4146);
 x_4149 = lean_array_push(x_4148, x_4140);
-x_4150 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4150 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4151 = lean_array_push(x_4149, x_4150);
-x_4152 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4152 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4153 = lean_array_push(x_4151, x_4152);
 lean_inc(x_11);
 x_4154 = lean_array_push(x_4138, x_11);
@@ -18190,7 +18182,7 @@ lean_object* x_4183; lean_object* x_4184; uint8_t x_4185;
 lean_dec(x_4182);
 lean_dec(x_4180);
 lean_dec(x_2);
-x_4183 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_4183 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_4184 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4183, x_5, x_6);
 lean_dec(x_11);
 x_4185 = !lean_is_exclusive(x_4184);
@@ -18288,9 +18280,9 @@ lean_ctor_set(x_4218, 1, x_4216);
 x_4219 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4220 = lean_array_push(x_4219, x_4218);
 x_4221 = lean_array_push(x_4220, x_4212);
-x_4222 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4222 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4223 = lean_array_push(x_4221, x_4222);
-x_4224 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4224 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4225 = lean_array_push(x_4223, x_4224);
 lean_inc(x_11);
 x_4226 = lean_array_push(x_4210, x_11);
@@ -18376,9 +18368,9 @@ lean_ctor_set(x_4262, 1, x_4260);
 x_4263 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4264 = lean_array_push(x_4263, x_4262);
 x_4265 = lean_array_push(x_4264, x_4256);
-x_4266 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4266 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4267 = lean_array_push(x_4265, x_4266);
-x_4268 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4268 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4269 = lean_array_push(x_4267, x_4268);
 lean_inc(x_11);
 x_4270 = lean_array_push(x_4254, x_11);
@@ -18461,9 +18453,9 @@ lean_ctor_set(x_4300, 1, x_4298);
 x_4301 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4302 = lean_array_push(x_4301, x_4300);
 x_4303 = lean_array_push(x_4302, x_4294);
-x_4304 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4304 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4305 = lean_array_push(x_4303, x_4304);
-x_4306 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4306 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4307 = lean_array_push(x_4305, x_4306);
 lean_inc(x_11);
 x_4308 = lean_array_push(x_4292, x_11);
@@ -18563,7 +18555,7 @@ lean_object* x_4337; lean_object* x_4338; uint8_t x_4339;
 lean_dec(x_4336);
 lean_dec(x_4334);
 lean_dec(x_2);
-x_4337 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_4337 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_4338 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4337, x_5, x_6);
 lean_dec(x_11);
 x_4339 = !lean_is_exclusive(x_4338);
@@ -18660,9 +18652,9 @@ lean_ctor_set(x_4372, 1, x_4370);
 x_4373 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4374 = lean_array_push(x_4373, x_4372);
 x_4375 = lean_array_push(x_4374, x_4366);
-x_4376 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4376 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4377 = lean_array_push(x_4375, x_4376);
-x_4378 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4378 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4379 = lean_array_push(x_4377, x_4378);
 lean_inc(x_11);
 x_4380 = lean_array_push(x_4364, x_11);
@@ -18749,9 +18741,9 @@ lean_ctor_set(x_4416, 1, x_4414);
 x_4417 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4418 = lean_array_push(x_4417, x_4416);
 x_4419 = lean_array_push(x_4418, x_4410);
-x_4420 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4420 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4421 = lean_array_push(x_4419, x_4420);
-x_4422 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4422 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4423 = lean_array_push(x_4421, x_4422);
 lean_inc(x_11);
 x_4424 = lean_array_push(x_4408, x_11);
@@ -18835,9 +18827,9 @@ lean_ctor_set(x_4454, 1, x_4452);
 x_4455 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4456 = lean_array_push(x_4455, x_4454);
 x_4457 = lean_array_push(x_4456, x_4448);
-x_4458 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4458 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4459 = lean_array_push(x_4457, x_4458);
-x_4460 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4460 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4461 = lean_array_push(x_4459, x_4460);
 lean_inc(x_11);
 x_4462 = lean_array_push(x_4446, x_11);
@@ -18938,7 +18930,7 @@ lean_object* x_4491; lean_object* x_4492; uint8_t x_4493;
 lean_dec(x_4490);
 lean_dec(x_4488);
 lean_dec(x_2);
-x_4491 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_4491 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_4492 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4491, x_5, x_6);
 lean_dec(x_11);
 x_4493 = !lean_is_exclusive(x_4492);
@@ -19034,9 +19026,9 @@ lean_ctor_set(x_4526, 1, x_4524);
 x_4527 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4528 = lean_array_push(x_4527, x_4526);
 x_4529 = lean_array_push(x_4528, x_4520);
-x_4530 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4530 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4531 = lean_array_push(x_4529, x_4530);
-x_4532 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4532 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4533 = lean_array_push(x_4531, x_4532);
 x_4534 = lean_array_push(x_4518, x_11);
 x_4535 = lean_alloc_ctor(1, 2, 0);
@@ -19085,9 +19077,9 @@ lean_ctor_set(x_4556, 1, x_4554);
 x_4557 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4558 = lean_array_push(x_4557, x_4556);
 x_4559 = lean_array_push(x_4558, x_4550);
-x_4560 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4560 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4561 = lean_array_push(x_4559, x_4560);
-x_4562 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4562 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4563 = lean_array_push(x_4561, x_4562);
 x_4564 = lean_array_push(x_4548, x_11);
 x_4565 = lean_alloc_ctor(1, 2, 0);
@@ -19157,9 +19149,9 @@ lean_ctor_set(x_4593, 1, x_4591);
 x_4594 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_4595 = lean_array_push(x_4594, x_4593);
 x_4596 = lean_array_push(x_4595, x_4587);
-x_4597 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_4597 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_4598 = lean_array_push(x_4596, x_4597);
-x_4599 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_4599 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_4600 = lean_array_push(x_4598, x_4599);
 x_4601 = lean_array_push(x_4585, x_11);
 x_4602 = lean_alloc_ctor(1, 2, 0);
@@ -19246,7 +19238,7 @@ lean_object* x_4629; lean_object* x_4630; uint8_t x_4631;
 lean_dec(x_4628);
 lean_dec(x_4626);
 lean_dec(x_2);
-x_4629 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10;
+x_4629 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 x_4630 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4629, x_5, x_6);
 lean_dec(x_11);
 x_4631 = !lean_is_exclusive(x_4630);
@@ -23975,7 +23967,7 @@ lean_ctor_set(x_66, 1, x_65);
 x_67 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_68 = lean_array_push(x_67, x_66);
 x_69 = lean_array_push(x_68, x_44);
-x_70 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_70 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_71 = lean_array_push(x_69, x_70);
 x_72 = lean_array_push(x_71, x_44);
 x_73 = lean_array_push(x_42, x_12);
@@ -24159,7 +24151,7 @@ lean_ctor_set(x_161, 1, x_160);
 x_162 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_163 = lean_array_push(x_162, x_161);
 x_164 = lean_array_push(x_163, x_146);
-x_165 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_165 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_166 = lean_array_push(x_164, x_165);
 x_167 = lean_array_push(x_166, x_146);
 x_168 = lean_array_push(x_144, x_12);
@@ -24716,7 +24708,7 @@ lean_ctor_set(x_66, 1, x_65);
 x_67 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_68 = lean_array_push(x_67, x_66);
 x_69 = lean_array_push(x_68, x_44);
-x_70 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_70 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_71 = lean_array_push(x_69, x_70);
 x_72 = lean_array_push(x_71, x_44);
 x_73 = lean_array_push(x_42, x_12);
@@ -24900,7 +24892,7 @@ lean_ctor_set(x_161, 1, x_160);
 x_162 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_163 = lean_array_push(x_162, x_161);
 x_164 = lean_array_push(x_163, x_146);
-x_165 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_165 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_166 = lean_array_push(x_164, x_165);
 x_167 = lean_array_push(x_166, x_146);
 x_168 = lean_array_push(x_144, x_12);
@@ -25334,8 +25326,6 @@ l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8 =
 lean_mark_persistent(l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8);
 l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9 = _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9();
 lean_mark_persistent(l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9);
-l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10 = _init_l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10();
-lean_mark_persistent(l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__10);
 l___private_Init_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__1 = _init_l___private_Init_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__1();
 lean_mark_persistent(l___private_Init_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__1);
 l___private_Init_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__2 = _init_l___private_Init_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__2();
diff --git a/stage0/stdlib/Init/Lean/Elab/DoNotation.c b/stage0/stdlib/Init/Lean/Elab/DoNotation.c
index 863eb0d254..cb6b5f1041 100644
--- a/stage0/stdlib/Init/Lean/Elab/DoNotation.c
+++ b/stage0/stdlib/Init/Lean/Elab/DoNotation.c
@@ -53,7 +53,6 @@ extern lean_object* l___private_Init_Lean_Elab_Term_5__expandCDot___main___close
 lean_object* l_Lean_Elab_Term_synthesizeInst(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_DoNotation_3__getDoElems___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Elab_DoNotation_11__processDoElemsAux___main___closed__6;
-extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_do___elambda__1___closed__2;
 lean_object* l___private_Init_Lean_Elab_DoNotation_5__expandLiftMethodAux___main___closed__3;
@@ -75,8 +74,8 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getLevel(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
 lean_object* l___private_Init_Lean_Elab_DoNotation_12__processDoElems(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__6;
 extern lean_object* l_Lean_Parser_Term_doId___elambda__1___closed__2;
@@ -168,6 +167,7 @@ lean_object* l_Lean_indentExpr(lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_DoNotation_7__expandDoElemsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_DoNotation_1__mkIdBindFor___closed__4;
+extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 lean_object* l___private_Init_Lean_Elab_DoNotation_4__hasLiftMethod___main___boxed(lean_object*);
 extern lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__5;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -2424,9 +2424,9 @@ lean_ctor_set(x_165, 1, x_164);
 x_166 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_167 = lean_array_push(x_166, x_165);
 x_168 = lean_array_push(x_167, x_152);
-x_169 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_169 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_170 = lean_array_push(x_168, x_169);
-x_171 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_171 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_172 = lean_array_push(x_170, x_171);
 x_173 = lean_array_push(x_129, x_117);
 x_174 = lean_alloc_ctor(1, 2, 0);
@@ -2441,7 +2441,7 @@ x_180 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_180, 0, x_179);
 lean_ctor_set(x_180, 1, x_178);
 x_181 = lean_array_push(x_129, x_180);
-x_182 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_182 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_183 = lean_array_push(x_181, x_182);
 x_184 = l___private_Init_Lean_Elab_DoNotation_7__expandDoElemsAux___main___closed__2;
 x_185 = lean_array_push(x_184, x_144);
@@ -2513,9 +2513,9 @@ lean_ctor_set(x_219, 1, x_218);
 x_220 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_221 = lean_array_push(x_220, x_219);
 x_222 = lean_array_push(x_221, x_206);
-x_223 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_223 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_224 = lean_array_push(x_222, x_223);
-x_225 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_225 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_226 = lean_array_push(x_224, x_225);
 x_227 = lean_array_push(x_129, x_117);
 x_228 = lean_alloc_ctor(1, 2, 0);
@@ -2611,9 +2611,9 @@ lean_ctor_set(x_276, 1, x_274);
 x_277 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_278 = lean_array_push(x_277, x_276);
 x_279 = lean_array_push(x_278, x_262);
-x_280 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_280 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_281 = lean_array_push(x_279, x_280);
-x_282 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_282 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_283 = lean_array_push(x_281, x_282);
 x_284 = lean_array_push(x_260, x_117);
 x_285 = lean_alloc_ctor(1, 2, 0);
@@ -2628,7 +2628,7 @@ x_291 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_291, 0, x_290);
 lean_ctor_set(x_291, 1, x_289);
 x_292 = lean_array_push(x_260, x_291);
-x_293 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_293 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_294 = lean_array_push(x_292, x_293);
 x_295 = l___private_Init_Lean_Elab_DoNotation_7__expandDoElemsAux___main___closed__2;
 x_296 = lean_array_push(x_295, x_253);
@@ -2704,9 +2704,9 @@ lean_ctor_set(x_334, 1, x_332);
 x_335 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_336 = lean_array_push(x_335, x_334);
 x_337 = lean_array_push(x_336, x_320);
-x_338 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_338 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_339 = lean_array_push(x_337, x_338);
-x_340 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_340 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_341 = lean_array_push(x_339, x_340);
 x_342 = lean_array_push(x_318, x_117);
 x_343 = lean_alloc_ctor(1, 2, 0);
@@ -3118,9 +3118,9 @@ lean_ctor_set(x_547, 1, x_546);
 x_548 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_549 = lean_array_push(x_548, x_547);
 x_550 = lean_array_push(x_549, x_534);
-x_551 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_551 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_552 = lean_array_push(x_550, x_551);
-x_553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_553 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_554 = lean_array_push(x_552, x_553);
 x_555 = lean_array_push(x_511, x_499);
 x_556 = lean_alloc_ctor(1, 2, 0);
@@ -3135,7 +3135,7 @@ x_562 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_562, 0, x_561);
 lean_ctor_set(x_562, 1, x_560);
 x_563 = lean_array_push(x_511, x_562);
-x_564 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_564 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_565 = lean_array_push(x_563, x_564);
 x_566 = l___private_Init_Lean_Elab_DoNotation_7__expandDoElemsAux___main___closed__2;
 x_567 = lean_array_push(x_566, x_526);
@@ -3207,9 +3207,9 @@ lean_ctor_set(x_601, 1, x_600);
 x_602 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_603 = lean_array_push(x_602, x_601);
 x_604 = lean_array_push(x_603, x_588);
-x_605 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_605 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_606 = lean_array_push(x_604, x_605);
-x_607 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_607 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_608 = lean_array_push(x_606, x_607);
 x_609 = lean_array_push(x_511, x_499);
 x_610 = lean_alloc_ctor(1, 2, 0);
@@ -3305,9 +3305,9 @@ lean_ctor_set(x_658, 1, x_656);
 x_659 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_660 = lean_array_push(x_659, x_658);
 x_661 = lean_array_push(x_660, x_644);
-x_662 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_662 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_663 = lean_array_push(x_661, x_662);
-x_664 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_664 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_665 = lean_array_push(x_663, x_664);
 x_666 = lean_array_push(x_642, x_499);
 x_667 = lean_alloc_ctor(1, 2, 0);
@@ -3322,7 +3322,7 @@ x_673 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_673, 0, x_672);
 lean_ctor_set(x_673, 1, x_671);
 x_674 = lean_array_push(x_642, x_673);
-x_675 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_675 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_676 = lean_array_push(x_674, x_675);
 x_677 = l___private_Init_Lean_Elab_DoNotation_7__expandDoElemsAux___main___closed__2;
 x_678 = lean_array_push(x_677, x_635);
@@ -3398,9 +3398,9 @@ lean_ctor_set(x_716, 1, x_714);
 x_717 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__2;
 x_718 = lean_array_push(x_717, x_716);
 x_719 = lean_array_push(x_718, x_702);
-x_720 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_720 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_721 = lean_array_push(x_719, x_720);
-x_722 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_722 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_723 = lean_array_push(x_721, x_722);
 x_724 = lean_array_push(x_700, x_499);
 x_725 = lean_alloc_ctor(1, 2, 0);
diff --git a/stage0/stdlib/Init/Lean/Elab/StructInst.c b/stage0/stdlib/Init/Lean/Elab/StructInst.c
index bec58881b7..37b18e72ae 100644
--- a/stage0/stdlib/Init/Lean/Elab/StructInst.c
+++ b/stage0/stdlib/Init/Lean/Elab/StructInst.c
@@ -102,7 +102,6 @@ lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f___b
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_StructInst_25__elabStructInstAux___closed__3;
 lean_object* l_Lean_Expr_FindImpl_findM_x3f___main___at_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefaultAux___main___spec__1(size_t, lean_object*, lean_object*);
-extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__6;
 lean_object* l___private_Init_Lean_Elab_StructInst_10__expandParentFields(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
 lean_object* l_mkHashMap___at___private_Init_Lean_Elab_StructInst_12__mkFieldMap___spec__9(lean_object*);
@@ -297,6 +296,7 @@ lean_object* l___private_Init_Lean_Elab_StructInst_4__elabModifyOp___closed__14;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefaultAux___main___closed__2;
 lean_object* l_Lean_Elab_Term_StructInst_Struct_hasFormat___closed__1;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduce(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_mkAppStx___closed__6;
 lean_object* l_Lean_Elab_Term_StructInst_findField_x3f(lean_object*, lean_object*);
 extern lean_object* l_Lean_Options_empty;
 lean_object* lean_expr_dbg_to_string(lean_object*);
@@ -356,6 +356,7 @@ lean_object* l_List_mapM___main___at_Lean_Elab_Term_StructInst_DefaultFields_mkD
 extern lean_object* l_Lean_Elab_Term_termElabAttribute;
 extern lean_object* l_Lean_Format_sbracket___closed__3;
 lean_object* l_List_map___main___at_Lean_Elab_Term_StructInst_formatStruct___main___spec__1(lean_object*);
+lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8;
 lean_object* l_Lean_mkAtomFrom(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_StructInst_9__expandNumLitFields(lean_object*, lean_object*, lean_object*);
 size_t l_USize_mod(size_t, size_t);
@@ -446,6 +447,7 @@ extern lean_object* l_Lean_Parser_Term_letIdDecl___closed__2;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduceProjOf_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at___private_Init_Lean_Elab_StructInst_3__isModifyOp_x3f___spec__1___closed__1;
 lean_object* l___private_Init_Lean_Elab_StructInst_18__addMissingFields___at___private_Init_Lean_Elab_StructInst_19__expandStruct___main___spec__10(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9;
 extern lean_object* l_Lean_mkAppStx___closed__9;
 lean_object* l_Lean_Elab_Term_whnfForall(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
@@ -501,7 +503,6 @@ lean_object* l_Array_filterAux___main___at___private_Init_Lean_Elab_StructInst_7
 extern lean_object* l___private_Init_Lean_Elab_Term_5__expandCDot___main___closed__4;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_findDefaultMissing_x3f___main___lambda__1(lean_object*, lean_object*);
 lean_object* l_List_head_x21___at___private_Init_Lean_Elab_StructInst_19__expandStruct___main___spec__3___boxed(lean_object*);
-extern lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_StructInst_Field_inhabited___closed__1;
 lean_object* l_List_toArrayAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -524,6 +525,7 @@ lean_object* l___private_Init_Lean_Elab_StructInst_24__elabStruct___main(lean_ob
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_collectStructNames___main___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduce___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_StructInst_5__getStructName___closed__2;
+lean_object* l_Lean_Elab_Term_StructInst_formatField___closed__4;
 lean_object* l_Lean_Elab_Term_isLocalTermId_x3f(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_getFieldValue_x3f___lambda__1___boxed(lean_object*, lean_object*);
@@ -572,26 +574,44 @@ lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_Expand
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("src");
+x_1 = lean_mk_string("structInstSource");
 return x_1;
 }
 }
 lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__1;
-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_Lean_mkAppStx___closed__6;
+x_2 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
 }
 }
 lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("src");
+return x_1;
+}
+}
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_2 = lean_string_utf8_byte_size(x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__1;
+x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__2;
+x_3 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -599,17 +619,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4() {
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__1;
+x_2 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5() {
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -617,21 +637,21 @@ x_1 = lean_mk_string("source has already been specified");
 return x_1;
 }
 }
-lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6() {
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
+x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7() {
+lean_object* _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
+x_1 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -667,7 +687,7 @@ x_13 = lean_array_fset(x_2, x_1, x_12);
 x_24 = x_11;
 lean_inc(x_24);
 x_25 = l_Lean_Syntax_getKind(x_24);
-x_26 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
+x_26 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__2;
 x_27 = lean_name_eq(x_25, x_26);
 lean_dec(x_25);
 if (x_27 == 0)
@@ -723,11 +743,11 @@ lean_inc(x_44);
 x_45 = lean_ctor_get(x_43, 1);
 lean_inc(x_45);
 lean_dec(x_43);
-x_46 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_46 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_47 = l_Lean_addMacroScope(x_44, x_46, x_41);
 x_48 = lean_box(0);
 x_49 = l_Lean_SourceInfo_inhabited___closed__1;
-x_50 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_50 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_51 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_51, 0, x_49);
 lean_ctor_set(x_51, 1, x_50);
@@ -825,11 +845,11 @@ lean_inc(x_81);
 x_82 = lean_ctor_get(x_80, 1);
 lean_inc(x_82);
 lean_dec(x_80);
-x_83 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_83 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_84 = l_Lean_addMacroScope(x_81, x_83, x_78);
 x_85 = lean_box(0);
 x_86 = l_Lean_SourceInfo_inhabited___closed__1;
-x_87 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_87 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_88 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_88, 0, x_86);
 lean_ctor_set(x_88, 1, x_87);
@@ -902,7 +922,7 @@ lean_object* x_108; lean_object* x_109; uint8_t x_110;
 lean_dec(x_13);
 lean_dec(x_3);
 lean_dec(x_1);
-x_108 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7;
+x_108 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9;
 x_109 = l_Lean_Elab_Term_throwError___rarg(x_24, x_108, x_4, x_5);
 lean_dec(x_24);
 x_110 = !lean_is_exclusive(x_109);
@@ -1070,11 +1090,11 @@ if (x_40 == 0)
 {
 lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 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; 
 x_41 = lean_ctor_get(x_39, 0);
-x_42 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_42 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_43 = l_Lean_addMacroScope(x_41, x_42, x_37);
 x_44 = lean_box(0);
 x_45 = l_Lean_SourceInfo_inhabited___closed__1;
-x_46 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_46 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_47 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_47, 0, x_45);
 lean_ctor_set(x_47, 1, x_46);
@@ -1114,11 +1134,11 @@ x_66 = lean_ctor_get(x_39, 1);
 lean_inc(x_66);
 lean_inc(x_65);
 lean_dec(x_39);
-x_67 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_67 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_68 = l_Lean_addMacroScope(x_65, x_67, x_37);
 x_69 = lean_box(0);
 x_70 = l_Lean_SourceInfo_inhabited___closed__1;
-x_71 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_71 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_72 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_72, 0, x_70);
 lean_ctor_set(x_72, 1, x_71);
@@ -1184,11 +1204,11 @@ if (lean_is_exclusive(x_98)) {
  lean_dec_ref(x_98);
  x_101 = lean_box(0);
 }
-x_102 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_102 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_103 = l_Lean_addMacroScope(x_99, x_102, x_96);
 x_104 = lean_box(0);
 x_105 = l_Lean_SourceInfo_inhabited___closed__1;
-x_106 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_106 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_107 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_107, 0, x_105);
 lean_ctor_set(x_107, 1, x_106);
@@ -1268,11 +1288,11 @@ if (lean_is_exclusive(x_136)) {
  lean_dec_ref(x_136);
  x_139 = lean_box(0);
 }
-x_140 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__4;
+x_140 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6;
 x_141 = l_Lean_addMacroScope(x_137, x_140, x_134);
 x_142 = lean_box(0);
 x_143 = l_Lean_SourceInfo_inhabited___closed__1;
-x_144 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__3;
+x_144 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__5;
 x_145 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_145, 0, x_143);
 lean_ctor_set(x_145, 1, x_144);
@@ -1817,7 +1837,7 @@ lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13;
 x_10 = lean_array_fget(x_2, x_3);
 lean_inc(x_10);
 x_11 = l_Lean_Syntax_getKind(x_10);
-x_12 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
+x_12 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__2;
 x_13 = lean_name_eq(x_11, x_12);
 lean_dec(x_11);
 if (x_13 == 0)
@@ -1838,7 +1858,7 @@ if (x_16 == 0)
 {
 lean_object* x_17; lean_object* x_18; uint8_t x_19; 
 lean_dec(x_3);
-x_17 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7;
+x_17 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9;
 x_18 = l_Lean_Elab_Term_throwError___rarg(x_10, x_17, x_5, x_6);
 lean_dec(x_10);
 x_19 = !lean_is_exclusive(x_18);
@@ -2105,7 +2125,7 @@ lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13;
 x_10 = lean_array_fget(x_2, x_3);
 lean_inc(x_10);
 x_11 = l_Lean_Syntax_getKind(x_10);
-x_12 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
+x_12 = l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__2;
 x_13 = lean_name_eq(x_11, x_12);
 if (x_13 == 0)
 {
@@ -9081,14 +9101,22 @@ return x_37;
 lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__1() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string(" . ");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__2() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_structInst___elambda__1___closed__6;
+x_1 = l_Lean_Elab_Term_StructInst_formatField___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__2() {
+lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -9096,11 +9124,11 @@ x_1 = lean_mk_string("<default>");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__3() {
+lean_object* _init_l_Lean_Elab_Term_StructInst_formatField___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_StructInst_formatField___closed__2;
+x_1 = l_Lean_Elab_Term_StructInst_formatField___closed__3;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -9112,7 +9140,7 @@ _start:
 lean_object* x_3; lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
 x_3 = lean_ctor_get(x_2, 1);
 lean_inc(x_3);
-x_4 = l_Lean_Elab_Term_StructInst_formatField___closed__1;
+x_4 = l_Lean_Elab_Term_StructInst_formatField___closed__2;
 x_5 = l_Lean_Format_joinSep___main___at_Lean_Elab_Term_StructInst_formatField___spec__1(x_3, x_4);
 x_6 = 0;
 x_7 = l_Lean_formatEntry___closed__2;
@@ -9155,7 +9183,7 @@ default:
 {
 lean_object* x_16; lean_object* x_17; 
 lean_dec(x_1);
-x_16 = l_Lean_Elab_Term_StructInst_formatField___closed__3;
+x_16 = l_Lean_Elab_Term_StructInst_formatField___closed__4;
 x_17 = lean_alloc_ctor(4, 2, 1);
 lean_ctor_set(x_17, 0, x_8);
 lean_ctor_set(x_17, 1, x_16);
@@ -9289,7 +9317,7 @@ x_8 = lean_alloc_ctor(4, 2, 1);
 lean_ctor_set(x_8, 0, x_7);
 lean_ctor_set(x_8, 1, x_5);
 lean_ctor_set_uint8(x_8, sizeof(void*)*2, x_6);
-x_9 = l_Lean_Elab_Term_StructInst_formatField___closed__1;
+x_9 = l_Lean_Elab_Term_StructInst_formatField___closed__2;
 x_10 = lean_alloc_ctor(4, 2, 1);
 lean_ctor_set(x_10, 0, x_8);
 lean_ctor_set(x_10, 1, x_9);
@@ -25871,6 +25899,10 @@ l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSo
 lean_mark_persistent(l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__6);
 l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7 = _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7();
 lean_mark_persistent(l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__7);
+l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8 = _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8();
+lean_mark_persistent(l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__8);
+l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9 = _init_l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9();
+lean_mark_persistent(l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_ExpandNonAtomicExplicitSource_main___spec__1___closed__9);
 l___private_Init_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__1 = _init_l___private_Init_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__1();
 lean_mark_persistent(l___private_Init_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__1);
 l_Lean_Elab_Term_StructInst_Source_inhabited = _init_l_Lean_Elab_Term_StructInst_Source_inhabited();
@@ -25975,6 +26007,8 @@ l_Lean_Elab_Term_StructInst_formatField___closed__2 = _init_l_Lean_Elab_Term_Str
 lean_mark_persistent(l_Lean_Elab_Term_StructInst_formatField___closed__2);
 l_Lean_Elab_Term_StructInst_formatField___closed__3 = _init_l_Lean_Elab_Term_StructInst_formatField___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_StructInst_formatField___closed__3);
+l_Lean_Elab_Term_StructInst_formatField___closed__4 = _init_l_Lean_Elab_Term_StructInst_formatField___closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_StructInst_formatField___closed__4);
 l_List_map___main___at_Lean_Elab_Term_StructInst_formatStruct___main___spec__1___closed__1 = _init_l_List_map___main___at_Lean_Elab_Term_StructInst_formatStruct___main___spec__1___closed__1();
 lean_mark_persistent(l_List_map___main___at_Lean_Elab_Term_StructInst_formatStruct___main___spec__1___closed__1);
 l_Lean_Elab_Term_StructInst_formatStruct___main___closed__1 = _init_l_Lean_Elab_Term_StructInst_formatStruct___main___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/Syntax.c b/stage0/stdlib/Init/Lean/Elab/Syntax.c
index 363606d1c0..544934bbab 100644
--- a/stage0/stdlib/Init/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Init/Lean/Elab/Syntax.c
@@ -134,7 +134,6 @@ lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__25;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Lean_mkAtom(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__20;
-extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__10;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__32;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -202,6 +201,7 @@ extern lean_object* l_Lean_numLitKind;
 extern lean_object* l_Lean_Parser_Command_strLitPrec___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Syntax_num___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 extern lean_object* l_Lean_Expr_isSyntheticSorry___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__87;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__68;
@@ -227,7 +227,6 @@ lean_object* l_Lean_Macro_addMacroScope(lean_object*, lean_object*, lean_object*
 extern lean_object* l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_String_HasQuote___closed__1;
-extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__25;
 extern lean_object* l_Lean_numLitKind___closed__1;
 extern lean_object* l_Lean_Parser_Command_def___elambda__1___closed__1;
@@ -551,6 +550,7 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__113;
 lean_object* l_Lean_Elab_Command_expandNotation(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_3__setState(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Syntax_6__elabKind(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Command_expandMacro___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__31;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__31;
@@ -10579,13 +10579,13 @@ x_90 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
 x_91 = lean_array_push(x_89, x_90);
 x_92 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
 x_93 = lean_array_push(x_92, x_85);
-x_94 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_94 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_95 = lean_array_push(x_93, x_94);
 x_96 = lean_array_push(x_95, x_42);
 x_97 = lean_unsigned_to_nat(0u);
 x_98 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_7, x_7, x_97, x_21);
 lean_dec(x_7);
-x_99 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_99 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_100 = lean_array_push(x_98, x_99);
 x_101 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
 lean_inc(x_10);
@@ -10804,13 +10804,13 @@ x_222 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
 x_223 = lean_array_push(x_221, x_222);
 x_224 = l_Lean_Elab_Command_elabMacroRulesAux___closed__17;
 x_225 = lean_array_push(x_224, x_217);
-x_226 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
+x_226 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__3;
 x_227 = lean_array_push(x_225, x_226);
 x_228 = lean_array_push(x_227, x_174);
 x_229 = lean_unsigned_to_nat(0u);
 x_230 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_7, x_7, x_229, x_153);
 lean_dec(x_7);
-x_231 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__5;
+x_231 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__4;
 x_232 = lean_array_push(x_230, x_231);
 x_233 = l_Lean_Elab_Command_elabMacroRulesAux___closed__23;
 lean_inc(x_10);
@@ -13255,7 +13255,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Command_elabNoKindMacroRulesAux___closed__3;
-x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__7;
+x_2 = l___private_Init_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Init/Lean/Parser/Command.c b/stage0/stdlib/Init/Lean/Parser/Command.c
index 9d25286503..43ba07aa88 100644
--- a/stage0/stdlib/Init/Lean/Parser/Command.c
+++ b/stage0/stdlib/Init/Lean/Parser/Command.c
@@ -328,7 +328,6 @@ lean_object* l_Lean_Parser_Command_theorem___closed__6;
 lean_object* l_Lean_Parser_Command_openHiding___closed__4;
 lean_object* l_Lean_Parser_Command_docComment___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_inductive___closed__7;
-extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__14;
 lean_object* l_Lean_Parser_Command_unsafe;
 lean_object* l_Lean_Parser_Command_structure___closed__6;
 lean_object* l_Lean_Parser_Command_check___elambda__1___closed__2;
@@ -975,6 +974,7 @@ lean_object* l_Lean_Parser_Command_end___elambda__1___closed__3;
 lean_object* l___regBuiltinParser_Lean_Parser_Command_open(lean_object*);
 lean_object* l_Lean_Parser_Command_variable___closed__5;
 lean_object* l_Lean_Parser_Command_variable___elambda__1___closed__5;
+extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_object* l_Lean_Parser_Command_def___closed__2;
 extern lean_object* l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___elambda__1___closed__10;
 lean_object* l_Lean_Parser_mkAntiquot(lean_object*, lean_object*, uint8_t);
@@ -12392,7 +12392,7 @@ lean_dec(x_56);
 if (x_58 == 0)
 {
 lean_object* x_59; lean_object* x_60; 
-x_59 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_59 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_7);
 x_60 = l_Lean_Parser_ParserState_mkErrorsAt(x_52, x_59, x_7);
 x_20 = x_60;
@@ -12408,7 +12408,7 @@ else
 {
 lean_object* x_61; lean_object* x_62; 
 lean_dec(x_55);
-x_61 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_61 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_7);
 x_62 = l_Lean_Parser_ParserState_mkErrorsAt(x_52, x_61, x_7);
 x_20 = x_62;
@@ -12419,7 +12419,7 @@ else
 {
 lean_object* x_63; lean_object* x_64; 
 lean_dec(x_53);
-x_63 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_63 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_7);
 x_64 = l_Lean_Parser_ParserState_mkErrorsAt(x_52, x_63, x_7);
 x_20 = x_64;
@@ -12656,7 +12656,7 @@ lean_dec(x_126);
 if (x_128 == 0)
 {
 lean_object* x_129; lean_object* x_130; 
-x_129 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_129 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_66);
 x_130 = l_Lean_Parser_ParserState_mkErrorsAt(x_122, x_129, x_66);
 x_90 = x_130;
@@ -12672,7 +12672,7 @@ else
 {
 lean_object* x_131; lean_object* x_132; 
 lean_dec(x_125);
-x_131 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_131 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_66);
 x_132 = l_Lean_Parser_ParserState_mkErrorsAt(x_122, x_131, x_66);
 x_90 = x_132;
@@ -12683,7 +12683,7 @@ else
 {
 lean_object* x_133; lean_object* x_134; 
 lean_dec(x_123);
-x_133 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_133 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_66);
 x_134 = l_Lean_Parser_ParserState_mkErrorsAt(x_122, x_133, x_66);
 x_90 = x_134;
@@ -15871,7 +15871,7 @@ lean_dec(x_68);
 if (x_70 == 0)
 {
 lean_object* x_71; lean_object* x_72; 
-x_71 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_71 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_72 = l_Lean_Parser_ParserState_mkErrorsAt(x_64, x_71, x_63);
 x_39 = x_72;
 goto block_62;
@@ -15887,7 +15887,7 @@ else
 {
 lean_object* x_73; lean_object* x_74; 
 lean_dec(x_67);
-x_73 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_73 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_74 = l_Lean_Parser_ParserState_mkErrorsAt(x_64, x_73, x_63);
 x_39 = x_74;
 goto block_62;
@@ -15897,7 +15897,7 @@ else
 {
 lean_object* x_75; lean_object* x_76; 
 lean_dec(x_65);
-x_75 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_75 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_76 = l_Lean_Parser_ParserState_mkErrorsAt(x_64, x_75, x_63);
 x_39 = x_76;
 goto block_62;
@@ -16155,7 +16155,7 @@ lean_dec(x_155);
 if (x_157 == 0)
 {
 lean_object* x_158; lean_object* x_159; 
-x_158 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_158 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_79);
 x_159 = l_Lean_Parser_ParserState_mkErrorsAt(x_151, x_158, x_79);
 x_125 = x_159;
@@ -16171,7 +16171,7 @@ else
 {
 lean_object* x_160; lean_object* x_161; 
 lean_dec(x_154);
-x_160 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_160 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_79);
 x_161 = l_Lean_Parser_ParserState_mkErrorsAt(x_151, x_160, x_79);
 x_125 = x_161;
@@ -16182,7 +16182,7 @@ else
 {
 lean_object* x_162; lean_object* x_163; 
 lean_dec(x_152);
-x_162 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_162 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_79);
 x_163 = l_Lean_Parser_ParserState_mkErrorsAt(x_151, x_162, x_79);
 x_125 = x_163;
diff --git a/stage0/stdlib/Init/Lean/Parser/Tactic.c b/stage0/stdlib/Init/Lean/Parser/Tactic.c
index d65710fa8c..cd3f0b366c 100644
--- a/stage0/stdlib/Init/Lean/Parser/Tactic.c
+++ b/stage0/stdlib/Init/Lean/Parser/Tactic.c
@@ -164,7 +164,6 @@ lean_object* l_Lean_Parser_Tactic_clear___closed__1;
 lean_object* l_Lean_Parser_Tactic_clear___closed__2;
 lean_object* l_Lean_Parser_Tactic_clear;
 lean_object* l_Lean_Parser_Tactic_clear___elambda__1___closed__3;
-extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__14;
 lean_object* l_Lean_Parser_Tactic_case___closed__4;
 lean_object* l_Lean_Parser_Tactic_subst___closed__1;
 lean_object* l_Lean_Parser_Tactic_induction;
@@ -490,6 +489,7 @@ lean_object* l_Lean_Parser_Tactic_injection;
 extern lean_object* l_Lean_Parser_Tactic_seq___closed__1;
 lean_object* l_Lean_Parser_Tactic_exact___closed__2;
 lean_object* l_Lean_Parser_Tactic_intro___closed__2;
+extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 extern lean_object* l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___elambda__1___closed__10;
 lean_object* l_Lean_Parser_mkAntiquot(lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___closed__5;
@@ -12440,7 +12440,7 @@ lean_dec(x_44);
 if (x_46 == 0)
 {
 lean_object* x_47; lean_object* x_48; 
-x_47 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_47 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_48 = l_Lean_Parser_ParserState_mkErrorsAt(x_40, x_47, x_39);
 x_8 = x_48;
 goto block_38;
@@ -12456,7 +12456,7 @@ else
 {
 lean_object* x_49; lean_object* x_50; 
 lean_dec(x_43);
-x_49 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_49 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_50 = l_Lean_Parser_ParserState_mkErrorsAt(x_40, x_49, x_39);
 x_8 = x_50;
 goto block_38;
@@ -12466,7 +12466,7 @@ else
 {
 lean_object* x_51; lean_object* x_52; 
 lean_dec(x_41);
-x_51 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_51 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_52 = l_Lean_Parser_ParserState_mkErrorsAt(x_40, x_51, x_39);
 x_8 = x_52;
 goto block_38;
@@ -12639,7 +12639,7 @@ lean_dec(x_105);
 if (x_107 == 0)
 {
 lean_object* x_108; lean_object* x_109; 
-x_108 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_108 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_55);
 x_109 = l_Lean_Parser_ParserState_mkErrorsAt(x_101, x_108, x_55);
 x_64 = x_109;
@@ -12655,7 +12655,7 @@ else
 {
 lean_object* x_110; lean_object* x_111; 
 lean_dec(x_104);
-x_110 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_110 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_55);
 x_111 = l_Lean_Parser_ParserState_mkErrorsAt(x_101, x_110, x_55);
 x_64 = x_111;
@@ -12666,7 +12666,7 @@ else
 {
 lean_object* x_112; lean_object* x_113; 
 lean_dec(x_102);
-x_112 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_112 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_55);
 x_113 = l_Lean_Parser_ParserState_mkErrorsAt(x_101, x_112, x_55);
 x_64 = x_113;
diff --git a/stage0/stdlib/Init/Lean/Parser/Term.c b/stage0/stdlib/Init/Lean/Parser/Term.c
index 532fff01f3..c5ba8c77f6 100644
--- a/stage0/stdlib/Init/Lean/Parser/Term.c
+++ b/stage0/stdlib/Init/Lean/Parser/Term.c
@@ -169,7 +169,6 @@ lean_object* l_Lean_Parser_Term_nativeDecide___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Term_nativeDecide___closed__3;
 lean_object* l_Lean_Parser_Term_forall___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__1;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_not___closed__5;
 lean_object* l_Lean_Parser_Term_pow___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Term_char___closed__3;
@@ -487,7 +486,6 @@ lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Lean_Parser_Term_if;
 lean_object* l_Lean_Parser_Term_paren;
 lean_object* l_Lean_Parser_Term_anonymousCtor___closed__1;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Term_heq___closed__3;
 extern lean_object* l_Lean_mkAppStx___closed__4;
 lean_object* l_Lean_Parser_ParserState_mkErrorsAt(lean_object*, lean_object*, lean_object*);
@@ -628,6 +626,7 @@ lean_object* l_Lean_Parser_Term_doElem___closed__3;
 lean_object* l_Lean_Parser_Term_if___closed__3;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___closed__6;
 lean_object* l_Lean_Parser_Term_byTactic___elambda__1___closed__1;
+lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__15;
 lean_object* l_Lean_Parser_Term_suffices___closed__4;
 lean_object* l_Lean_Parser_Term_nativeRefl___closed__1;
 lean_object* l_Lean_Parser_Term_fromTerm___elambda__1___closed__9;
@@ -700,6 +699,7 @@ lean_object* l_Lean_Parser_Term_uminus___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Term_prop___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_mapRev___closed__1;
 lean_object* l_Lean_Parser_Term_do___closed__2;
+lean_object* l_Lean_Parser_Term_structInst___closed__17;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_gt___closed__2;
 lean_object* l_Lean_Parser_Term_orelse___elambda__1___closed__3;
@@ -717,6 +717,7 @@ lean_object* l_Lean_Parser_Term_bracketedDoSeq___elambda__1___closed__1;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Term_matchAlts___elambda__1___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_subtype___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Term_modN___elambda__1___closed__4;
+lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__16;
 lean_object* l_Lean_Parser_Term_checkIsSort___elambda__1(lean_object*);
 lean_object* l_Lean_Parser_Term_uminus___closed__4;
 lean_object* l_Lean_Parser_Term_prod;
@@ -729,7 +730,6 @@ lean_object* l_Lean_Parser_Term_not___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_le___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___closed__1;
 extern lean_object* l_Lean_Nat_HasQuote___closed__1;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Tactic_seq___closed__5;
 lean_object* l_Lean_Parser_Term_letEqnsDecl___closed__3;
 lean_object* l_Lean_Parser_Term_str___elambda__1(lean_object*, lean_object*);
@@ -860,7 +860,6 @@ lean_object* l_Lean_Parser_Term_letPatDecl___closed__5;
 lean_object* l_Lean_Parser_Term_show___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Term_arrayRef;
 lean_object* l_Lean_Parser_Term_cdot;
-lean_object* l_Lean_Parser_Term_structInstSource___closed__4;
 lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__3;
 lean_object* l_Lean_Parser_sepBy1Fn___at_Lean_Parser_Tactic_nonEmptySeq___elambda__1___spec__1(uint8_t, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_nativeRefl___closed__6;
@@ -1009,9 +1008,7 @@ lean_object* l_Lean_Parser_Term_nativeDecide___closed__1;
 lean_object* l_Lean_Parser_Term_nativeRefl___closed__5;
 lean_object* l_Lean_Parser_Term_binderIdent___closed__1;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_tacticBlock(lean_object*);
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_ge___closed__3;
-lean_object* l_Lean_Parser_Term_structInstSource;
 lean_object* l_Lean_Parser_Term_quotedName___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_doSeq___closed__2;
 lean_object* l_Lean_Parser_Term_structInstLVal___elambda__1(lean_object*, lean_object*);
@@ -1036,6 +1033,7 @@ lean_object* l_Lean_Parser_Term_instBinder___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_depArrow___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Term_append___closed__1;
 lean_object* l_Lean_Parser_Term_tparser_x21___elambda__1___closed__1;
+lean_object* l_Lean_Parser_Term_structInst___closed__15;
 lean_object* l_Lean_Parser_Term_bracketedDoSeq___elambda__1___closed__4;
 extern lean_object* l_List_reprAux___main___rarg___closed__1;
 lean_object* l_Lean_Parser_Term_id___closed__6;
@@ -1046,10 +1044,10 @@ lean_object* l_Lean_Parser_Term_add___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Term_doElem___closed__2;
 lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Term_or___elambda__1(lean_object*, lean_object*);
-lean_object* l_Lean_Parser_Term_structInstSource___closed__3;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_seq(lean_object*);
 lean_object* l_Lean_Parser_Term_sub___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Term_bindOp___closed__2;
+lean_object* l_Lean_Parser_Term_structInst___closed__18;
 lean_object* l_Lean_Parser_Term_uminus___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Term_uminus___closed__5;
 lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
@@ -1209,7 +1207,6 @@ lean_object* l_Lean_Parser_Term_let___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Term_sortApp___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_unicodeInfixL(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__1;
-lean_object* l_Lean_Parser_Term_structInstSource___closed__6;
 lean_object* l_Lean_Parser_Term_namedArgument___closed__2;
 lean_object* l_Lean_Parser_Term_cdot___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Term_letEqnsDecl;
@@ -1253,7 +1250,6 @@ lean_object* l_Lean_Parser_Term_arrayRef___elambda__1___closed__1;
 extern lean_object* l_Lean_formatEntry___closed__1;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__7;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_have(lean_object*);
-lean_object* l_Lean_Parser_Term_structInstSource___closed__5;
 lean_object* l_Lean_Parser_Term_typeSpec___elambda__1___closed__3;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_cdot(lean_object*);
 lean_object* l_Lean_Parser_Term_mapRev___elambda__1(lean_object*, lean_object*);
@@ -1374,7 +1370,6 @@ lean_object* l_Lean_Parser_Term_emptyC___closed__4;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Term_matchAlts___elambda__1___spec__2___closed__3;
 lean_object* l_Lean_Parser_Term_band___closed__3;
 lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__1;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__6;
 extern lean_object* l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Term_mapRev;
 lean_object* l_Lean_Parser_Term_cons___closed__3;
@@ -1511,7 +1506,6 @@ lean_object* l_Lean_Parser_Term_match___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Term_tupleTail___closed__6;
 lean_object* l_Lean_Parser_Term_if___elambda__1___closed__2;
 lean_object* l_Lean_Parser_mergeOrElseErrors(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__1;
 lean_object* l_Lean_Parser_sepBy1Fn___at_Lean_Parser_Term_matchAlts___elambda__1___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_prod___closed__1;
 lean_object* l_Lean_Parser_tryFn(lean_object*, lean_object*, lean_object*);
@@ -1578,7 +1572,6 @@ lean_object* l_Lean_Parser_Term_doLet___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_sortApp___closed__3;
 lean_object* l_Lean_Parser_Term_borrowed___closed__3;
 lean_object* l_Lean_Parser_Term_match___elambda__1___closed__9;
-lean_object* l_Lean_Parser_Term_structInstSource___closed__1;
 lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Term_depArrow___closed__6;
 lean_object* l_Lean_Parser_Term_mapConst___elambda__1___closed__3;
@@ -1599,7 +1592,6 @@ lean_object* l_Lean_Parser_Term_div___closed__2;
 lean_object* l_Lean_Parser_Term_structInstArrayRef___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_mapConst___closed__2;
 lean_object* l_Lean_Parser_Term_emptyC___closed__3;
-lean_object* l_Lean_Parser_Term_structInstSource___closed__2;
 lean_object* l_Lean_Parser_Term_prop___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Term_sub___closed__3;
 lean_object* l_Lean_Parser_Term_typeSpec___closed__3;
@@ -1766,7 +1758,6 @@ lean_object* l_Lean_Parser_Term_arrayLit___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Term_funBinder___closed__1;
 lean_object* l_Lean_Parser_Term_binderDefault___elambda__1___closed__2;
 lean_object* l_String_trim(lean_object*);
-lean_object* l_Lean_Parser_Term_structInstSource___closed__7;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_prop(lean_object*);
 lean_object* l_Lean_Parser_Term_doExpr___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Tactic_nonEmptySeq___elambda__1(lean_object*, lean_object*);
@@ -1857,11 +1848,13 @@ lean_object* l_Lean_Parser_regBuiltinTacticParserAttr___closed__3;
 lean_object* l_Lean_Parser_Term_forall___closed__5;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Term_matchAlts___elambda__1___spec__18(lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_pow;
+lean_object* l_Lean_Parser_Term_structInst___closed__16;
 lean_object* l_Lean_Parser_Term_structInstArrayRef___closed__6;
 lean_object* l_Lean_Parser_Term_letIdDecl___closed__4;
 lean_object* l_Lean_Parser_Term_leftArrow___closed__1;
 lean_object* l_Lean_Parser_Term_match__syntax___closed__6;
 lean_object* l_Lean_Parser_Term_binderTactic___closed__6;
+lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_object* l_Lean_Parser_Term_fromTerm___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Term_where___closed__2;
 lean_object* l_Lean_Parser_Term_do___elambda__1___closed__6;
@@ -1892,7 +1885,6 @@ lean_object* l_Lean_Parser_Term_doId___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_mapConst___elambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_letIdDecl___closed__9;
 lean_object* l_Lean_Parser_Term_hole___closed__3;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Term_byTactic___closed__6;
 lean_object* l_Lean_Parser_unicodeSymbolFn___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_namedHole___closed__2;
@@ -1906,7 +1898,6 @@ lean_object* l___regBuiltinParser_Lean_Parser_Term_funBinderStxQuot___closed__2;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_match(lean_object*);
 lean_object* l___regBuiltinParser_Lean_Parser_Term_depArrow(lean_object*);
 lean_object* l_Lean_Parser_Term_simpleBinder___elambda__1___closed__3;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Term_forall___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Term_bne___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Term_optIdent___elambda__1(lean_object*, lean_object*);
@@ -1942,7 +1933,6 @@ lean_object* l_Lean_Parser_Term_nomatch___closed__5;
 lean_object* l_Lean_Parser_Term_beq___closed__1;
 lean_object* l_Lean_Parser_Term_fun___closed__2;
 lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__5;
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_hole(lean_object*);
 lean_object* l_Lean_Parser_Term_iff___closed__2;
 lean_object* l_Lean_Parser_Term_if___elambda__1___closed__12;
@@ -16490,501 +16480,10 @@ x_1 = l_Lean_Parser_Term_structInstField___closed__5;
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("structInstSource");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_mkAppStx___closed__6;
-x_2 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__1;
-x_2 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__3;
-x_3 = 1;
-x_4 = l_Lean_Parser_mkAntiquot(x_1, x_2, x_3);
-return x_4;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_getBuiltinSearchPath___closed__1;
-x_2 = l_String_trim(x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Char_HasRepr___closed__1;
-x_2 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__5;
-x_3 = lean_string_append(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__6;
-x_2 = l_Char_HasRepr___closed__1;
-x_3 = lean_string_append(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__7;
-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;
-}
-}
-lean_object* l_Lean_Parser_Term_structInstSource___elambda__1(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; uint8_t x_5; 
-x_3 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__4;
-x_4 = lean_ctor_get(x_3, 1);
-lean_inc(x_4);
-lean_inc(x_2);
-lean_inc(x_1);
-x_5 = l_Lean_Parser_tryAnti(x_1, x_2);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-lean_dec(x_4);
-x_6 = lean_ctor_get(x_2, 0);
-lean_inc(x_6);
-x_7 = lean_array_get_size(x_6);
-lean_dec(x_6);
-x_35 = lean_ctor_get(x_2, 1);
-lean_inc(x_35);
-lean_inc(x_1);
-x_36 = l_Lean_Parser_tokenFn(x_1, x_2);
-x_37 = lean_ctor_get(x_36, 3);
-lean_inc(x_37);
-if (lean_obj_tag(x_37) == 0)
-{
-lean_object* x_38; lean_object* x_39; 
-x_38 = lean_ctor_get(x_36, 0);
-lean_inc(x_38);
-x_39 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_38);
-lean_dec(x_38);
-if (lean_obj_tag(x_39) == 2)
-{
-lean_object* x_40; lean_object* x_41; uint8_t x_42; 
-x_40 = lean_ctor_get(x_39, 1);
-lean_inc(x_40);
-lean_dec(x_39);
-x_41 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__5;
-x_42 = lean_string_dec_eq(x_40, x_41);
-lean_dec(x_40);
-if (x_42 == 0)
-{
-lean_object* x_43; lean_object* x_44; 
-x_43 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-x_44 = l_Lean_Parser_ParserState_mkErrorsAt(x_36, x_43, x_35);
-x_8 = x_44;
-goto block_34;
-}
-else
-{
-lean_dec(x_35);
-x_8 = x_36;
-goto block_34;
-}
-}
-else
-{
-lean_object* x_45; lean_object* x_46; 
-lean_dec(x_39);
-x_45 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-x_46 = l_Lean_Parser_ParserState_mkErrorsAt(x_36, x_45, x_35);
-x_8 = x_46;
-goto block_34;
-}
-}
-else
-{
-lean_object* x_47; lean_object* x_48; 
-lean_dec(x_37);
-x_47 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-x_48 = l_Lean_Parser_ParserState_mkErrorsAt(x_36, x_47, x_35);
-x_8 = x_48;
-goto block_34;
-}
-block_34:
-{
-lean_object* x_9; 
-x_9 = lean_ctor_get(x_8, 3);
-lean_inc(x_9);
-if (lean_obj_tag(x_9) == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_10 = lean_ctor_get(x_8, 0);
-lean_inc(x_10);
-x_11 = lean_array_get_size(x_10);
-lean_dec(x_10);
-x_12 = lean_ctor_get(x_8, 1);
-lean_inc(x_12);
-x_13 = l_Lean_Parser_termParser___closed__2;
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Parser_categoryParser___elambda__1(x_13, x_14, x_1, x_8);
-x_16 = lean_ctor_get(x_15, 3);
-lean_inc(x_16);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-lean_dec(x_12);
-x_17 = l_Lean_nullKind;
-x_18 = l_Lean_Parser_ParserState_mkNode(x_15, x_17, x_11);
-x_19 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_20 = l_Lean_Parser_ParserState_mkNode(x_18, x_19, x_7);
-return x_20;
-}
-else
-{
-lean_object* x_21; uint8_t x_22; 
-lean_dec(x_16);
-x_21 = lean_ctor_get(x_15, 1);
-lean_inc(x_21);
-x_22 = lean_nat_dec_eq(x_21, x_12);
-lean_dec(x_21);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-lean_dec(x_12);
-x_23 = l_Lean_nullKind;
-x_24 = l_Lean_Parser_ParserState_mkNode(x_15, x_23, x_11);
-x_25 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_26 = l_Lean_Parser_ParserState_mkNode(x_24, x_25, x_7);
-return x_26;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_27 = l_Lean_Parser_ParserState_restore(x_15, x_11, x_12);
-x_28 = l_Lean_nullKind;
-x_29 = l_Lean_Parser_ParserState_mkNode(x_27, x_28, x_11);
-x_30 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_31 = l_Lean_Parser_ParserState_mkNode(x_29, x_30, x_7);
-return x_31;
-}
-}
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_9);
-lean_dec(x_1);
-x_32 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_33 = l_Lean_Parser_ParserState_mkNode(x_8, x_32, x_7);
-return x_33;
-}
-}
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_49 = lean_ctor_get(x_2, 0);
-lean_inc(x_49);
-x_50 = lean_array_get_size(x_49);
-lean_dec(x_49);
-x_51 = lean_ctor_get(x_2, 1);
-lean_inc(x_51);
-lean_inc(x_1);
-x_52 = lean_apply_2(x_4, x_1, x_2);
-x_53 = lean_ctor_get(x_52, 3);
-lean_inc(x_53);
-if (lean_obj_tag(x_53) == 0)
-{
-lean_dec(x_51);
-lean_dec(x_50);
-lean_dec(x_1);
-return x_52;
-}
-else
-{
-lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_54 = lean_ctor_get(x_53, 0);
-lean_inc(x_54);
-lean_dec(x_53);
-x_55 = lean_ctor_get(x_52, 1);
-lean_inc(x_55);
-x_56 = lean_nat_dec_eq(x_55, x_51);
-lean_dec(x_55);
-if (x_56 == 0)
-{
-lean_dec(x_54);
-lean_dec(x_51);
-lean_dec(x_50);
-lean_dec(x_1);
-return x_52;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_91; lean_object* x_92; 
-lean_inc(x_51);
-x_57 = l_Lean_Parser_ParserState_restore(x_52, x_50, x_51);
-lean_dec(x_50);
-x_58 = lean_ctor_get(x_57, 0);
-lean_inc(x_58);
-x_59 = lean_array_get_size(x_58);
-lean_dec(x_58);
-lean_inc(x_1);
-x_91 = l_Lean_Parser_tokenFn(x_1, x_57);
-x_92 = lean_ctor_get(x_91, 3);
-lean_inc(x_92);
-if (lean_obj_tag(x_92) == 0)
-{
-lean_object* x_93; lean_object* x_94; 
-x_93 = lean_ctor_get(x_91, 0);
-lean_inc(x_93);
-x_94 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_93);
-lean_dec(x_93);
-if (lean_obj_tag(x_94) == 2)
-{
-lean_object* x_95; lean_object* x_96; uint8_t x_97; 
-x_95 = lean_ctor_get(x_94, 1);
-lean_inc(x_95);
-lean_dec(x_94);
-x_96 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__5;
-x_97 = lean_string_dec_eq(x_95, x_96);
-lean_dec(x_95);
-if (x_97 == 0)
-{
-lean_object* x_98; lean_object* x_99; 
-x_98 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-lean_inc(x_51);
-x_99 = l_Lean_Parser_ParserState_mkErrorsAt(x_91, x_98, x_51);
-x_60 = x_99;
-goto block_90;
-}
-else
-{
-x_60 = x_91;
-goto block_90;
-}
-}
-else
-{
-lean_object* x_100; lean_object* x_101; 
-lean_dec(x_94);
-x_100 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-lean_inc(x_51);
-x_101 = l_Lean_Parser_ParserState_mkErrorsAt(x_91, x_100, x_51);
-x_60 = x_101;
-goto block_90;
-}
-}
-else
-{
-lean_object* x_102; lean_object* x_103; 
-lean_dec(x_92);
-x_102 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__8;
-lean_inc(x_51);
-x_103 = l_Lean_Parser_ParserState_mkErrorsAt(x_91, x_102, x_51);
-x_60 = x_103;
-goto block_90;
-}
-block_90:
-{
-lean_object* x_61; 
-x_61 = lean_ctor_get(x_60, 3);
-lean_inc(x_61);
-if (lean_obj_tag(x_61) == 0)
-{
-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; 
-x_62 = lean_ctor_get(x_60, 0);
-lean_inc(x_62);
-x_63 = lean_array_get_size(x_62);
-lean_dec(x_62);
-x_64 = lean_ctor_get(x_60, 1);
-lean_inc(x_64);
-x_65 = l_Lean_Parser_termParser___closed__2;
-x_66 = lean_unsigned_to_nat(0u);
-x_67 = l_Lean_Parser_categoryParser___elambda__1(x_65, x_66, x_1, x_60);
-x_68 = lean_ctor_get(x_67, 3);
-lean_inc(x_68);
-if (lean_obj_tag(x_68) == 0)
-{
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-lean_dec(x_64);
-x_69 = l_Lean_nullKind;
-x_70 = l_Lean_Parser_ParserState_mkNode(x_67, x_69, x_63);
-x_71 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_72 = l_Lean_Parser_ParserState_mkNode(x_70, x_71, x_59);
-x_73 = l_Lean_Parser_mergeOrElseErrors(x_72, x_54, x_51);
-lean_dec(x_51);
-return x_73;
-}
-else
-{
-lean_object* x_74; uint8_t x_75; 
-lean_dec(x_68);
-x_74 = lean_ctor_get(x_67, 1);
-lean_inc(x_74);
-x_75 = lean_nat_dec_eq(x_74, x_64);
-lean_dec(x_74);
-if (x_75 == 0)
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-lean_dec(x_64);
-x_76 = l_Lean_nullKind;
-x_77 = l_Lean_Parser_ParserState_mkNode(x_67, x_76, x_63);
-x_78 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_79 = l_Lean_Parser_ParserState_mkNode(x_77, x_78, x_59);
-x_80 = l_Lean_Parser_mergeOrElseErrors(x_79, x_54, x_51);
-lean_dec(x_51);
-return x_80;
-}
-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; 
-x_81 = l_Lean_Parser_ParserState_restore(x_67, x_63, x_64);
-x_82 = l_Lean_nullKind;
-x_83 = l_Lean_Parser_ParserState_mkNode(x_81, x_82, x_63);
-x_84 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_85 = l_Lean_Parser_ParserState_mkNode(x_83, x_84, x_59);
-x_86 = l_Lean_Parser_mergeOrElseErrors(x_85, x_54, x_51);
-lean_dec(x_51);
-return x_86;
-}
-}
-}
-else
-{
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-lean_dec(x_61);
-lean_dec(x_1);
-x_87 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_88 = l_Lean_Parser_ParserState_mkNode(x_60, x_87, x_59);
-x_89 = l_Lean_Parser_mergeOrElseErrors(x_88, x_54, x_51);
-lean_dec(x_51);
-return x_89;
-}
-}
-}
-}
-}
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__5;
-x_3 = l_Lean_Parser_symbolInfo(x_2, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___closed__2;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_optionaInfo(x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInstSource___closed__1;
-x_2 = l_Lean_Parser_Term_structInstSource___closed__2;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__2;
-x_2 = l_Lean_Parser_Term_structInstSource___closed__3;
-x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_structInstSource___elambda__1___closed__4;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_structInstSource___closed__4;
-x_4 = l_Lean_Parser_orelseInfo(x_2, x_3);
-return x_4;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__6() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Parser_Term_structInstSource___elambda__1), 2, 0);
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Parser_Term_structInstSource___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInstSource___closed__5;
-x_2 = l_Lean_Parser_Term_structInstSource___closed__6;
-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* _init_l_Lean_Parser_Term_structInstSource() {
-_start:
-{
-lean_object* x_1; 
-x_1 = l_Lean_Parser_Term_structInstSource___closed__7;
-return x_1;
-}
-}
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Term_structInst___elambda__1___spec__2(uint8_t x_1, lean_object* x_2, uint8_t x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_60; lean_object* x_61; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_7 = lean_ctor_get(x_6, 0);
 lean_inc(x_7);
 x_8 = lean_array_get_size(x_7);
@@ -16992,45 +16491,7 @@ lean_dec(x_7);
 x_9 = lean_ctor_get(x_6, 1);
 lean_inc(x_9);
 lean_inc(x_5);
-x_60 = l_Lean_Parser_Term_structInstField___elambda__1(x_5, x_6);
-x_61 = lean_ctor_get(x_60, 3);
-lean_inc(x_61);
-if (lean_obj_tag(x_61) == 0)
-{
-x_10 = x_60;
-goto block_59;
-}
-else
-{
-lean_object* x_62; lean_object* x_63; uint8_t x_64; 
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-lean_dec(x_61);
-x_63 = lean_ctor_get(x_60, 1);
-lean_inc(x_63);
-x_64 = lean_nat_dec_eq(x_63, x_9);
-lean_dec(x_63);
-if (x_64 == 0)
-{
-lean_dec(x_62);
-x_10 = x_60;
-goto block_59;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_inc(x_9);
-x_65 = l_Lean_Parser_ParserState_restore(x_60, x_8, x_9);
-lean_inc(x_5);
-x_66 = l_Lean_Parser_Term_structInstSource___elambda__1(x_5, x_65);
-x_67 = l_Lean_Parser_mergeOrElseErrors(x_66, x_62, x_9);
-x_10 = x_67;
-goto block_59;
-}
-}
-block_59:
-{
-lean_object* x_11; 
+x_10 = l_Lean_Parser_Term_structInstField___elambda__1(x_5, x_6);
 x_11 = lean_ctor_get(x_10, 3);
 lean_inc(x_11);
 if (lean_obj_tag(x_11) == 0)
@@ -17230,7 +16691,6 @@ return x_10;
 }
 }
 }
-}
 lean_object* l_Lean_Parser_sepByFn___at_Lean_Parser_Term_structInst___elambda__1___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -17297,7 +16757,7 @@ lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string(" . ");
+x_1 = lean_mk_string("with");
 return x_1;
 }
 }
@@ -17313,9 +16773,10 @@ return x_2;
 lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__8() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("expected space '.'");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_getBuiltinSearchPath___closed__1;
+x_2 = l_String_trim(x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__9() {
@@ -17323,7 +16784,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Char_HasRepr___closed__1;
-x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
 }
@@ -17355,7 +16816,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Char_HasRepr___closed__1;
-x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
 }
@@ -17382,6 +16843,38 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__15() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Char_HasRepr___closed__1;
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__16() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_structInst___elambda__1___closed__15;
+x_2 = l_Char_HasRepr___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___elambda__1___closed__17() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__16;
+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;
+}
+}
 lean_object* l_Lean_Parser_Term_structInst___elambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -17394,867 +16887,1393 @@ lean_inc(x_1);
 x_5 = l_Lean_Parser_tryAnti(x_1, x_2);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_40; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_35; lean_object* x_79; lean_object* x_117; lean_object* x_181; lean_object* x_182; lean_object* x_183; 
 lean_dec(x_4);
 x_6 = lean_ctor_get(x_2, 0);
 lean_inc(x_6);
 x_7 = lean_array_get_size(x_6);
 lean_dec(x_6);
-x_108 = lean_ctor_get(x_2, 1);
-lean_inc(x_108);
+x_181 = lean_ctor_get(x_2, 1);
+lean_inc(x_181);
 lean_inc(x_1);
-x_109 = l_Lean_Parser_tokenFn(x_1, x_2);
-x_110 = lean_ctor_get(x_109, 3);
-lean_inc(x_110);
-if (lean_obj_tag(x_110) == 0)
+x_182 = l_Lean_Parser_tokenFn(x_1, x_2);
+x_183 = lean_ctor_get(x_182, 3);
+lean_inc(x_183);
+if (lean_obj_tag(x_183) == 0)
 {
-lean_object* x_111; lean_object* x_112; 
-x_111 = lean_ctor_get(x_109, 0);
-lean_inc(x_111);
-x_112 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_111);
-lean_dec(x_111);
-if (lean_obj_tag(x_112) == 2)
+lean_object* x_184; lean_object* x_185; 
+x_184 = lean_ctor_get(x_182, 0);
+lean_inc(x_184);
+x_185 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_184);
+lean_dec(x_184);
+if (lean_obj_tag(x_185) == 2)
 {
-lean_object* x_113; lean_object* x_114; uint8_t x_115; 
-x_113 = lean_ctor_get(x_112, 1);
-lean_inc(x_113);
-lean_dec(x_112);
-x_114 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
-x_115 = lean_string_dec_eq(x_113, x_114);
-lean_dec(x_113);
-if (x_115 == 0)
+lean_object* x_186; lean_object* x_187; uint8_t x_188; 
+x_186 = lean_ctor_get(x_185, 1);
+lean_inc(x_186);
+lean_dec(x_185);
+x_187 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
+x_188 = lean_string_dec_eq(x_186, x_187);
+lean_dec(x_186);
+if (x_188 == 0)
 {
-lean_object* x_116; lean_object* x_117; 
-x_116 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-x_117 = l_Lean_Parser_ParserState_mkErrorsAt(x_109, x_116, x_108);
-x_40 = x_117;
-goto block_107;
+lean_object* x_189; lean_object* x_190; 
+x_189 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+x_190 = l_Lean_Parser_ParserState_mkErrorsAt(x_182, x_189, x_181);
+x_117 = x_190;
+goto block_180;
 }
 else
 {
-lean_dec(x_108);
-x_40 = x_109;
-goto block_107;
+lean_dec(x_181);
+x_117 = x_182;
+goto block_180;
 }
 }
 else
 {
-lean_object* x_118; lean_object* x_119; 
-lean_dec(x_112);
-x_118 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-x_119 = l_Lean_Parser_ParserState_mkErrorsAt(x_109, x_118, x_108);
-x_40 = x_119;
-goto block_107;
+lean_object* x_191; lean_object* x_192; 
+lean_dec(x_185);
+x_191 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+x_192 = l_Lean_Parser_ParserState_mkErrorsAt(x_182, x_191, x_181);
+x_117 = x_192;
+goto block_180;
 }
 }
 else
 {
-lean_object* x_120; lean_object* x_121; 
-lean_dec(x_110);
-x_120 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-x_121 = l_Lean_Parser_ParserState_mkErrorsAt(x_109, x_120, x_108);
-x_40 = x_121;
-goto block_107;
+lean_object* x_193; lean_object* x_194; 
+lean_dec(x_183);
+x_193 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+x_194 = l_Lean_Parser_ParserState_mkErrorsAt(x_182, x_193, x_181);
+x_117 = x_194;
+goto block_180;
 }
-block_39:
+block_34:
 {
 lean_object* x_9; 
 x_9 = lean_ctor_get(x_8, 3);
 lean_inc(x_9);
 if (lean_obj_tag(x_9) == 0)
 {
-uint8_t x_10; lean_object* x_11; lean_object* x_12; 
-x_10 = 1;
-lean_inc(x_1);
-x_11 = l_Lean_Parser_sepByFn___at_Lean_Parser_Term_structInst___elambda__1___spec__1(x_10, x_1, x_8);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_10 = lean_ctor_get(x_8, 1);
+lean_inc(x_10);
+x_11 = l_Lean_Parser_tokenFn(x_1, x_8);
 x_12 = lean_ctor_get(x_11, 3);
 lean_inc(x_12);
 if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_11, 1);
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_11, 0);
 lean_inc(x_13);
-x_14 = l_Lean_Parser_tokenFn(x_1, x_11);
-x_15 = lean_ctor_get(x_14, 3);
-lean_inc(x_15);
-if (lean_obj_tag(x_15) == 0)
-{
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_ctor_get(x_14, 0);
-lean_inc(x_16);
-x_17 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_16);
-lean_dec(x_16);
-if (lean_obj_tag(x_17) == 2)
-{
-lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-x_18 = lean_ctor_get(x_17, 1);
-lean_inc(x_18);
-lean_dec(x_17);
-x_19 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__7;
-x_20 = lean_string_dec_eq(x_18, x_19);
-lean_dec(x_18);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_21 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_22 = l_Lean_Parser_ParserState_mkErrorsAt(x_14, x_21, x_13);
-x_23 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_24 = l_Lean_Parser_ParserState_mkNode(x_22, x_23, x_7);
-return x_24;
-}
-else
-{
-lean_object* x_25; lean_object* x_26; 
+x_14 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_13);
 lean_dec(x_13);
-x_25 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_26 = l_Lean_Parser_ParserState_mkNode(x_14, x_25, x_7);
-return x_26;
-}
-}
-else
+if (lean_obj_tag(x_14) == 2)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-lean_dec(x_17);
-x_27 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_28 = l_Lean_Parser_ParserState_mkErrorsAt(x_14, x_27, x_13);
-x_29 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_30 = l_Lean_Parser_ParserState_mkNode(x_28, x_29, x_7);
-return x_30;
-}
-}
-else
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_15 = lean_ctor_get(x_14, 1);
+lean_inc(x_15);
+lean_dec(x_14);
+x_16 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__7;
+x_17 = lean_string_dec_eq(x_15, x_16);
 lean_dec(x_15);
-x_31 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_32 = l_Lean_Parser_ParserState_mkErrorsAt(x_14, x_31, x_13);
-x_33 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_34 = l_Lean_Parser_ParserState_mkNode(x_32, x_33, x_7);
-return x_34;
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_18 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_19 = l_Lean_Parser_ParserState_mkErrorsAt(x_11, x_18, x_10);
+x_20 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_21 = l_Lean_Parser_ParserState_mkNode(x_19, x_20, x_7);
+return x_21;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
+lean_dec(x_10);
+x_22 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_23 = l_Lean_Parser_ParserState_mkNode(x_11, x_22, x_7);
+return x_23;
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; 
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_dec(x_14);
+x_24 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_25 = l_Lean_Parser_ParserState_mkErrorsAt(x_11, x_24, x_10);
+x_26 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_27 = l_Lean_Parser_ParserState_mkNode(x_25, x_26, x_7);
+return x_27;
+}
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
 lean_dec(x_12);
-lean_dec(x_1);
-x_35 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_36 = l_Lean_Parser_ParserState_mkNode(x_11, x_35, x_7);
-return x_36;
+x_28 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_29 = l_Lean_Parser_ParserState_mkErrorsAt(x_11, x_28, x_10);
+x_30 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_31 = l_Lean_Parser_ParserState_mkNode(x_29, x_30, x_7);
+return x_31;
 }
 }
 else
 {
-lean_object* x_37; lean_object* x_38; 
+lean_object* x_32; lean_object* x_33; 
 lean_dec(x_9);
 lean_dec(x_1);
-x_37 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_38 = l_Lean_Parser_ParserState_mkNode(x_8, x_37, x_7);
-return x_38;
+x_32 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_33 = l_Lean_Parser_ParserState_mkNode(x_8, x_32, x_7);
+return x_33;
 }
 }
-block_107:
+block_78:
+{
+lean_object* x_36; 
+x_36 = lean_ctor_get(x_35, 3);
+lean_inc(x_36);
+if (lean_obj_tag(x_36) == 0)
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_63; lean_object* x_64; 
+x_37 = lean_ctor_get(x_35, 0);
+lean_inc(x_37);
+x_38 = lean_array_get_size(x_37);
+lean_dec(x_37);
+x_39 = lean_ctor_get(x_35, 1);
+lean_inc(x_39);
+lean_inc(x_1);
+x_63 = l_Lean_Parser_tokenFn(x_1, x_35);
+x_64 = lean_ctor_get(x_63, 3);
+lean_inc(x_64);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_ctor_get(x_63, 0);
+lean_inc(x_65);
+x_66 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_65);
+lean_dec(x_65);
+if (lean_obj_tag(x_66) == 2)
+{
+lean_object* x_67; lean_object* x_68; uint8_t x_69; 
+x_67 = lean_ctor_get(x_66, 1);
+lean_inc(x_67);
+lean_dec(x_66);
+x_68 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__5;
+x_69 = lean_string_dec_eq(x_67, x_68);
+lean_dec(x_67);
+if (x_69 == 0)
+{
+lean_object* x_70; lean_object* x_71; 
+x_70 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_39);
+x_71 = l_Lean_Parser_ParserState_mkErrorsAt(x_63, x_70, x_39);
+x_40 = x_71;
+goto block_62;
+}
+else
+{
+x_40 = x_63;
+goto block_62;
+}
+}
+else
+{
+lean_object* x_72; lean_object* x_73; 
+lean_dec(x_66);
+x_72 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_39);
+x_73 = l_Lean_Parser_ParserState_mkErrorsAt(x_63, x_72, x_39);
+x_40 = x_73;
+goto block_62;
+}
+}
+else
+{
+lean_object* x_74; lean_object* x_75; 
+lean_dec(x_64);
+x_74 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_39);
+x_75 = l_Lean_Parser_ParserState_mkErrorsAt(x_63, x_74, x_39);
+x_40 = x_75;
+goto block_62;
+}
+block_62:
 {
 lean_object* x_41; 
 x_41 = lean_ctor_get(x_40, 3);
 lean_inc(x_41);
 if (lean_obj_tag(x_41) == 0)
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_68; lean_object* x_69; 
-x_42 = lean_ctor_get(x_40, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_40, 1);
-lean_inc(x_43);
-x_44 = lean_array_get_size(x_42);
-lean_dec(x_42);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_42 = l_Lean_Parser_termParser___closed__2;
+x_43 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
-x_68 = l_Lean_Parser_ident___elambda__1(x_1, x_40);
-x_69 = lean_ctor_get(x_68, 3);
-lean_inc(x_69);
-if (lean_obj_tag(x_69) == 0)
+x_44 = l_Lean_Parser_categoryParser___elambda__1(x_42, x_43, x_1, x_40);
+x_45 = lean_ctor_get(x_44, 3);
+lean_inc(x_45);
+if (lean_obj_tag(x_45) == 0)
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
-x_71 = l_Lean_Parser_checkWsBeforeFn(x_70, x_1, x_68);
-x_72 = lean_ctor_get(x_71, 3);
-lean_inc(x_72);
-if (lean_obj_tag(x_72) == 0)
-{
-lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-x_73 = lean_ctor_get(x_71, 1);
-lean_inc(x_73);
-lean_inc(x_1);
-x_74 = l_Lean_Parser_tokenFn(x_1, x_71);
-x_75 = lean_ctor_get(x_74, 3);
-lean_inc(x_75);
-if (lean_obj_tag(x_75) == 0)
-{
-lean_object* x_76; lean_object* x_77; 
-x_76 = lean_ctor_get(x_74, 0);
-lean_inc(x_76);
-x_77 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_76);
-lean_dec(x_76);
-if (lean_obj_tag(x_77) == 2)
-{
-lean_object* x_78; lean_object* x_79; uint8_t x_80; 
-x_78 = lean_ctor_get(x_77, 1);
-lean_inc(x_78);
-lean_dec(x_77);
-x_79 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
-x_80 = lean_string_dec_eq(x_78, x_79);
-lean_dec(x_78);
-if (x_80 == 0)
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_81 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_82 = l_Lean_Parser_ParserState_mkErrorsAt(x_74, x_81, x_73);
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-x_84 = lean_ctor_get(x_82, 2);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_82, 3);
-lean_inc(x_85);
-x_45 = x_82;
-x_46 = x_83;
-x_47 = x_84;
-x_48 = x_85;
-goto block_67;
+lean_object* x_46; lean_object* x_47; 
+lean_dec(x_39);
+x_46 = l_Lean_nullKind;
+x_47 = l_Lean_Parser_ParserState_mkNode(x_44, x_46, x_38);
+x_8 = x_47;
+goto block_34;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-lean_dec(x_73);
-x_86 = lean_ctor_get(x_74, 0);
-lean_inc(x_86);
-x_87 = lean_ctor_get(x_74, 2);
-lean_inc(x_87);
-x_88 = lean_ctor_get(x_74, 3);
-lean_inc(x_88);
-x_45 = x_74;
-x_46 = x_86;
-x_47 = x_87;
-x_48 = x_88;
-goto block_67;
-}
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-lean_dec(x_77);
-x_89 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_90 = l_Lean_Parser_ParserState_mkErrorsAt(x_74, x_89, x_73);
-x_91 = lean_ctor_get(x_90, 0);
-lean_inc(x_91);
-x_92 = lean_ctor_get(x_90, 2);
-lean_inc(x_92);
-x_93 = lean_ctor_get(x_90, 3);
-lean_inc(x_93);
-x_45 = x_90;
-x_46 = x_91;
-x_47 = x_92;
-x_48 = x_93;
-goto block_67;
-}
-}
-else
-{
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-lean_dec(x_75);
-x_94 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_95 = l_Lean_Parser_ParserState_mkErrorsAt(x_74, x_94, x_73);
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 2);
-lean_inc(x_97);
-x_98 = lean_ctor_get(x_95, 3);
-lean_inc(x_98);
-x_45 = x_95;
-x_46 = x_96;
-x_47 = x_97;
-x_48 = x_98;
-goto block_67;
-}
-}
-else
-{
-lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-lean_dec(x_72);
-x_99 = lean_ctor_get(x_71, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_71, 2);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_71, 3);
-lean_inc(x_101);
-x_45 = x_71;
-x_46 = x_99;
-x_47 = x_100;
-x_48 = x_101;
-goto block_67;
-}
-}
-else
-{
-lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-lean_dec(x_69);
-x_102 = lean_ctor_get(x_68, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_68, 2);
-lean_inc(x_103);
-x_104 = lean_ctor_get(x_68, 3);
-lean_inc(x_104);
-x_45 = x_68;
-x_46 = x_102;
-x_47 = x_103;
-x_48 = x_104;
-goto block_67;
-}
-block_67:
-{
-if (lean_obj_tag(x_48) == 0)
-{
-lean_object* x_49; 
-lean_dec(x_47);
-lean_dec(x_46);
-x_49 = lean_ctor_get(x_45, 3);
-lean_inc(x_49);
-if (lean_obj_tag(x_49) == 0)
+lean_object* x_48; uint8_t x_49; 
+lean_dec(x_45);
+x_48 = lean_ctor_get(x_44, 1);
+lean_inc(x_48);
+x_49 = lean_nat_dec_eq(x_48, x_39);
+lean_dec(x_48);
+if (x_49 == 0)
 {
 lean_object* x_50; lean_object* x_51; 
-lean_dec(x_43);
+lean_dec(x_39);
 x_50 = l_Lean_nullKind;
-x_51 = l_Lean_Parser_ParserState_mkNode(x_45, x_50, x_44);
+x_51 = l_Lean_Parser_ParserState_mkNode(x_44, x_50, x_38);
 x_8 = x_51;
-goto block_39;
+goto block_34;
 }
 else
 {
-lean_object* x_52; uint8_t x_53; 
-lean_dec(x_49);
-x_52 = lean_ctor_get(x_45, 1);
-lean_inc(x_52);
-x_53 = lean_nat_dec_eq(x_52, x_43);
-lean_dec(x_52);
-if (x_53 == 0)
-{
-lean_object* x_54; lean_object* x_55; 
-lean_dec(x_43);
-x_54 = l_Lean_nullKind;
-x_55 = l_Lean_Parser_ParserState_mkNode(x_45, x_54, x_44);
-x_8 = x_55;
-goto block_39;
-}
-else
-{
-lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_56 = l_Lean_Parser_ParserState_restore(x_45, x_44, x_43);
-x_57 = l_Lean_nullKind;
-x_58 = l_Lean_Parser_ParserState_mkNode(x_56, x_57, x_44);
-x_8 = x_58;
-goto block_39;
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = l_Lean_Parser_ParserState_restore(x_44, x_38, x_39);
+x_53 = l_Lean_nullKind;
+x_54 = l_Lean_Parser_ParserState_mkNode(x_52, x_53, x_38);
+x_8 = x_54;
+goto block_34;
 }
 }
 }
 else
 {
-lean_object* x_59; lean_object* x_60; uint8_t x_61; 
-lean_dec(x_45);
-x_59 = l_Array_shrink___main___rarg(x_46, x_44);
-lean_inc(x_43);
-x_60 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_43);
-lean_ctor_set(x_60, 2, x_47);
-lean_ctor_set(x_60, 3, x_48);
-x_61 = lean_nat_dec_eq(x_43, x_43);
-if (x_61 == 0)
-{
-lean_object* x_62; lean_object* x_63; 
-lean_dec(x_43);
-x_62 = l_Lean_nullKind;
-x_63 = l_Lean_Parser_ParserState_mkNode(x_60, x_62, x_44);
-x_8 = x_63;
-goto block_39;
-}
-else
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = l_Lean_Parser_ParserState_restore(x_60, x_44, x_43);
-x_65 = l_Lean_nullKind;
-x_66 = l_Lean_Parser_ParserState_mkNode(x_64, x_65, x_44);
-x_8 = x_66;
-goto block_39;
-}
-}
-}
-}
-else
-{
-lean_object* x_105; lean_object* x_106; 
+lean_object* x_55; uint8_t x_56; 
 lean_dec(x_41);
-lean_dec(x_1);
-x_105 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_106 = l_Lean_Parser_ParserState_mkNode(x_40, x_105, x_7);
-return x_106;
+x_55 = lean_ctor_get(x_40, 1);
+lean_inc(x_55);
+x_56 = lean_nat_dec_eq(x_55, x_39);
+lean_dec(x_55);
+if (x_56 == 0)
+{
+lean_object* x_57; lean_object* x_58; 
+lean_dec(x_39);
+x_57 = l_Lean_nullKind;
+x_58 = l_Lean_Parser_ParserState_mkNode(x_40, x_57, x_38);
+x_8 = x_58;
+goto block_34;
+}
+else
+{
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_59 = l_Lean_Parser_ParserState_restore(x_40, x_38, x_39);
+x_60 = l_Lean_nullKind;
+x_61 = l_Lean_Parser_ParserState_mkNode(x_59, x_60, x_38);
+x_8 = x_61;
+goto block_34;
+}
 }
 }
 }
 else
 {
-lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-x_122 = lean_ctor_get(x_2, 0);
-lean_inc(x_122);
-x_123 = lean_array_get_size(x_122);
-lean_dec(x_122);
-x_124 = lean_ctor_get(x_2, 1);
-lean_inc(x_124);
+lean_object* x_76; lean_object* x_77; 
+lean_dec(x_36);
+lean_dec(x_1);
+x_76 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_77 = l_Lean_Parser_ParserState_mkNode(x_35, x_76, x_7);
+return x_77;
+}
+}
+block_116:
+{
+lean_object* x_80; 
+x_80 = lean_ctor_get(x_79, 3);
+lean_inc(x_80);
+if (lean_obj_tag(x_80) == 0)
+{
+uint8_t x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = 1;
 lean_inc(x_1);
-x_125 = lean_apply_2(x_4, x_1, x_2);
-x_126 = lean_ctor_get(x_125, 3);
+x_82 = l_Lean_Parser_sepByFn___at_Lean_Parser_Term_structInst___elambda__1___spec__1(x_81, x_1, x_79);
+x_83 = lean_ctor_get(x_82, 3);
+lean_inc(x_83);
+if (lean_obj_tag(x_83) == 0)
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_99; lean_object* x_100; 
+x_84 = lean_ctor_get(x_82, 0);
+lean_inc(x_84);
+x_85 = lean_array_get_size(x_84);
+lean_dec(x_84);
+x_86 = lean_ctor_get(x_82, 1);
+lean_inc(x_86);
+lean_inc(x_1);
+x_99 = l_Lean_Parser_tokenFn(x_1, x_82);
+x_100 = lean_ctor_get(x_99, 3);
+lean_inc(x_100);
+if (lean_obj_tag(x_100) == 0)
+{
+lean_object* x_101; lean_object* x_102; 
+x_101 = lean_ctor_get(x_99, 0);
+lean_inc(x_101);
+x_102 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_101);
+lean_dec(x_101);
+if (lean_obj_tag(x_102) == 2)
+{
+lean_object* x_103; lean_object* x_104; uint8_t x_105; 
+x_103 = lean_ctor_get(x_102, 1);
+lean_inc(x_103);
+lean_dec(x_102);
+x_104 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
+x_105 = lean_string_dec_eq(x_103, x_104);
+lean_dec(x_103);
+if (x_105 == 0)
+{
+lean_object* x_106; lean_object* x_107; 
+x_106 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_86);
+x_107 = l_Lean_Parser_ParserState_mkErrorsAt(x_99, x_106, x_86);
+x_87 = x_107;
+goto block_98;
+}
+else
+{
+x_87 = x_99;
+goto block_98;
+}
+}
+else
+{
+lean_object* x_108; lean_object* x_109; 
+lean_dec(x_102);
+x_108 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_86);
+x_109 = l_Lean_Parser_ParserState_mkErrorsAt(x_99, x_108, x_86);
+x_87 = x_109;
+goto block_98;
+}
+}
+else
+{
+lean_object* x_110; lean_object* x_111; 
+lean_dec(x_100);
+x_110 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_86);
+x_111 = l_Lean_Parser_ParserState_mkErrorsAt(x_99, x_110, x_86);
+x_87 = x_111;
+goto block_98;
+}
+block_98:
+{
+lean_object* x_88; 
+x_88 = lean_ctor_get(x_87, 3);
+lean_inc(x_88);
+if (lean_obj_tag(x_88) == 0)
+{
+lean_object* x_89; lean_object* x_90; 
+lean_dec(x_86);
+x_89 = l_Lean_nullKind;
+x_90 = l_Lean_Parser_ParserState_mkNode(x_87, x_89, x_85);
+x_35 = x_90;
+goto block_78;
+}
+else
+{
+lean_object* x_91; uint8_t x_92; 
+lean_dec(x_88);
+x_91 = lean_ctor_get(x_87, 1);
+lean_inc(x_91);
+x_92 = lean_nat_dec_eq(x_91, x_86);
+lean_dec(x_91);
+if (x_92 == 0)
+{
+lean_object* x_93; lean_object* x_94; 
+lean_dec(x_86);
+x_93 = l_Lean_nullKind;
+x_94 = l_Lean_Parser_ParserState_mkNode(x_87, x_93, x_85);
+x_35 = x_94;
+goto block_78;
+}
+else
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = l_Lean_Parser_ParserState_restore(x_87, x_85, x_86);
+x_96 = l_Lean_nullKind;
+x_97 = l_Lean_Parser_ParserState_mkNode(x_95, x_96, x_85);
+x_35 = x_97;
+goto block_78;
+}
+}
+}
+}
+else
+{
+lean_object* x_112; lean_object* x_113; 
+lean_dec(x_83);
+lean_dec(x_1);
+x_112 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_113 = l_Lean_Parser_ParserState_mkNode(x_82, x_112, x_7);
+return x_113;
+}
+}
+else
+{
+lean_object* x_114; lean_object* x_115; 
+lean_dec(x_80);
+lean_dec(x_1);
+x_114 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_115 = l_Lean_Parser_ParserState_mkNode(x_79, x_114, x_7);
+return x_115;
+}
+}
+block_180:
+{
+lean_object* x_118; 
+x_118 = lean_ctor_get(x_117, 3);
+lean_inc(x_118);
+if (lean_obj_tag(x_118) == 0)
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
+x_119 = lean_ctor_get(x_117, 0);
+lean_inc(x_119);
+x_120 = lean_ctor_get(x_117, 1);
+lean_inc(x_120);
+x_121 = lean_array_get_size(x_119);
+lean_dec(x_119);
+x_145 = l_Lean_Parser_termParser___closed__2;
+x_146 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_147 = l_Lean_Parser_categoryParser___elambda__1(x_145, x_146, x_1, x_117);
+x_148 = lean_ctor_get(x_147, 3);
+lean_inc(x_148);
+if (lean_obj_tag(x_148) == 0)
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_149 = lean_ctor_get(x_147, 1);
+lean_inc(x_149);
+lean_inc(x_1);
+x_150 = l_Lean_Parser_tokenFn(x_1, x_147);
+x_151 = lean_ctor_get(x_150, 3);
+lean_inc(x_151);
+if (lean_obj_tag(x_151) == 0)
+{
+lean_object* x_152; lean_object* x_153; 
+x_152 = lean_ctor_get(x_150, 0);
+lean_inc(x_152);
+x_153 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_152);
+lean_dec(x_152);
+if (lean_obj_tag(x_153) == 2)
+{
+lean_object* x_154; lean_object* x_155; uint8_t x_156; 
+x_154 = lean_ctor_get(x_153, 1);
+lean_inc(x_154);
+lean_dec(x_153);
+x_155 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
+x_156 = lean_string_dec_eq(x_154, x_155);
+lean_dec(x_154);
+if (x_156 == 0)
+{
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_157 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_158 = l_Lean_Parser_ParserState_mkErrorsAt(x_150, x_157, x_149);
+x_159 = lean_ctor_get(x_158, 0);
+lean_inc(x_159);
+x_160 = lean_ctor_get(x_158, 2);
+lean_inc(x_160);
+x_161 = lean_ctor_get(x_158, 3);
+lean_inc(x_161);
+x_122 = x_158;
+x_123 = x_159;
+x_124 = x_160;
+x_125 = x_161;
+goto block_144;
+}
+else
+{
+lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+lean_dec(x_149);
+x_162 = lean_ctor_get(x_150, 0);
+lean_inc(x_162);
+x_163 = lean_ctor_get(x_150, 2);
+lean_inc(x_163);
+x_164 = lean_ctor_get(x_150, 3);
+lean_inc(x_164);
+x_122 = x_150;
+x_123 = x_162;
+x_124 = x_163;
+x_125 = x_164;
+goto block_144;
+}
+}
+else
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+lean_dec(x_153);
+x_165 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_166 = l_Lean_Parser_ParserState_mkErrorsAt(x_150, x_165, x_149);
+x_167 = lean_ctor_get(x_166, 0);
+lean_inc(x_167);
+x_168 = lean_ctor_get(x_166, 2);
+lean_inc(x_168);
+x_169 = lean_ctor_get(x_166, 3);
+lean_inc(x_169);
+x_122 = x_166;
+x_123 = x_167;
+x_124 = x_168;
+x_125 = x_169;
+goto block_144;
+}
+}
+else
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+lean_dec(x_151);
+x_170 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_171 = l_Lean_Parser_ParserState_mkErrorsAt(x_150, x_170, x_149);
+x_172 = lean_ctor_get(x_171, 0);
+lean_inc(x_172);
+x_173 = lean_ctor_get(x_171, 2);
+lean_inc(x_173);
+x_174 = lean_ctor_get(x_171, 3);
+lean_inc(x_174);
+x_122 = x_171;
+x_123 = x_172;
+x_124 = x_173;
+x_125 = x_174;
+goto block_144;
+}
+}
+else
+{
+lean_object* x_175; lean_object* x_176; lean_object* x_177; 
+lean_dec(x_148);
+x_175 = lean_ctor_get(x_147, 0);
+lean_inc(x_175);
+x_176 = lean_ctor_get(x_147, 2);
+lean_inc(x_176);
+x_177 = lean_ctor_get(x_147, 3);
+lean_inc(x_177);
+x_122 = x_147;
+x_123 = x_175;
+x_124 = x_176;
+x_125 = x_177;
+goto block_144;
+}
+block_144:
+{
+if (lean_obj_tag(x_125) == 0)
+{
+lean_object* x_126; 
+lean_dec(x_124);
+lean_dec(x_123);
+x_126 = lean_ctor_get(x_122, 3);
 lean_inc(x_126);
 if (lean_obj_tag(x_126) == 0)
 {
-lean_dec(x_124);
-lean_dec(x_123);
-lean_dec(x_1);
-return x_125;
+lean_object* x_127; lean_object* x_128; 
+lean_dec(x_120);
+x_127 = l_Lean_nullKind;
+x_128 = l_Lean_Parser_ParserState_mkNode(x_122, x_127, x_121);
+x_79 = x_128;
+goto block_116;
 }
 else
 {
-lean_object* x_127; lean_object* x_128; uint8_t x_129; 
-x_127 = lean_ctor_get(x_126, 0);
-lean_inc(x_127);
+lean_object* x_129; uint8_t x_130; 
 lean_dec(x_126);
-x_128 = lean_ctor_get(x_125, 1);
-lean_inc(x_128);
-x_129 = lean_nat_dec_eq(x_128, x_124);
-lean_dec(x_128);
-if (x_129 == 0)
+x_129 = lean_ctor_get(x_122, 1);
+lean_inc(x_129);
+x_130 = lean_nat_dec_eq(x_129, x_120);
+lean_dec(x_129);
+if (x_130 == 0)
 {
-lean_dec(x_127);
-lean_dec(x_124);
-lean_dec(x_123);
+lean_object* x_131; lean_object* x_132; 
+lean_dec(x_120);
+x_131 = l_Lean_nullKind;
+x_132 = l_Lean_Parser_ParserState_mkNode(x_122, x_131, x_121);
+x_79 = x_132;
+goto block_116;
+}
+else
+{
+lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+x_133 = l_Lean_Parser_ParserState_restore(x_122, x_121, x_120);
+x_134 = l_Lean_nullKind;
+x_135 = l_Lean_Parser_ParserState_mkNode(x_133, x_134, x_121);
+x_79 = x_135;
+goto block_116;
+}
+}
+}
+else
+{
+lean_object* x_136; lean_object* x_137; uint8_t x_138; 
+lean_dec(x_122);
+x_136 = l_Array_shrink___main___rarg(x_123, x_121);
+lean_inc(x_120);
+x_137 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_137, 0, x_136);
+lean_ctor_set(x_137, 1, x_120);
+lean_ctor_set(x_137, 2, x_124);
+lean_ctor_set(x_137, 3, x_125);
+x_138 = lean_nat_dec_eq(x_120, x_120);
+if (x_138 == 0)
+{
+lean_object* x_139; lean_object* x_140; 
+lean_dec(x_120);
+x_139 = l_Lean_nullKind;
+x_140 = l_Lean_Parser_ParserState_mkNode(x_137, x_139, x_121);
+x_79 = x_140;
+goto block_116;
+}
+else
+{
+lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+x_141 = l_Lean_Parser_ParserState_restore(x_137, x_121, x_120);
+x_142 = l_Lean_nullKind;
+x_143 = l_Lean_Parser_ParserState_mkNode(x_141, x_142, x_121);
+x_79 = x_143;
+goto block_116;
+}
+}
+}
+}
+else
+{
+lean_object* x_178; lean_object* x_179; 
+lean_dec(x_118);
 lean_dec(x_1);
-return x_125;
+x_178 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_179 = l_Lean_Parser_ParserState_mkNode(x_117, x_178, x_7);
+return x_179;
+}
+}
 }
 else
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_171; lean_object* x_240; lean_object* x_241; 
-lean_inc(x_124);
-x_130 = l_Lean_Parser_ParserState_restore(x_125, x_123, x_124);
-lean_dec(x_123);
-x_131 = lean_ctor_get(x_130, 0);
-lean_inc(x_131);
-x_132 = lean_array_get_size(x_131);
-lean_dec(x_131);
+lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
+x_195 = lean_ctor_get(x_2, 0);
+lean_inc(x_195);
+x_196 = lean_array_get_size(x_195);
+lean_dec(x_195);
+x_197 = lean_ctor_get(x_2, 1);
+lean_inc(x_197);
 lean_inc(x_1);
-x_240 = l_Lean_Parser_tokenFn(x_1, x_130);
-x_241 = lean_ctor_get(x_240, 3);
-lean_inc(x_241);
-if (lean_obj_tag(x_241) == 0)
+x_198 = lean_apply_2(x_4, x_1, x_2);
+x_199 = lean_ctor_get(x_198, 3);
+lean_inc(x_199);
+if (lean_obj_tag(x_199) == 0)
 {
-lean_object* x_242; lean_object* x_243; 
-x_242 = lean_ctor_get(x_240, 0);
+lean_dec(x_197);
+lean_dec(x_196);
+lean_dec(x_1);
+return x_198;
+}
+else
+{
+lean_object* x_200; lean_object* x_201; uint8_t x_202; 
+x_200 = lean_ctor_get(x_199, 0);
+lean_inc(x_200);
+lean_dec(x_199);
+x_201 = lean_ctor_get(x_198, 1);
+lean_inc(x_201);
+x_202 = lean_nat_dec_eq(x_201, x_197);
+lean_dec(x_201);
+if (x_202 == 0)
+{
+lean_dec(x_200);
+lean_dec(x_197);
+lean_dec(x_196);
+lean_dec(x_1);
+return x_198;
+}
+else
+{
+lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_238; lean_object* x_283; lean_object* x_323; lean_object* x_388; lean_object* x_389; 
+lean_inc(x_197);
+x_203 = l_Lean_Parser_ParserState_restore(x_198, x_196, x_197);
+lean_dec(x_196);
+x_204 = lean_ctor_get(x_203, 0);
+lean_inc(x_204);
+x_205 = lean_array_get_size(x_204);
+lean_dec(x_204);
+lean_inc(x_1);
+x_388 = l_Lean_Parser_tokenFn(x_1, x_203);
+x_389 = lean_ctor_get(x_388, 3);
+lean_inc(x_389);
+if (lean_obj_tag(x_389) == 0)
+{
+lean_object* x_390; lean_object* x_391; 
+x_390 = lean_ctor_get(x_388, 0);
+lean_inc(x_390);
+x_391 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_390);
+lean_dec(x_390);
+if (lean_obj_tag(x_391) == 2)
+{
+lean_object* x_392; lean_object* x_393; uint8_t x_394; 
+x_392 = lean_ctor_get(x_391, 1);
+lean_inc(x_392);
+lean_dec(x_391);
+x_393 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
+x_394 = lean_string_dec_eq(x_392, x_393);
+lean_dec(x_392);
+if (x_394 == 0)
+{
+lean_object* x_395; lean_object* x_396; 
+x_395 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+lean_inc(x_197);
+x_396 = l_Lean_Parser_ParserState_mkErrorsAt(x_388, x_395, x_197);
+x_323 = x_396;
+goto block_387;
+}
+else
+{
+x_323 = x_388;
+goto block_387;
+}
+}
+else
+{
+lean_object* x_397; lean_object* x_398; 
+lean_dec(x_391);
+x_397 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+lean_inc(x_197);
+x_398 = l_Lean_Parser_ParserState_mkErrorsAt(x_388, x_397, x_197);
+x_323 = x_398;
+goto block_387;
+}
+}
+else
+{
+lean_object* x_399; lean_object* x_400; 
+lean_dec(x_389);
+x_399 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
+lean_inc(x_197);
+x_400 = l_Lean_Parser_ParserState_mkErrorsAt(x_388, x_399, x_197);
+x_323 = x_400;
+goto block_387;
+}
+block_237:
+{
+lean_object* x_207; 
+x_207 = lean_ctor_get(x_206, 3);
+lean_inc(x_207);
+if (lean_obj_tag(x_207) == 0)
+{
+lean_object* x_208; lean_object* x_209; lean_object* x_210; 
+x_208 = lean_ctor_get(x_206, 1);
+lean_inc(x_208);
+x_209 = l_Lean_Parser_tokenFn(x_1, x_206);
+x_210 = lean_ctor_get(x_209, 3);
+lean_inc(x_210);
+if (lean_obj_tag(x_210) == 0)
+{
+lean_object* x_211; lean_object* x_212; 
+x_211 = lean_ctor_get(x_209, 0);
+lean_inc(x_211);
+x_212 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_211);
+lean_dec(x_211);
+if (lean_obj_tag(x_212) == 2)
+{
+lean_object* x_213; lean_object* x_214; uint8_t x_215; 
+x_213 = lean_ctor_get(x_212, 1);
+lean_inc(x_213);
+lean_dec(x_212);
+x_214 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__7;
+x_215 = lean_string_dec_eq(x_213, x_214);
+lean_dec(x_213);
+if (x_215 == 0)
+{
+lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
+x_216 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_217 = l_Lean_Parser_ParserState_mkErrorsAt(x_209, x_216, x_208);
+x_218 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_219 = l_Lean_Parser_ParserState_mkNode(x_217, x_218, x_205);
+x_220 = l_Lean_Parser_mergeOrElseErrors(x_219, x_200, x_197);
+lean_dec(x_197);
+return x_220;
+}
+else
+{
+lean_object* x_221; lean_object* x_222; lean_object* x_223; 
+lean_dec(x_208);
+x_221 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_222 = l_Lean_Parser_ParserState_mkNode(x_209, x_221, x_205);
+x_223 = l_Lean_Parser_mergeOrElseErrors(x_222, x_200, x_197);
+lean_dec(x_197);
+return x_223;
+}
+}
+else
+{
+lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; 
+lean_dec(x_212);
+x_224 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_225 = l_Lean_Parser_ParserState_mkErrorsAt(x_209, x_224, x_208);
+x_226 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_227 = l_Lean_Parser_ParserState_mkNode(x_225, x_226, x_205);
+x_228 = l_Lean_Parser_mergeOrElseErrors(x_227, x_200, x_197);
+lean_dec(x_197);
+return x_228;
+}
+}
+else
+{
+lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 
+lean_dec(x_210);
+x_229 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
+x_230 = l_Lean_Parser_ParserState_mkErrorsAt(x_209, x_229, x_208);
+x_231 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_232 = l_Lean_Parser_ParserState_mkNode(x_230, x_231, x_205);
+x_233 = l_Lean_Parser_mergeOrElseErrors(x_232, x_200, x_197);
+lean_dec(x_197);
+return x_233;
+}
+}
+else
+{
+lean_object* x_234; lean_object* x_235; lean_object* x_236; 
+lean_dec(x_207);
+lean_dec(x_1);
+x_234 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_235 = l_Lean_Parser_ParserState_mkNode(x_206, x_234, x_205);
+x_236 = l_Lean_Parser_mergeOrElseErrors(x_235, x_200, x_197);
+lean_dec(x_197);
+return x_236;
+}
+}
+block_282:
+{
+lean_object* x_239; 
+x_239 = lean_ctor_get(x_238, 3);
+lean_inc(x_239);
+if (lean_obj_tag(x_239) == 0)
+{
+lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_266; lean_object* x_267; 
+x_240 = lean_ctor_get(x_238, 0);
+lean_inc(x_240);
+x_241 = lean_array_get_size(x_240);
+lean_dec(x_240);
+x_242 = lean_ctor_get(x_238, 1);
 lean_inc(x_242);
-x_243 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_242);
-lean_dec(x_242);
-if (lean_obj_tag(x_243) == 2)
+lean_inc(x_1);
+x_266 = l_Lean_Parser_tokenFn(x_1, x_238);
+x_267 = lean_ctor_get(x_266, 3);
+lean_inc(x_267);
+if (lean_obj_tag(x_267) == 0)
 {
-lean_object* x_244; lean_object* x_245; uint8_t x_246; 
-x_244 = lean_ctor_get(x_243, 1);
+lean_object* x_268; lean_object* x_269; 
+x_268 = lean_ctor_get(x_266, 0);
+lean_inc(x_268);
+x_269 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_268);
+lean_dec(x_268);
+if (lean_obj_tag(x_269) == 2)
+{
+lean_object* x_270; lean_object* x_271; uint8_t x_272; 
+x_270 = lean_ctor_get(x_269, 1);
+lean_inc(x_270);
+lean_dec(x_269);
+x_271 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__5;
+x_272 = lean_string_dec_eq(x_270, x_271);
+lean_dec(x_270);
+if (x_272 == 0)
+{
+lean_object* x_273; lean_object* x_274; 
+x_273 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_242);
+x_274 = l_Lean_Parser_ParserState_mkErrorsAt(x_266, x_273, x_242);
+x_243 = x_274;
+goto block_265;
+}
+else
+{
+x_243 = x_266;
+goto block_265;
+}
+}
+else
+{
+lean_object* x_275; lean_object* x_276; 
+lean_dec(x_269);
+x_275 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_242);
+x_276 = l_Lean_Parser_ParserState_mkErrorsAt(x_266, x_275, x_242);
+x_243 = x_276;
+goto block_265;
+}
+}
+else
+{
+lean_object* x_277; lean_object* x_278; 
+lean_dec(x_267);
+x_277 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__8;
+lean_inc(x_242);
+x_278 = l_Lean_Parser_ParserState_mkErrorsAt(x_266, x_277, x_242);
+x_243 = x_278;
+goto block_265;
+}
+block_265:
+{
+lean_object* x_244; 
+x_244 = lean_ctor_get(x_243, 3);
 lean_inc(x_244);
-lean_dec(x_243);
-x_245 = l_Lean_Parser_Term_structInst___elambda__1___closed__5;
-x_246 = lean_string_dec_eq(x_244, x_245);
-lean_dec(x_244);
-if (x_246 == 0)
+if (lean_obj_tag(x_244) == 0)
 {
-lean_object* x_247; lean_object* x_248; 
-x_247 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-lean_inc(x_124);
-x_248 = l_Lean_Parser_ParserState_mkErrorsAt(x_240, x_247, x_124);
-x_171 = x_248;
-goto block_239;
-}
-else
-{
-x_171 = x_240;
-goto block_239;
-}
-}
-else
+lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; 
+x_245 = l_Lean_Parser_termParser___closed__2;
+x_246 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_247 = l_Lean_Parser_categoryParser___elambda__1(x_245, x_246, x_1, x_243);
+x_248 = lean_ctor_get(x_247, 3);
+lean_inc(x_248);
+if (lean_obj_tag(x_248) == 0)
 {
 lean_object* x_249; lean_object* x_250; 
-lean_dec(x_243);
-x_249 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-lean_inc(x_124);
-x_250 = l_Lean_Parser_ParserState_mkErrorsAt(x_240, x_249, x_124);
-x_171 = x_250;
-goto block_239;
+lean_dec(x_242);
+x_249 = l_Lean_nullKind;
+x_250 = l_Lean_Parser_ParserState_mkNode(x_247, x_249, x_241);
+x_206 = x_250;
+goto block_237;
+}
+else
+{
+lean_object* x_251; uint8_t x_252; 
+lean_dec(x_248);
+x_251 = lean_ctor_get(x_247, 1);
+lean_inc(x_251);
+x_252 = lean_nat_dec_eq(x_251, x_242);
+lean_dec(x_251);
+if (x_252 == 0)
+{
+lean_object* x_253; lean_object* x_254; 
+lean_dec(x_242);
+x_253 = l_Lean_nullKind;
+x_254 = l_Lean_Parser_ParserState_mkNode(x_247, x_253, x_241);
+x_206 = x_254;
+goto block_237;
+}
+else
+{
+lean_object* x_255; lean_object* x_256; lean_object* x_257; 
+x_255 = l_Lean_Parser_ParserState_restore(x_247, x_241, x_242);
+x_256 = l_Lean_nullKind;
+x_257 = l_Lean_Parser_ParserState_mkNode(x_255, x_256, x_241);
+x_206 = x_257;
+goto block_237;
+}
 }
 }
 else
 {
-lean_object* x_251; lean_object* x_252; 
-lean_dec(x_241);
-x_251 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
-lean_inc(x_124);
-x_252 = l_Lean_Parser_ParserState_mkErrorsAt(x_240, x_251, x_124);
-x_171 = x_252;
-goto block_239;
-}
-block_170:
+lean_object* x_258; uint8_t x_259; 
+lean_dec(x_244);
+x_258 = lean_ctor_get(x_243, 1);
+lean_inc(x_258);
+x_259 = lean_nat_dec_eq(x_258, x_242);
+lean_dec(x_258);
+if (x_259 == 0)
 {
-lean_object* x_134; 
-x_134 = lean_ctor_get(x_133, 3);
-lean_inc(x_134);
-if (lean_obj_tag(x_134) == 0)
-{
-uint8_t x_135; lean_object* x_136; lean_object* x_137; 
-x_135 = 1;
-lean_inc(x_1);
-x_136 = l_Lean_Parser_sepByFn___at_Lean_Parser_Term_structInst___elambda__1___spec__1(x_135, x_1, x_133);
-x_137 = lean_ctor_get(x_136, 3);
-lean_inc(x_137);
-if (lean_obj_tag(x_137) == 0)
-{
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_136, 1);
-lean_inc(x_138);
-x_139 = l_Lean_Parser_tokenFn(x_1, x_136);
-x_140 = lean_ctor_get(x_139, 3);
-lean_inc(x_140);
-if (lean_obj_tag(x_140) == 0)
-{
-lean_object* x_141; lean_object* x_142; 
-x_141 = lean_ctor_get(x_139, 0);
-lean_inc(x_141);
-x_142 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_141);
-lean_dec(x_141);
-if (lean_obj_tag(x_142) == 2)
-{
-lean_object* x_143; lean_object* x_144; uint8_t x_145; 
-x_143 = lean_ctor_get(x_142, 1);
-lean_inc(x_143);
-lean_dec(x_142);
-x_144 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__7;
-x_145 = lean_string_dec_eq(x_143, x_144);
-lean_dec(x_143);
-if (x_145 == 0)
-{
-lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
-x_146 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_147 = l_Lean_Parser_ParserState_mkErrorsAt(x_139, x_146, x_138);
-x_148 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_149 = l_Lean_Parser_ParserState_mkNode(x_147, x_148, x_132);
-x_150 = l_Lean_Parser_mergeOrElseErrors(x_149, x_127, x_124);
-lean_dec(x_124);
-return x_150;
+lean_object* x_260; lean_object* x_261; 
+lean_dec(x_242);
+x_260 = l_Lean_nullKind;
+x_261 = l_Lean_Parser_ParserState_mkNode(x_243, x_260, x_241);
+x_206 = x_261;
+goto block_237;
 }
 else
 {
-lean_object* x_151; lean_object* x_152; lean_object* x_153; 
-lean_dec(x_138);
-x_151 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_152 = l_Lean_Parser_ParserState_mkNode(x_139, x_151, x_132);
-x_153 = l_Lean_Parser_mergeOrElseErrors(x_152, x_127, x_124);
-lean_dec(x_124);
-return x_153;
+lean_object* x_262; lean_object* x_263; lean_object* x_264; 
+x_262 = l_Lean_Parser_ParserState_restore(x_243, x_241, x_242);
+x_263 = l_Lean_nullKind;
+x_264 = l_Lean_Parser_ParserState_mkNode(x_262, x_263, x_241);
+x_206 = x_264;
+goto block_237;
+}
+}
 }
 }
 else
 {
-lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-lean_dec(x_142);
-x_154 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_155 = l_Lean_Parser_ParserState_mkErrorsAt(x_139, x_154, x_138);
-x_156 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_157 = l_Lean_Parser_ParserState_mkNode(x_155, x_156, x_132);
-x_158 = l_Lean_Parser_mergeOrElseErrors(x_157, x_127, x_124);
-lean_dec(x_124);
-return x_158;
-}
-}
-else
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; 
-lean_dec(x_140);
-x_159 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
-x_160 = l_Lean_Parser_ParserState_mkErrorsAt(x_139, x_159, x_138);
-x_161 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_162 = l_Lean_Parser_ParserState_mkNode(x_160, x_161, x_132);
-x_163 = l_Lean_Parser_mergeOrElseErrors(x_162, x_127, x_124);
-lean_dec(x_124);
-return x_163;
-}
-}
-else
-{
-lean_object* x_164; lean_object* x_165; lean_object* x_166; 
-lean_dec(x_137);
+lean_object* x_279; lean_object* x_280; lean_object* x_281; 
+lean_dec(x_239);
 lean_dec(x_1);
-x_164 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_165 = l_Lean_Parser_ParserState_mkNode(x_136, x_164, x_132);
-x_166 = l_Lean_Parser_mergeOrElseErrors(x_165, x_127, x_124);
-lean_dec(x_124);
-return x_166;
+x_279 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_280 = l_Lean_Parser_ParserState_mkNode(x_238, x_279, x_205);
+x_281 = l_Lean_Parser_mergeOrElseErrors(x_280, x_200, x_197);
+lean_dec(x_197);
+return x_281;
 }
 }
-else
+block_322:
 {
-lean_object* x_167; lean_object* x_168; lean_object* x_169; 
-lean_dec(x_134);
-lean_dec(x_1);
-x_167 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_168 = l_Lean_Parser_ParserState_mkNode(x_133, x_167, x_132);
-x_169 = l_Lean_Parser_mergeOrElseErrors(x_168, x_127, x_124);
-lean_dec(x_124);
-return x_169;
-}
-}
-block_239:
+lean_object* x_284; 
+x_284 = lean_ctor_get(x_283, 3);
+lean_inc(x_284);
+if (lean_obj_tag(x_284) == 0)
 {
-lean_object* x_172; 
-x_172 = lean_ctor_get(x_171, 3);
-lean_inc(x_172);
-if (lean_obj_tag(x_172) == 0)
-{
-lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_199; lean_object* x_200; 
-x_173 = lean_ctor_get(x_171, 0);
-lean_inc(x_173);
-x_174 = lean_ctor_get(x_171, 1);
-lean_inc(x_174);
-x_175 = lean_array_get_size(x_173);
-lean_dec(x_173);
+uint8_t x_285; lean_object* x_286; lean_object* x_287; 
+x_285 = 1;
 lean_inc(x_1);
-x_199 = l_Lean_Parser_ident___elambda__1(x_1, x_171);
-x_200 = lean_ctor_get(x_199, 3);
-lean_inc(x_200);
-if (lean_obj_tag(x_200) == 0)
+x_286 = l_Lean_Parser_sepByFn___at_Lean_Parser_Term_structInst___elambda__1___spec__1(x_285, x_1, x_283);
+x_287 = lean_ctor_get(x_286, 3);
+lean_inc(x_287);
+if (lean_obj_tag(x_287) == 0)
 {
-lean_object* x_201; lean_object* x_202; lean_object* x_203; 
-x_201 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
-x_202 = l_Lean_Parser_checkWsBeforeFn(x_201, x_1, x_199);
-x_203 = lean_ctor_get(x_202, 3);
-lean_inc(x_203);
-if (lean_obj_tag(x_203) == 0)
-{
-lean_object* x_204; lean_object* x_205; lean_object* x_206; 
-x_204 = lean_ctor_get(x_202, 1);
-lean_inc(x_204);
+lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_303; lean_object* x_304; 
+x_288 = lean_ctor_get(x_286, 0);
+lean_inc(x_288);
+x_289 = lean_array_get_size(x_288);
+lean_dec(x_288);
+x_290 = lean_ctor_get(x_286, 1);
+lean_inc(x_290);
 lean_inc(x_1);
-x_205 = l_Lean_Parser_tokenFn(x_1, x_202);
-x_206 = lean_ctor_get(x_205, 3);
-lean_inc(x_206);
-if (lean_obj_tag(x_206) == 0)
+x_303 = l_Lean_Parser_tokenFn(x_1, x_286);
+x_304 = lean_ctor_get(x_303, 3);
+lean_inc(x_304);
+if (lean_obj_tag(x_304) == 0)
 {
-lean_object* x_207; lean_object* x_208; 
-x_207 = lean_ctor_get(x_205, 0);
-lean_inc(x_207);
-x_208 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_207);
-lean_dec(x_207);
-if (lean_obj_tag(x_208) == 2)
+lean_object* x_305; lean_object* x_306; 
+x_305 = lean_ctor_get(x_303, 0);
+lean_inc(x_305);
+x_306 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_305);
+lean_dec(x_305);
+if (lean_obj_tag(x_306) == 2)
 {
-lean_object* x_209; lean_object* x_210; uint8_t x_211; 
-x_209 = lean_ctor_get(x_208, 1);
-lean_inc(x_209);
-lean_dec(x_208);
-x_210 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
-x_211 = lean_string_dec_eq(x_209, x_210);
-lean_dec(x_209);
-if (x_211 == 0)
+lean_object* x_307; lean_object* x_308; uint8_t x_309; 
+x_307 = lean_ctor_get(x_306, 1);
+lean_inc(x_307);
+lean_dec(x_306);
+x_308 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
+x_309 = lean_string_dec_eq(x_307, x_308);
+lean_dec(x_307);
+if (x_309 == 0)
 {
-lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; 
-x_212 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_213 = l_Lean_Parser_ParserState_mkErrorsAt(x_205, x_212, x_204);
-x_214 = lean_ctor_get(x_213, 0);
-lean_inc(x_214);
-x_215 = lean_ctor_get(x_213, 2);
-lean_inc(x_215);
-x_216 = lean_ctor_get(x_213, 3);
-lean_inc(x_216);
-x_176 = x_213;
-x_177 = x_214;
-x_178 = x_215;
-x_179 = x_216;
-goto block_198;
+lean_object* x_310; lean_object* x_311; 
+x_310 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_290);
+x_311 = l_Lean_Parser_ParserState_mkErrorsAt(x_303, x_310, x_290);
+x_291 = x_311;
+goto block_302;
 }
 else
 {
-lean_object* x_217; lean_object* x_218; lean_object* x_219; 
-lean_dec(x_204);
-x_217 = lean_ctor_get(x_205, 0);
-lean_inc(x_217);
-x_218 = lean_ctor_get(x_205, 2);
-lean_inc(x_218);
-x_219 = lean_ctor_get(x_205, 3);
-lean_inc(x_219);
-x_176 = x_205;
-x_177 = x_217;
-x_178 = x_218;
-x_179 = x_219;
-goto block_198;
+x_291 = x_303;
+goto block_302;
 }
 }
 else
 {
-lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; 
-lean_dec(x_208);
-x_220 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_221 = l_Lean_Parser_ParserState_mkErrorsAt(x_205, x_220, x_204);
-x_222 = lean_ctor_get(x_221, 0);
-lean_inc(x_222);
-x_223 = lean_ctor_get(x_221, 2);
-lean_inc(x_223);
-x_224 = lean_ctor_get(x_221, 3);
-lean_inc(x_224);
-x_176 = x_221;
-x_177 = x_222;
-x_178 = x_223;
-x_179 = x_224;
-goto block_198;
+lean_object* x_312; lean_object* x_313; 
+lean_dec(x_306);
+x_312 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_290);
+x_313 = l_Lean_Parser_ParserState_mkErrorsAt(x_303, x_312, x_290);
+x_291 = x_313;
+goto block_302;
 }
 }
 else
 {
-lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; 
-lean_dec(x_206);
-x_225 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
-x_226 = l_Lean_Parser_ParserState_mkErrorsAt(x_205, x_225, x_204);
-x_227 = lean_ctor_get(x_226, 0);
-lean_inc(x_227);
-x_228 = lean_ctor_get(x_226, 2);
-lean_inc(x_228);
-x_229 = lean_ctor_get(x_226, 3);
-lean_inc(x_229);
-x_176 = x_226;
-x_177 = x_227;
-x_178 = x_228;
-x_179 = x_229;
-goto block_198;
+lean_object* x_314; lean_object* x_315; 
+lean_dec(x_304);
+x_314 = l_Lean_Parser_Term_structInst___elambda__1___closed__11;
+lean_inc(x_290);
+x_315 = l_Lean_Parser_ParserState_mkErrorsAt(x_303, x_314, x_290);
+x_291 = x_315;
+goto block_302;
 }
+block_302:
+{
+lean_object* x_292; 
+x_292 = lean_ctor_get(x_291, 3);
+lean_inc(x_292);
+if (lean_obj_tag(x_292) == 0)
+{
+lean_object* x_293; lean_object* x_294; 
+lean_dec(x_290);
+x_293 = l_Lean_nullKind;
+x_294 = l_Lean_Parser_ParserState_mkNode(x_291, x_293, x_289);
+x_238 = x_294;
+goto block_282;
 }
 else
 {
-lean_object* x_230; lean_object* x_231; lean_object* x_232; 
-lean_dec(x_203);
-x_230 = lean_ctor_get(x_202, 0);
-lean_inc(x_230);
-x_231 = lean_ctor_get(x_202, 2);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_202, 3);
-lean_inc(x_232);
-x_176 = x_202;
-x_177 = x_230;
-x_178 = x_231;
-x_179 = x_232;
-goto block_198;
-}
+lean_object* x_295; uint8_t x_296; 
+lean_dec(x_292);
+x_295 = lean_ctor_get(x_291, 1);
+lean_inc(x_295);
+x_296 = lean_nat_dec_eq(x_295, x_290);
+lean_dec(x_295);
+if (x_296 == 0)
+{
+lean_object* x_297; lean_object* x_298; 
+lean_dec(x_290);
+x_297 = l_Lean_nullKind;
+x_298 = l_Lean_Parser_ParserState_mkNode(x_291, x_297, x_289);
+x_238 = x_298;
+goto block_282;
 }
 else
 {
-lean_object* x_233; lean_object* x_234; lean_object* x_235; 
-lean_dec(x_200);
-x_233 = lean_ctor_get(x_199, 0);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_199, 2);
-lean_inc(x_234);
-x_235 = lean_ctor_get(x_199, 3);
-lean_inc(x_235);
-x_176 = x_199;
-x_177 = x_233;
-x_178 = x_234;
-x_179 = x_235;
-goto block_198;
-}
-block_198:
-{
-if (lean_obj_tag(x_179) == 0)
-{
-lean_object* x_180; 
-lean_dec(x_178);
-lean_dec(x_177);
-x_180 = lean_ctor_get(x_176, 3);
-lean_inc(x_180);
-if (lean_obj_tag(x_180) == 0)
-{
-lean_object* x_181; lean_object* x_182; 
-lean_dec(x_174);
-x_181 = l_Lean_nullKind;
-x_182 = l_Lean_Parser_ParserState_mkNode(x_176, x_181, x_175);
-x_133 = x_182;
-goto block_170;
-}
-else
-{
-lean_object* x_183; uint8_t x_184; 
-lean_dec(x_180);
-x_183 = lean_ctor_get(x_176, 1);
-lean_inc(x_183);
-x_184 = lean_nat_dec_eq(x_183, x_174);
-lean_dec(x_183);
-if (x_184 == 0)
-{
-lean_object* x_185; lean_object* x_186; 
-lean_dec(x_174);
-x_185 = l_Lean_nullKind;
-x_186 = l_Lean_Parser_ParserState_mkNode(x_176, x_185, x_175);
-x_133 = x_186;
-goto block_170;
-}
-else
-{
-lean_object* x_187; lean_object* x_188; lean_object* x_189; 
-x_187 = l_Lean_Parser_ParserState_restore(x_176, x_175, x_174);
-x_188 = l_Lean_nullKind;
-x_189 = l_Lean_Parser_ParserState_mkNode(x_187, x_188, x_175);
-x_133 = x_189;
-goto block_170;
-}
-}
-}
-else
-{
-lean_object* x_190; lean_object* x_191; uint8_t x_192; 
-lean_dec(x_176);
-x_190 = l_Array_shrink___main___rarg(x_177, x_175);
-lean_inc(x_174);
-x_191 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_191, 0, x_190);
-lean_ctor_set(x_191, 1, x_174);
-lean_ctor_set(x_191, 2, x_178);
-lean_ctor_set(x_191, 3, x_179);
-x_192 = lean_nat_dec_eq(x_174, x_174);
-if (x_192 == 0)
-{
-lean_object* x_193; lean_object* x_194; 
-lean_dec(x_174);
-x_193 = l_Lean_nullKind;
-x_194 = l_Lean_Parser_ParserState_mkNode(x_191, x_193, x_175);
-x_133 = x_194;
-goto block_170;
-}
-else
-{
-lean_object* x_195; lean_object* x_196; lean_object* x_197; 
-x_195 = l_Lean_Parser_ParserState_restore(x_191, x_175, x_174);
-x_196 = l_Lean_nullKind;
-x_197 = l_Lean_Parser_ParserState_mkNode(x_195, x_196, x_175);
-x_133 = x_197;
-goto block_170;
+lean_object* x_299; lean_object* x_300; lean_object* x_301; 
+x_299 = l_Lean_Parser_ParserState_restore(x_291, x_289, x_290);
+x_300 = l_Lean_nullKind;
+x_301 = l_Lean_Parser_ParserState_mkNode(x_299, x_300, x_289);
+x_238 = x_301;
+goto block_282;
 }
 }
 }
 }
 else
 {
-lean_object* x_236; lean_object* x_237; lean_object* x_238; 
-lean_dec(x_172);
+lean_object* x_316; lean_object* x_317; lean_object* x_318; 
+lean_dec(x_287);
 lean_dec(x_1);
-x_236 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
-x_237 = l_Lean_Parser_ParserState_mkNode(x_171, x_236, x_132);
-x_238 = l_Lean_Parser_mergeOrElseErrors(x_237, x_127, x_124);
-lean_dec(x_124);
-return x_238;
+x_316 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_317 = l_Lean_Parser_ParserState_mkNode(x_286, x_316, x_205);
+x_318 = l_Lean_Parser_mergeOrElseErrors(x_317, x_200, x_197);
+lean_dec(x_197);
+return x_318;
+}
+}
+else
+{
+lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+lean_dec(x_284);
+lean_dec(x_1);
+x_319 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_320 = l_Lean_Parser_ParserState_mkNode(x_283, x_319, x_205);
+x_321 = l_Lean_Parser_mergeOrElseErrors(x_320, x_200, x_197);
+lean_dec(x_197);
+return x_321;
+}
+}
+block_387:
+{
+lean_object* x_324; 
+x_324 = lean_ctor_get(x_323, 3);
+lean_inc(x_324);
+if (lean_obj_tag(x_324) == 0)
+{
+lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; 
+x_325 = lean_ctor_get(x_323, 0);
+lean_inc(x_325);
+x_326 = lean_ctor_get(x_323, 1);
+lean_inc(x_326);
+x_327 = lean_array_get_size(x_325);
+lean_dec(x_325);
+x_351 = l_Lean_Parser_termParser___closed__2;
+x_352 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_353 = l_Lean_Parser_categoryParser___elambda__1(x_351, x_352, x_1, x_323);
+x_354 = lean_ctor_get(x_353, 3);
+lean_inc(x_354);
+if (lean_obj_tag(x_354) == 0)
+{
+lean_object* x_355; lean_object* x_356; lean_object* x_357; 
+x_355 = lean_ctor_get(x_353, 1);
+lean_inc(x_355);
+lean_inc(x_1);
+x_356 = l_Lean_Parser_tokenFn(x_1, x_353);
+x_357 = lean_ctor_get(x_356, 3);
+lean_inc(x_357);
+if (lean_obj_tag(x_357) == 0)
+{
+lean_object* x_358; lean_object* x_359; 
+x_358 = lean_ctor_get(x_356, 0);
+lean_inc(x_358);
+x_359 = l_Array_back___at_Lean_Parser_checkStackTopFn___spec__1(x_358);
+lean_dec(x_358);
+if (lean_obj_tag(x_359) == 2)
+{
+lean_object* x_360; lean_object* x_361; uint8_t x_362; 
+x_360 = lean_ctor_get(x_359, 1);
+lean_inc(x_360);
+lean_dec(x_359);
+x_361 = l_Lean_Parser_Term_structInst___elambda__1___closed__7;
+x_362 = lean_string_dec_eq(x_360, x_361);
+lean_dec(x_360);
+if (x_362 == 0)
+{
+lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; 
+x_363 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_364 = l_Lean_Parser_ParserState_mkErrorsAt(x_356, x_363, x_355);
+x_365 = lean_ctor_get(x_364, 0);
+lean_inc(x_365);
+x_366 = lean_ctor_get(x_364, 2);
+lean_inc(x_366);
+x_367 = lean_ctor_get(x_364, 3);
+lean_inc(x_367);
+x_328 = x_364;
+x_329 = x_365;
+x_330 = x_366;
+x_331 = x_367;
+goto block_350;
+}
+else
+{
+lean_object* x_368; lean_object* x_369; lean_object* x_370; 
+lean_dec(x_355);
+x_368 = lean_ctor_get(x_356, 0);
+lean_inc(x_368);
+x_369 = lean_ctor_get(x_356, 2);
+lean_inc(x_369);
+x_370 = lean_ctor_get(x_356, 3);
+lean_inc(x_370);
+x_328 = x_356;
+x_329 = x_368;
+x_330 = x_369;
+x_331 = x_370;
+goto block_350;
+}
+}
+else
+{
+lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; 
+lean_dec(x_359);
+x_371 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_372 = l_Lean_Parser_ParserState_mkErrorsAt(x_356, x_371, x_355);
+x_373 = lean_ctor_get(x_372, 0);
+lean_inc(x_373);
+x_374 = lean_ctor_get(x_372, 2);
+lean_inc(x_374);
+x_375 = lean_ctor_get(x_372, 3);
+lean_inc(x_375);
+x_328 = x_372;
+x_329 = x_373;
+x_330 = x_374;
+x_331 = x_375;
+goto block_350;
+}
+}
+else
+{
+lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; 
+lean_dec(x_357);
+x_376 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_377 = l_Lean_Parser_ParserState_mkErrorsAt(x_356, x_376, x_355);
+x_378 = lean_ctor_get(x_377, 0);
+lean_inc(x_378);
+x_379 = lean_ctor_get(x_377, 2);
+lean_inc(x_379);
+x_380 = lean_ctor_get(x_377, 3);
+lean_inc(x_380);
+x_328 = x_377;
+x_329 = x_378;
+x_330 = x_379;
+x_331 = x_380;
+goto block_350;
+}
+}
+else
+{
+lean_object* x_381; lean_object* x_382; lean_object* x_383; 
+lean_dec(x_354);
+x_381 = lean_ctor_get(x_353, 0);
+lean_inc(x_381);
+x_382 = lean_ctor_get(x_353, 2);
+lean_inc(x_382);
+x_383 = lean_ctor_get(x_353, 3);
+lean_inc(x_383);
+x_328 = x_353;
+x_329 = x_381;
+x_330 = x_382;
+x_331 = x_383;
+goto block_350;
+}
+block_350:
+{
+if (lean_obj_tag(x_331) == 0)
+{
+lean_object* x_332; 
+lean_dec(x_330);
+lean_dec(x_329);
+x_332 = lean_ctor_get(x_328, 3);
+lean_inc(x_332);
+if (lean_obj_tag(x_332) == 0)
+{
+lean_object* x_333; lean_object* x_334; 
+lean_dec(x_326);
+x_333 = l_Lean_nullKind;
+x_334 = l_Lean_Parser_ParserState_mkNode(x_328, x_333, x_327);
+x_283 = x_334;
+goto block_322;
+}
+else
+{
+lean_object* x_335; uint8_t x_336; 
+lean_dec(x_332);
+x_335 = lean_ctor_get(x_328, 1);
+lean_inc(x_335);
+x_336 = lean_nat_dec_eq(x_335, x_326);
+lean_dec(x_335);
+if (x_336 == 0)
+{
+lean_object* x_337; lean_object* x_338; 
+lean_dec(x_326);
+x_337 = l_Lean_nullKind;
+x_338 = l_Lean_Parser_ParserState_mkNode(x_328, x_337, x_327);
+x_283 = x_338;
+goto block_322;
+}
+else
+{
+lean_object* x_339; lean_object* x_340; lean_object* x_341; 
+x_339 = l_Lean_Parser_ParserState_restore(x_328, x_327, x_326);
+x_340 = l_Lean_nullKind;
+x_341 = l_Lean_Parser_ParserState_mkNode(x_339, x_340, x_327);
+x_283 = x_341;
+goto block_322;
+}
+}
+}
+else
+{
+lean_object* x_342; lean_object* x_343; uint8_t x_344; 
+lean_dec(x_328);
+x_342 = l_Array_shrink___main___rarg(x_329, x_327);
+lean_inc(x_326);
+x_343 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_343, 0, x_342);
+lean_ctor_set(x_343, 1, x_326);
+lean_ctor_set(x_343, 2, x_330);
+lean_ctor_set(x_343, 3, x_331);
+x_344 = lean_nat_dec_eq(x_326, x_326);
+if (x_344 == 0)
+{
+lean_object* x_345; lean_object* x_346; 
+lean_dec(x_326);
+x_345 = l_Lean_nullKind;
+x_346 = l_Lean_Parser_ParserState_mkNode(x_343, x_345, x_327);
+x_283 = x_346;
+goto block_322;
+}
+else
+{
+lean_object* x_347; lean_object* x_348; lean_object* x_349; 
+x_347 = l_Lean_Parser_ParserState_restore(x_343, x_327, x_326);
+x_348 = l_Lean_nullKind;
+x_349 = l_Lean_Parser_ParserState_mkNode(x_347, x_348, x_327);
+x_283 = x_349;
+goto block_322;
+}
+}
+}
+}
+else
+{
+lean_object* x_384; lean_object* x_385; lean_object* x_386; 
+lean_dec(x_324);
+lean_dec(x_1);
+x_384 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_385 = l_Lean_Parser_ParserState_mkNode(x_323, x_384, x_205);
+x_386 = l_Lean_Parser_mergeOrElseErrors(x_385, x_200, x_197);
+lean_dec(x_197);
+return x_386;
 }
 }
 }
@@ -18285,84 +18304,82 @@ return x_3;
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_epsilonInfo;
-x_2 = l_Lean_Parser_Term_structInst___closed__2;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___closed__2;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_Term_structInst___closed__2;
+x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
+return x_4;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_ident;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_structInst___closed__3;
-x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
-return x_4;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_structInst___closed__3;
+x_2 = l_Lean_Parser_optionaInfo(x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__5() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_structInst___closed__4;
-x_2 = l_Lean_Parser_optionaInfo(x_1);
-return x_2;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Parser_Term_structInstField;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_Term_explicitUniv___closed__2;
+x_4 = l_Lean_Parser_sepByInfo(x_2, x_3);
+return x_4;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__6() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_Parser_Term_structInstField;
-x_2 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_structInstSource;
-x_4 = lean_ctor_get(x_3, 0);
-lean_inc(x_4);
-x_5 = l_Lean_Parser_orelseInfo(x_2, x_4);
-return x_5;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Parser_Term_structInst___elambda__1___closed__8;
+x_3 = l_Lean_Parser_symbolInfo(x_2, x_1);
+return x_3;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__7() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Parser_Term_structInst___closed__6;
-x_2 = l_Lean_Parser_Term_explicitUniv___closed__2;
-x_3 = l_Lean_Parser_sepByInfo(x_1, x_2);
-return x_3;
+x_2 = l_Lean_Parser_optionaInfo(x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__8() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInst___closed__7;
-x_2 = l_Lean_Parser_Term_explicitUniv___closed__4;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l___private_Init_Lean_Parser_Parser_11__antiquotNestedExpr___closed__2;
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = l_Lean_Parser_Term_typeAscription___closed__1;
+x_4 = l_Lean_Parser_andthenInfo(x_3, x_2);
+return x_4;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__9() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInst___closed__5;
-x_2 = l_Lean_Parser_Term_structInst___closed__8;
-x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Term_structInst___closed__8;
+x_2 = l_Lean_Parser_optionaInfo(x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInst___closed__1;
-x_2 = l_Lean_Parser_Term_structInst___closed__9;
+x_1 = l_Lean_Parser_Term_structInst___closed__9;
+x_2 = l_Lean_Parser_Term_explicitUniv___closed__4;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
@@ -18371,25 +18388,65 @@ lean_object* _init_l_Lean_Parser_Term_structInst___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_1 = l_Lean_Parser_Term_structInst___closed__7;
 x_2 = l_Lean_Parser_Term_structInst___closed__10;
-x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
 }
 lean_object* _init_l_Lean_Parser_Term_structInst___closed__12() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_structInst___closed__5;
+x_2 = l_Lean_Parser_Term_structInst___closed__11;
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__13() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_structInst___closed__4;
+x_2 = l_Lean_Parser_Term_structInst___closed__12;
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__14() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_structInst___closed__1;
+x_2 = l_Lean_Parser_Term_structInst___closed__13;
+x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__15() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Term_structInst___elambda__1___closed__2;
+x_2 = l_Lean_Parser_Term_structInst___closed__14;
+x_3 = l_Lean_Parser_nodeInfo(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__16() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Term_structInst___elambda__1___closed__4;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l_Lean_Parser_Term_structInst___closed__11;
+x_3 = l_Lean_Parser_Term_structInst___closed__15;
 x_4 = l_Lean_Parser_orelseInfo(x_2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Parser_Term_structInst___closed__13() {
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__17() {
 _start:
 {
 lean_object* x_1; 
@@ -18397,12 +18454,12 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Parser_Term_structInst___elambda__1), 2,
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Parser_Term_structInst___closed__14() {
+lean_object* _init_l_Lean_Parser_Term_structInst___closed__18() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_structInst___closed__12;
-x_2 = l_Lean_Parser_Term_structInst___closed__13;
+x_1 = l_Lean_Parser_Term_structInst___closed__16;
+x_2 = l_Lean_Parser_Term_structInst___closed__17;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -18413,7 +18470,7 @@ lean_object* _init_l_Lean_Parser_Term_structInst() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Term_structInst___closed__14;
+x_1 = l_Lean_Parser_Term_structInst___closed__18;
 return x_1;
 }
 }
@@ -18998,7 +19055,7 @@ lean_dec(x_73);
 if (x_75 == 0)
 {
 lean_object* x_76; lean_object* x_77; 
-x_76 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_76 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_77 = l_Lean_Parser_ParserState_mkErrorsAt(x_69, x_76, x_68);
 x_41 = x_77;
 goto block_67;
@@ -19014,7 +19071,7 @@ else
 {
 lean_object* x_78; lean_object* x_79; 
 lean_dec(x_72);
-x_78 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_78 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_79 = l_Lean_Parser_ParserState_mkErrorsAt(x_69, x_78, x_68);
 x_41 = x_79;
 goto block_67;
@@ -19024,7 +19081,7 @@ else
 {
 lean_object* x_80; lean_object* x_81; 
 lean_dec(x_70);
-x_80 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_80 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_81 = l_Lean_Parser_ParserState_mkErrorsAt(x_69, x_80, x_68);
 x_41 = x_81;
 goto block_67;
@@ -19308,7 +19365,7 @@ lean_dec(x_166);
 if (x_168 == 0)
 {
 lean_object* x_169; lean_object* x_170; 
-x_169 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_169 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_84);
 x_170 = l_Lean_Parser_ParserState_mkErrorsAt(x_162, x_169, x_84);
 x_132 = x_170;
@@ -19324,7 +19381,7 @@ else
 {
 lean_object* x_171; lean_object* x_172; 
 lean_dec(x_165);
-x_171 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_171 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_84);
 x_172 = l_Lean_Parser_ParserState_mkErrorsAt(x_162, x_171, x_84);
 x_132 = x_172;
@@ -19335,7 +19392,7 @@ else
 {
 lean_object* x_173; lean_object* x_174; 
 lean_dec(x_163);
-x_173 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_173 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_84);
 x_174 = l_Lean_Parser_ParserState_mkErrorsAt(x_162, x_173, x_84);
 x_132 = x_174;
@@ -38084,7 +38141,7 @@ lean_dec(x_45);
 if (x_47 == 0)
 {
 lean_object* x_48; lean_object* x_49; 
-x_48 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_48 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_49 = l_Lean_Parser_ParserState_mkErrorsAt(x_41, x_48, x_40);
 x_8 = x_49;
 goto block_39;
@@ -38100,7 +38157,7 @@ else
 {
 lean_object* x_50; lean_object* x_51; 
 lean_dec(x_44);
-x_50 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_50 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_51 = l_Lean_Parser_ParserState_mkErrorsAt(x_41, x_50, x_40);
 x_8 = x_51;
 goto block_39;
@@ -38110,7 +38167,7 @@ else
 {
 lean_object* x_52; lean_object* x_53; 
 lean_dec(x_42);
-x_52 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_52 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 x_53 = l_Lean_Parser_ParserState_mkErrorsAt(x_41, x_52, x_40);
 x_8 = x_53;
 goto block_39;
@@ -38284,7 +38341,7 @@ lean_dec(x_107);
 if (x_109 == 0)
 {
 lean_object* x_110; lean_object* x_111; 
-x_110 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_110 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_56);
 x_111 = l_Lean_Parser_ParserState_mkErrorsAt(x_103, x_110, x_56);
 x_65 = x_111;
@@ -38300,7 +38357,7 @@ else
 {
 lean_object* x_112; lean_object* x_113; 
 lean_dec(x_106);
-x_112 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_112 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_56);
 x_113 = l_Lean_Parser_ParserState_mkErrorsAt(x_103, x_112, x_56);
 x_65 = x_113;
@@ -38311,7 +38368,7 @@ else
 {
 lean_object* x_114; lean_object* x_115; 
 lean_dec(x_104);
-x_114 = l_Lean_Parser_Term_structInst___elambda__1___closed__14;
+x_114 = l_Lean_Parser_Term_structInst___elambda__1___closed__17;
 lean_inc(x_56);
 x_115 = l_Lean_Parser_ParserState_mkErrorsAt(x_103, x_114, x_56);
 x_65 = x_115;
@@ -52549,38 +52606,6 @@ l_Lean_Parser_Term_structInstField___closed__5 = _init_l_Lean_Parser_Term_struct
 lean_mark_persistent(l_Lean_Parser_Term_structInstField___closed__5);
 l_Lean_Parser_Term_structInstField = _init_l_Lean_Parser_Term_structInstField();
 lean_mark_persistent(l_Lean_Parser_Term_structInstField);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__1 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__1();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__1);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__2 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__2();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__2);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__3 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__3();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__3);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__4 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__4();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__4);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__5 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__5();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__5);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__6 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__6();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__6);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__7 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__7();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__7);
-l_Lean_Parser_Term_structInstSource___elambda__1___closed__8 = _init_l_Lean_Parser_Term_structInstSource___elambda__1___closed__8();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___elambda__1___closed__8);
-l_Lean_Parser_Term_structInstSource___closed__1 = _init_l_Lean_Parser_Term_structInstSource___closed__1();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__1);
-l_Lean_Parser_Term_structInstSource___closed__2 = _init_l_Lean_Parser_Term_structInstSource___closed__2();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__2);
-l_Lean_Parser_Term_structInstSource___closed__3 = _init_l_Lean_Parser_Term_structInstSource___closed__3();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__3);
-l_Lean_Parser_Term_structInstSource___closed__4 = _init_l_Lean_Parser_Term_structInstSource___closed__4();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__4);
-l_Lean_Parser_Term_structInstSource___closed__5 = _init_l_Lean_Parser_Term_structInstSource___closed__5();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__5);
-l_Lean_Parser_Term_structInstSource___closed__6 = _init_l_Lean_Parser_Term_structInstSource___closed__6();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__6);
-l_Lean_Parser_Term_structInstSource___closed__7 = _init_l_Lean_Parser_Term_structInstSource___closed__7();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource___closed__7);
-l_Lean_Parser_Term_structInstSource = _init_l_Lean_Parser_Term_structInstSource();
-lean_mark_persistent(l_Lean_Parser_Term_structInstSource);
 l_Lean_Parser_Term_structInst___elambda__1___closed__1 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__1);
 l_Lean_Parser_Term_structInst___elambda__1___closed__2 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__2();
@@ -52609,6 +52634,12 @@ l_Lean_Parser_Term_structInst___elambda__1___closed__13 = _init_l_Lean_Parser_Te
 lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__13);
 l_Lean_Parser_Term_structInst___elambda__1___closed__14 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__14();
 lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__14);
+l_Lean_Parser_Term_structInst___elambda__1___closed__15 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__15();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__15);
+l_Lean_Parser_Term_structInst___elambda__1___closed__16 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__16();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__16);
+l_Lean_Parser_Term_structInst___elambda__1___closed__17 = _init_l_Lean_Parser_Term_structInst___elambda__1___closed__17();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___elambda__1___closed__17);
 l_Lean_Parser_Term_structInst___closed__1 = _init_l_Lean_Parser_Term_structInst___closed__1();
 lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__1);
 l_Lean_Parser_Term_structInst___closed__2 = _init_l_Lean_Parser_Term_structInst___closed__2();
@@ -52637,6 +52668,14 @@ l_Lean_Parser_Term_structInst___closed__13 = _init_l_Lean_Parser_Term_structInst
 lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__13);
 l_Lean_Parser_Term_structInst___closed__14 = _init_l_Lean_Parser_Term_structInst___closed__14();
 lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__14);
+l_Lean_Parser_Term_structInst___closed__15 = _init_l_Lean_Parser_Term_structInst___closed__15();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__15);
+l_Lean_Parser_Term_structInst___closed__16 = _init_l_Lean_Parser_Term_structInst___closed__16();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__16);
+l_Lean_Parser_Term_structInst___closed__17 = _init_l_Lean_Parser_Term_structInst___closed__17();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__17);
+l_Lean_Parser_Term_structInst___closed__18 = _init_l_Lean_Parser_Term_structInst___closed__18();
+lean_mark_persistent(l_Lean_Parser_Term_structInst___closed__18);
 l_Lean_Parser_Term_structInst = _init_l_Lean_Parser_Term_structInst();
 lean_mark_persistent(l_Lean_Parser_Term_structInst);
 res = l___regBuiltinParser_Lean_Parser_Term_structInst(lean_io_mk_world());