diff --git a/stage0/src/Lean/Elab/ResolveName.lean b/stage0/src/Lean/Elab/ResolveName.lean
index 52e09af507..b7d03feb70 100644
--- a/stage0/src/Lean/Elab/ResolveName.lean
+++ b/stage0/src/Lean/Elab/ResolveName.lean
@@ -88,6 +88,8 @@ private def resolveGlobalNameAux (env : Environment) (ns : Name) (openDecls : Li
   | some newId => [(newId, projs)]
   | none =>
   let resolvedIds := if env.contains id then [id] else [];
+  let idPrv := mkPrivateName env id;
+  let resolvedIds := if env.contains idPrv then [idPrv] ++ resolvedIds else resolvedIds;
   let resolvedIds := resolveOpenDecls env id openDecls resolvedIds;
   let resolvedIds := getAliases env id ++ resolvedIds;
   match resolvedIds with
diff --git a/stage0/src/Lean/Elab/Structure.lean b/stage0/src/Lean/Elab/Structure.lean
index 0c3c965391..5105b4cf39 100644
--- a/stage0/src/Lean/Elab/Structure.lean
+++ b/stage0/src/Lean/Elab/Structure.lean
@@ -54,13 +54,29 @@ inductive StructFieldKind
 | newField | fromParent | subobject
 
 structure StructFieldInfo :=
-(name   : Name)
-(fvar   : Expr)
-(kind   : StructFieldKind)
-(value? : Option Expr := none)
+(name     : Name)
+(declName : Name) -- Remark: this field value doesn't matter for fromParent fields.
+(fvar     : Expr)
+(kind     : StructFieldKind)
+(inferMod : Bool := false)
+(value?   : Option Expr := none)
+
+instance StructFieldInfo.inhabited : Inhabited StructFieldInfo :=
+⟨{ name := arbitrary _, declName := arbitrary _, fvar := arbitrary _, kind := StructFieldKind.newField }⟩
+
+def StructFieldInfo.isFromParent (info : StructFieldInfo) : Bool :=
+match info.kind with
+| StructFieldKind.fromParent => true
+| _                          => false
+
+/- Auxiliary declaration for `mkProjections` -/
+structure ProjectionInfo :=
+(declName : Name)
+(inferMod : Bool)
 
 structure ElabStructResult :=
 (decl      : Declaration)
+(projInfos : List ProjectionInfo)
 
 private def defaultCtorName := `mk
 
@@ -70,19 +86,23 @@ The structore constructor syntax is
 parser! try (declModifiers >> ident >> optional inferMod >> " :: ")
 ```
 -/
-private def expandCtor (structStx : Syntax) (structDeclName : Name) : CommandElabM StructCtorView :=
+private def expandCtor (structStx : Syntax) (structModifiers : Modifiers) (structDeclName : Name) : CommandElabM StructCtorView :=
 let optCtor := structStx.getArg 6;
 if optCtor.isNone then
   pure { ref := structStx, modifiers := {}, inferMod := false, name := defaultCtorName, declName := structDeclName ++ defaultCtorName }
 else do
   let ctor := optCtor.getArg 0;
-  modifiers ← elabModifiers (ctor.getArg 0);
-  checkValidCtorModifier ctor modifiers;
+  ctorModifiers ← elabModifiers (ctor.getArg 0);
+  checkValidCtorModifier ctor ctorModifiers;
+  when (ctorModifiers.isPrivate && structModifiers.isPrivate) $
+    throwError ctor "invalid 'private' constructor in a 'private' structure";
+  when (ctorModifiers.isProtected && structModifiers.isPrivate) $
+    throwError ctor "invalid 'protected' constructor in a 'private' structure";
   let inferMod := !(ctor.getArg 2).isNone;
   let name := ctor.getIdAt 1;
   let declName := structDeclName ++ name;
-  declName ← applyVisibility ctor modifiers.visibility declName;
-  pure { ref := ctor, name := name, modifiers := modifiers, inferMod := inferMod, declName := declName }
+  declName ← applyVisibility ctor ctorModifiers.visibility declName;
+  pure { ref := ctor, name := name, modifiers := ctorModifiers, inferMod := inferMod, declName := declName }
 
 def checkValidFieldModifier (ref : Syntax) (modifiers : Modifiers) : CommandElabM Unit := do
 when modifiers.isNoncomputable $
@@ -105,7 +125,7 @@ def structInstBinder     := parser! try (declModifiers >> "[") >> many1 ident >>
 def structFields         := parser! many (structExplicitBinder <|> structImplicitBinder <|> structInstBinder)
 ```
 -/
-private def expandFields (structStx : Syntax) (structDeclName : Name) : CommandElabM (Array StructFieldView) :=
+private def expandFields (structStx : Syntax) (structModifiers : Modifiers) (structDeclName : Name) : CommandElabM (Array StructFieldView) :=
 let fieldBinders := ((structStx.getArg 7).getArg 0).getArgs;
 fieldBinders.foldlM
   (fun (views : Array StructFieldView) fieldBinder => do
@@ -115,8 +135,12 @@ fieldBinders.foldlM
       else if k == `Lean.Parser.Command.structImplicitBinder then pure BinderInfo.implicit
       else if k == `Lean.Parser.Command.structInstBinder then pure BinderInfo.instImplicit
       else throwError fieldBinder "unexpected kind of structure field";
-    modifiers ← elabModifiers (fieldBinder.getArg 0);
-    checkValidFieldModifier fieldBinder modifiers;
+    fieldModifiers ← elabModifiers (fieldBinder.getArg 0);
+    checkValidFieldModifier fieldBinder fieldModifiers;
+    when (fieldModifiers.isPrivate && structModifiers.isPrivate) $
+      throwError fieldBinder "invalid 'private' field in a 'private' structure";
+    when (fieldModifiers.isProtected && structModifiers.isPrivate) $
+      throwError fieldBinder "invalid 'protected' field in a 'private' structure";
     let inferMod         := !(fieldBinder.getArg 3).isNone;
     let (binders, type?) :=
       if binfo == BinderInfo.default then
@@ -139,10 +163,10 @@ fieldBinders.foldlM
         when (isInternalSubobjectFieldName name) $
           throwError ident ("invalid field name '" ++ name ++ "', identifiers starting with '_' are reserved to the system");
         let declName := structDeclName ++ name;
-        declName ← applyVisibility ident modifiers.visibility declName;
+        declName ← applyVisibility ident fieldModifiers.visibility declName;
         pure $ views.push {
           ref        := ident,
-          modifiers  := modifiers,
+          modifiers  := fieldModifiers,
           binderInfo := binfo,
           inferMod   := inferMod,
           declName   := declName,
@@ -184,7 +208,7 @@ private partial def processSubfields {α} (ref : Syntax) (parentFVar : Expr) (pa
     val  ← Term.liftMetaM ref $ Meta.mkProjection parentFVar subfieldName;
     type ← Term.inferType ref val;
     Term.withLetDecl ref subfieldName type val fun subfieldFVar =>
-      let infos := infos.push { name := subfieldName, fvar := subfieldFVar, kind := StructFieldKind.fromParent };
+      let infos := infos.push { name := subfieldName, declName := arbitrary _, fvar := subfieldFVar, kind := StructFieldKind.fromParent };
       processSubfields (i+1) infos k
   else
     k infos
@@ -201,7 +225,7 @@ private partial def withParents {α} (view : StructView) : Nat → Array StructF
     env ← Term.getEnv;
     let binfo := if view.isClass && isClass env parentName then BinderInfo.instImplicit else BinderInfo.default;
     Term.withLocalDecl parentStx toParentName binfo parent $ fun parentFVar =>
-      let infos := infos.push { name := toParentName, fvar := parentFVar, kind := StructFieldKind.subobject };
+      let infos := infos.push { name := toParentName, declName := view.declName ++ toParentName, fvar := parentFVar, kind := StructFieldKind.subobject };
       let subfieldNames := getStructureFieldsFlattened env parentName;
       processSubfields parentStx parentFVar parentName subfieldNames 0 infos fun infos => withParents (i+1) infos k
   else
@@ -231,12 +255,13 @@ private partial def withFields {α} (views : Array StructFieldView) : Nat → Ar
       | none,      none => Term.throwError view.ref "invalid field, type expected"
       | some type, _    =>
         Term.withLocalDecl view.ref view.name view.binderInfo type $ fun fieldFVar =>
-          let infos := infos.push { name := view.name, fvar := fieldFVar, value? := value?, kind := StructFieldKind.newField };
+          let infos := infos.push { name := view.name, declName := view.declName, fvar := fieldFVar, value? := value?,
+                                    kind := StructFieldKind.newField, inferMod := view.inferMod };
           withFields (i+1) infos k
       | none, some value => do
         type ← Term.inferType view.ref value;
         Term.withLocalDecl view.ref view.name view.binderInfo type $ fun fieldFVar =>
-          let infos := infos.push { name := view.name, fvar := fieldFVar, kind := StructFieldKind.newField };
+          let infos := infos.push { name := view.name, declName := view.declName, fvar := fieldFVar, kind := StructFieldKind.newField, inferMod := view.inferMod };
           withFields (i+1) infos k
     | some info =>
       match info.kind with
@@ -342,6 +367,30 @@ s ← collectLevelParamsInFVars ref params s;
 s ← fieldInfos.foldlM (fun (s : CollectLevelParams.State) info => collectLevelParamsInFVar ref s info.fvar) s;
 pure s.params
 
+private def addCtorFields (ref : Syntax) (fieldInfos : Array StructFieldInfo) : Nat → Expr → TermElabM Expr
+| 0,   type => pure type
+| i+1, type => do
+  let info := fieldInfos.get! i;
+  decl ← Term.getFVarLocalDecl! info.fvar;
+  let type := type.abstract #[info.fvar];
+  match info.kind with
+  | StructFieldKind.fromParent =>
+    let val := decl.value;
+    addCtorFields i (type.instantiate1 val)
+  | StructFieldKind.subobject =>
+    let n := mkInternalSubobjectFieldName $ decl.userName;
+    addCtorFields i (mkForall n decl.binderInfo decl.type type)
+  | StructFieldKind.newField =>
+    addCtorFields i (mkForall decl.userName decl.binderInfo decl.type type)
+
+private def mkCtor (view : StructView) (levelParams : List Name) (params : Array Expr) (fieldInfos : Array StructFieldInfo) : TermElabM Constructor := do
+let type := mkAppN (mkConst view.declName (levelParams.map mkLevelParam)) params;
+type ← addCtorFields view.ref fieldInfos fieldInfos.size type;
+type ← Term.mkForall view.ref params type;
+type ← Term.instantiateMVars view.ref type;
+let type := type.inferImplicit params.size !view.ctor.inferMod;
+pure { name := view.ctor.declName, type := type }
+
 private def elabStructureView (view : StructView) : TermElabM ElabStructResult := do
 let numExplicitParams := view.params.size;
 type ← Term.elabType view.type;
@@ -360,10 +409,25 @@ withFields view.fields 0 fieldInfos fun fieldInfos => do
     match sortDeclLevelParams view.scopeLevelNames view.allUserLevelNames usedLevelNames with
     | Except.error msg      => Term.throwError ref msg
     | Except.ok levelParams => do
-      structType ← Term.mkForall ref view.params type;
-      structType ← Term.mkForall ref scopeVars structType;
-      -- TODO
-      Term.throwError view.ref ("WIP " ++ toString levelParams ++ " " ++ structType)
+      let params := scopeVars ++ view.params;
+      ctor ← mkCtor view levelParams params fieldInfos;
+      type ← Term.mkForall ref view.params type;
+      type ← Term.mkForall ref scopeVars type;
+      type ← Term.instantiateMVars ref type;
+      let indType := { name := view.declName, type := type, ctors := [ctor] : InductiveType };
+      let decl    := Declaration.inductDecl levelParams params.size [indType] view.modifiers.isUnsafe;
+      let projInfos := (fieldInfos.filter fun (info : StructFieldInfo) => !info.isFromParent).toList.map fun (info : StructFieldInfo) =>
+        { declName := info.declName, inferMod := info.inferMod : ProjectionInfo };
+      pure { decl := decl, projInfos := projInfos }
+
+@[extern "lean_mk_projections"]
+private constant mkProjections (env : Environment) (structName : @& Name) (projs : @& List ProjectionInfo) (isClass : Bool) : Except String Environment := arbitrary _
+
+private def addProjections (ref : Syntax) (structName : Name) (projs : List ProjectionInfo) (isClass : Bool) : CommandElabM Unit := do
+env ← getEnv;
+match mkProjections env structName projs isClass with
+| Except.ok env    => setEnv env
+| Except.error msg => throwError ref msg
 
 /-
 parser! (structureTk <|> classTk) >> declId >> many Term.bracketedBinder >> optional «extends» >> Term.optType >> " := " >> optional structCtor >> structFields
@@ -391,8 +455,8 @@ scopeLevelNames ← getLevelNames;
 withDeclId declId $ fun name => do
   declName ← mkDeclName declId modifiers name;
   allUserLevelNames ← getLevelNames;
-  ctor ← expandCtor stx declName;
-  fields ← expandFields stx declName;
+  ctor ← expandCtor stx modifiers declName;
+  fields ← expandFields stx modifiers declName;
   r ← runTermElabM declName $ fun scopeVars => Term.elabBinders params $ fun params => elabStructureView {
     ref               := stx,
     modifiers         := modifiers,
@@ -407,7 +471,13 @@ withDeclId declId $ fun name => do
     ctor              := ctor,
     fields            := fields
   };
-  pure () -- TODO
+  let ref := declId;
+  addDecl ref r.decl;
+  addProjections ref declName r.projInfos isClass;
+  -- TODO: add auxiliary definitions recOn and casesOn
+  -- TODO: register default values
+  -- TODO: add coercions
+  pure ()
 
 end Command
 end Elab
diff --git a/stage0/src/Lean/Elab/Term.lean b/stage0/src/Lean/Elab/Term.lean
index a36b68d677..c0fe68123d 100644
--- a/stage0/src/Lean/Elab/Term.lean
+++ b/stage0/src/Lean/Elab/Term.lean
@@ -124,6 +124,12 @@ def getLCtx : TermElabM LocalContext := do ctx ← read; pure ctx.lctx
 def getLocalInsts : TermElabM LocalInstances := do ctx ← read; pure ctx.localInstances
 def getOptions : TermElabM Options := do ctx ← read; pure ctx.config.opts
 def getLevelNames : TermElabM (List Name) := do ctx ← read; pure ctx.levelNames
+def getFVarLocalDecl! (fvar : Expr) : TermElabM LocalDecl := do
+  lctx ← getLCtx;
+  match lctx.find? fvar.fvarId! with
+  | some d => pure d
+  | none   => unreachable!
+
 def setEnv (env : Environment) : TermElabM Unit := modify $ fun s => { s with env := env }
 def setMCtx (mctx : MetavarContext) : TermElabM Unit := modify $ fun s => { s with mctx := mctx }
 
diff --git a/stage0/src/frontends/lean/pp.cpp b/stage0/src/frontends/lean/pp.cpp
index bfc2042c2b..6e8a2d5fa5 100644
--- a/stage0/src/frontends/lean/pp.cpp
+++ b/stage0/src/frontends/lean/pp.cpp
@@ -685,7 +685,7 @@ static bool is_structure_instance(environment const & env, expr const & e, bool
     if (!is_constant(fn)) return false;
     name const & mk_name = const_name(fn);
     if (!is_constructor(env, mk_name)) return false;
-    name const & S       = mk_name.get_prefix();
+    name S = get_constructor_inductive_type(env, mk_name);
     if (!is_structure(env, S)) return false;
     /* If implicit arguments is true, and the structure has parameters, we should not
        pretty print using { ... }, because we will not be able to see the parameters. */
diff --git a/stage0/src/library/constructions/projection.cpp b/stage0/src/library/constructions/projection.cpp
index 52c0e5f4d9..5d277ef9b6 100644
--- a/stage0/src/library/constructions/projection.cpp
+++ b/stage0/src/library/constructions/projection.cpp
@@ -110,6 +110,25 @@ environment mk_projections(environment const & env, name const & n, buffer<name>
     return new_env;
 }
 
+
+extern "C" object * lean_mk_projections(object * env, object * struct_name, object * proj_infos, uint8 inst_implicit) {
+    environment new_env(env);
+    name n(struct_name, true);
+    list_ref<object_ref> ps(proj_infos, true);
+    buffer<name> proj_names;
+    buffer<implicit_infer_kind> infer_kinds;
+    for (auto p : ps) {
+        proj_names.push_back(cnstr_get_ref_t<name>(p, 0));
+        infer_kinds.push_back(unbox(cnstr_get_ref(p, 1).raw()) == 0 ? implicit_infer_kind::RelaxedImplicit : implicit_infer_kind::Implicit);
+    }
+    try {
+        new_env = mk_projections(new_env, n, proj_names, infer_kinds, inst_implicit != 0);
+        return mk_except_ok(new_env);
+    } catch (exception & ex) {
+        return mk_except_error(string_ref(ex.what()));
+    }
+}
+
 void initialize_def_projection() {
 }
 
diff --git a/stage0/src/library/util.cpp b/stage0/src/library/util.cpp
index 32cc91df33..e92388dc89 100644
--- a/stage0/src/library/util.cpp
+++ b/stage0/src/library/util.cpp
@@ -318,6 +318,13 @@ unsigned get_constructor_idx(environment const & env, name const & n) {
     lean_unreachable();
 }
 
+name get_constructor_inductive_type(environment const & env, name const & ctor_name) {
+    constant_info info  = env.get(ctor_name);
+    lean_assert(info.is_constructor());
+    constructor_val val = info.to_constructor_val();
+    return val.get_induct();
+}
+
 expr instantiate_lparam(expr const & e, name const & p, level const & l) {
     return instantiate_lparams(e, names(p), levels(l));
 }
diff --git a/stage0/src/library/util.h b/stage0/src/library/util.h
index 5fe6f42a04..6fa0e18c72 100644
--- a/stage0/src/library/util.h
+++ b/stage0/src/library/util.h
@@ -124,6 +124,11 @@ unsigned get_num_constructors(environment const & env, name const & n);
     \pre inductive::is_intro_rule(env, n) */
 unsigned get_constructor_idx(environment const & env, name const & n);
 
+/** \brief Given a constructor name, return the associated inductive type name.
+
+    \pre inductive::is_intro_rule(env, ctor_name) */
+name get_constructor_inductive_type(environment const & env, name const & ctor_name);
+
 /** \brief Given an expression \c e, return the number of arguments expected arguments.
 
     \remark This function counts the number of nested Pi's in \c e. Weak-head-normal-forms are computed for the type of \c e.
diff --git a/stage0/stdlib/Lean/Elab/App.c b/stage0/stdlib/Lean/Elab/App.c
index 301b9f12ad..5416026709 100644
--- a/stage0/stdlib/Lean/Elab/App.c
+++ b/stage0/stdlib/Lean/Elab/App.c
@@ -234,7 +234,6 @@ lean_object* l___private_Lean_Elab_App_17__addLValArg___main___closed__11;
 lean_object* l_Lean_Elab_Term_elabApp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeAppInstMVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
 lean_object* l___private_Lean_Elab_App_4__tryCoeFun___closed__3;
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
@@ -251,6 +250,7 @@ extern lean_object* l_Lean_Elab_Term_TermElabResult_inhabited;
 lean_object* l_List_map___main___at___private_Lean_Elab_App_20__elabAppFnId___spec__1(lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_App_24__mergeFailures___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabProj___closed__1;
 lean_object* l___private_Lean_Elab_App_4__tryCoeFun___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isAutoParam(lean_object*);
@@ -16952,7 +16952,7 @@ if (lean_obj_tag(x_13) == 0)
 {
 lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 lean_dec(x_13);
-x_14 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_14 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_15 = l_unreachable_x21___rarg(x_14);
 lean_inc(x_4);
 x_16 = lean_apply_2(x_15, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Elab/Binders.c b/stage0/stdlib/Lean/Elab/Binders.c
index 7fab4e48d6..3b5bdf8b87 100644
--- a/stage0/stdlib/Lean/Elab/Binders.c
+++ b/stage0/stdlib/Lean/Elab/Binders.c
@@ -24,10 +24,12 @@ lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__13;
 lean_object* l_Lean_Elab_Term_elabLetDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_4__expandBinderModifier___closed__3;
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 extern lean_object* l___private_Lean_Meta_ExprDefEq_8__checkTypesAndAssign___closed__7;
 lean_object* l_Lean_Elab_Term_elabDepArrow___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabForall___closed__1;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
 lean_object* l_unreachable_x21___rarg(lean_object*);
 extern lean_object* l_Lean_nullKind;
 lean_object* l___private_Lean_Syntax_7__quoteName___main(lean_object*);
@@ -43,7 +45,6 @@ lean_object* l_Lean_Elab_Term_elabLetDeclAux___lambda__3(lean_object*, lean_obje
 lean_object* l_Lean_Elab_Term_elabBinder___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabFun(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_forall___elambda__1___closed__2;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
 extern lean_object* l_Lean_identKind___closed__2;
 lean_object* l_Lean_Elab_Term_elabForall___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__1;
@@ -72,7 +73,6 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 extern lean_object* l_Lean_Parser_Term_depArrow___elambda__1___closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabFun(lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 lean_object* l___private_Lean_Elab_Binders_7__elabBinderViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_11__expandFunBindersAux___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareTacticSyntax___closed__3;
@@ -98,10 +98,10 @@ lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_6__matchBi
 lean_object* l_Lean_Elab_Term_getOptions(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkTermIdFromIdent___closed__2;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 lean_object* l_Lean_Syntax_isSimpleTermId_x3f(lean_object*, uint8_t);
 lean_object* l_Lean_Elab_Term_FunBinders_elabFunBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__3;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
 lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_getOptParamDefault_x3f___closed__2;
@@ -112,7 +112,6 @@ lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__1;
 lean_object* l_Lean_Elab_Term_elabLetDeclAux___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshFVarId___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_Binders_4__expandBinderModifier___closed__2;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4;
 lean_object* l_Lean_Elab_Term_declareTacticSyntax(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
 extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__1;
@@ -153,28 +152,25 @@ lean_object* l_Lean_Elab_Term_elabFunBinders(lean_object*);
 extern lean_object* l_Lean_Parser_Term_instBinder___elambda__1___closed__1;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_6__matchBinder___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
 extern lean_object* l___private_Lean_Meta_ExprDefEq_8__checkTypesAndAssign___closed__8;
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Term_5__expandCDot___main___closed__4;
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabBinder___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_2__expandBinderIdent___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__2;
 lean_object* l___private_Lean_Elab_Binders_10__getFunBinderIds_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_13__propagateExpectedType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
 lean_object* l___private_Lean_Elab_Binders_14__elabFunBinderViews___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_expandOptType(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLocalDecl___rarg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_12__checkNoOptAutoParam(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabForall(lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__6;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__6;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
 lean_object* l___private_Lean_Elab_Binders_9__getFunBinderIdsAux_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Quotation_2__quoteSyntax___main___spec__1___closed__3;
 lean_object* l___private_Lean_Elab_Binders_9__getFunBinderIdsAux_x3f(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -197,7 +193,7 @@ lean_object* l_Lean_Elab_Term_elabLetBangDecl___closed__1;
 lean_object* l_Lean_mkFVar(lean_object*);
 extern lean_object* l_Lean_Expr_getAutoParamTactic_x3f___closed__1;
 lean_object* l_Lean_Elab_Term_quoteAutoTactic(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l_Lean_Elab_Term_elabLetBangDecl___closed__2;
 uint8_t l_Lean_Expr_isAutoParam(lean_object*);
 extern lean_object* l_Lean_Expr_getAutoParamTactic_x3f___closed__2;
@@ -209,6 +205,7 @@ lean_object* l_Lean_Elab_Term_elabBinders___rarg___boxed(lean_object*, lean_obje
 extern lean_object* l_Lean_String_HasQuote___closed__2;
 lean_object* l_Lean_Elab_Term_expandOptType___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 lean_object* l_Lean_Elab_Term_FunBinders_elabFunBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_termElabAttribute;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabLetBangDecl___closed__1;
@@ -245,15 +242,17 @@ lean_object* l___private_Lean_Elab_Binders_10__getFunBinderIds_x3f___boxed(lean_
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l___private_Lean_Elab_Binders_4__expandBinderModifier___closed__5;
 lean_object* l_Lean_Elab_Term_elabLetDecl___closed__1;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 lean_object* l___private_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__3;
 lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__2;
 lean_object* l___private_Lean_Elab_Binders_4__expandBinderModifier___closed__6;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
 lean_object* l___private_Lean_Elab_Binders_12__checkNoOptAutoParam___closed__5;
 lean_object* l_Lean_Elab_Term_elabLetDeclAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_14__elabFunBinderViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Util_1__mkPanicMessage___closed__2;
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_6__matchBinder___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3;
 extern lean_object* l_Lean_mkHole___closed__1;
 lean_object* l_Lean_Elab_Term_mkExplicitBinder(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -285,6 +284,7 @@ lean_object* l___private_Lean_Elab_Binders_14__elabFunBinderViews___main___boxed
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_quoteAutoTactic___main___spec__1___closed__3;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isOptParam(lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__7;
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_6__matchBinder___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Util_1__evalSyntaxConstantUnsafe___closed__1;
 extern lean_object* l_Lean_mkHole___closed__2;
@@ -292,7 +292,6 @@ lean_object* l_Lean_Elab_Term_elabBinders___rarg(lean_object*, lean_object*, lea
 lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__9;
 lean_object* l_Lean_Elab_Term_elabLetDeclAux___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Lean_Elab_Term_declareTacticSyntax___closed__4;
 lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__8;
@@ -317,6 +316,7 @@ lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_5__getBind
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Binders_6__matchBinder___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Binders_4__expandBinderModifier___closed__7;
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 lean_object* l___private_Lean_Elab_Binders_1__expandBinderType(lean_object*);
 lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__1;
 extern lean_object* l_Lean_mkAppStx___closed__1;
@@ -844,7 +844,7 @@ switch (lean_obj_tag(x_1)) {
 case 0:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_4 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_5 = l_unreachable_x21___rarg(x_4);
 x_6 = lean_apply_2(x_5, x_2, x_3);
 return x_6;
@@ -880,12 +880,12 @@ lean_inc(x_17);
 x_18 = lean_ctor_get(x_16, 1);
 lean_inc(x_18);
 lean_dec(x_16);
-x_19 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
+x_19 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
 x_20 = l_Lean_addMacroScope(x_17, x_19, x_14);
 x_21 = lean_box(0);
 x_22 = l_Lean_SourceInfo_inhabited___closed__1;
-x_23 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4;
-x_24 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
+x_23 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3;
+x_24 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__7;
 x_25 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_25, 0, x_22);
 lean_ctor_set(x_25, 1, x_23);
@@ -926,10 +926,10 @@ if (x_42 == 0)
 {
 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; 
 x_43 = lean_ctor_get(x_41, 0);
-x_44 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_44 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_45 = l_Lean_addMacroScope(x_43, x_44, x_39);
-x_46 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_47 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_46 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_47 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_48 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_48, 0, x_22);
 lean_ctor_set(x_48, 1, x_46);
@@ -963,10 +963,10 @@ x_61 = lean_ctor_get(x_41, 1);
 lean_inc(x_61);
 lean_inc(x_60);
 lean_dec(x_41);
-x_62 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_62 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_63 = l_Lean_addMacroScope(x_60, x_62, x_39);
-x_64 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_65 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_64 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_65 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_66 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_66, 0, x_22);
 lean_ctor_set(x_66, 1, x_64);
@@ -1036,12 +1036,12 @@ lean_inc(x_87);
 x_88 = lean_ctor_get(x_86, 1);
 lean_inc(x_88);
 lean_dec(x_86);
-x_89 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
+x_89 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
 x_90 = l_Lean_addMacroScope(x_87, x_89, x_84);
 x_91 = lean_box(0);
 x_92 = l_Lean_SourceInfo_inhabited___closed__1;
-x_93 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4;
-x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
+x_93 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3;
+x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__7;
 x_95 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_95, 0, x_92);
 lean_ctor_set(x_95, 1, x_93);
@@ -1090,10 +1090,10 @@ if (lean_is_exclusive(x_112)) {
  lean_dec_ref(x_112);
  x_115 = lean_box(0);
 }
-x_116 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_116 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_117 = l_Lean_addMacroScope(x_113, x_116, x_110);
-x_118 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_119 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_118 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_119 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_120 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_120, 0, x_92);
 lean_ctor_set(x_120, 1, x_118);
@@ -1187,11 +1187,11 @@ if (x_146 == 0)
 {
 lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
 x_147 = lean_ctor_get(x_145, 0);
-x_148 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_148 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 x_149 = l_Lean_addMacroScope(x_147, x_148, x_143);
 x_150 = l_Lean_SourceInfo_inhabited___closed__1;
-x_151 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_152 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_151 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_152 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_153 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_153, 0, x_150);
 lean_ctor_set(x_153, 1, x_151);
@@ -1235,11 +1235,11 @@ x_173 = lean_ctor_get(x_145, 1);
 lean_inc(x_173);
 lean_inc(x_172);
 lean_dec(x_145);
-x_174 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_174 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 x_175 = l_Lean_addMacroScope(x_172, x_174, x_143);
 x_176 = l_Lean_SourceInfo_inhabited___closed__1;
-x_177 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_178 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_177 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_178 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_179 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_179, 0, x_176);
 lean_ctor_set(x_179, 1, x_177);
@@ -1304,11 +1304,11 @@ if (lean_is_exclusive(x_203)) {
  lean_dec_ref(x_203);
  x_206 = lean_box(0);
 }
-x_207 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_207 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 x_208 = l_Lean_addMacroScope(x_204, x_207, x_201);
 x_209 = l_Lean_SourceInfo_inhabited___closed__1;
-x_210 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_211 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_210 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_211 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_212 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_212, 0, x_209);
 lean_ctor_set(x_212, 1, x_210);
@@ -5505,7 +5505,7 @@ x_24 = l_Lean_nullKind___closed__2;
 x_25 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_25, 0, x_24);
 lean_ctor_set(x_25, 1, x_23);
-x_26 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_26 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_27 = lean_array_push(x_26, x_25);
 x_28 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
 x_29 = lean_array_push(x_28, x_7);
@@ -5515,7 +5515,7 @@ lean_ctor_set(x_30, 1, x_29);
 x_31 = lean_array_push(x_27, x_30);
 x_32 = l___private_Lean_Elab_Term_5__expandCDot___main___closed__4;
 x_33 = lean_array_push(x_31, x_32);
-x_34 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_34 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_35 = lean_array_push(x_33, x_34);
 x_36 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
 x_37 = lean_alloc_ctor(1, 2, 0);
@@ -5561,7 +5561,7 @@ x_57 = l_Lean_nullKind___closed__2;
 x_58 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_58, 0, x_57);
 lean_ctor_set(x_58, 1, x_56);
-x_59 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_59 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_60 = lean_array_push(x_59, x_58);
 x_61 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
 x_62 = lean_array_push(x_61, x_7);
@@ -5571,7 +5571,7 @@ lean_ctor_set(x_63, 1, x_62);
 x_64 = lean_array_push(x_60, x_63);
 x_65 = l___private_Lean_Elab_Term_5__expandCDot___main___closed__4;
 x_66 = lean_array_push(x_64, x_65);
-x_67 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_67 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_68 = lean_array_push(x_66, x_67);
 x_69 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
 x_70 = lean_alloc_ctor(1, 2, 0);
diff --git a/stage0/stdlib/Lean/Elab/BuiltinNotation.c b/stage0/stdlib/Lean/Elab/BuiltinNotation.c
index c44ab2d195..2162118a1a 100644
--- a/stage0/stdlib/Lean/Elab/BuiltinNotation.c
+++ b/stage0/stdlib/Lean/Elab/BuiltinNotation.c
@@ -188,6 +188,7 @@ lean_object* l___regBuiltin_Lean_Elab_Term_elabAndThen(lean_object*);
 lean_object* l_Lean_Elab_Term_elabseq___closed__1;
 lean_object* l_Lean_Elab_Term_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkTermIdFromIdent___closed__2;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 lean_object* l_Array_foldlStepMAux___main___at_Lean_Elab_Term_elabParen___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabTParserMacro(lean_object*);
 extern lean_object* l_Lean_Parser_Term_proj___elambda__1___closed__2;
@@ -243,6 +244,7 @@ extern lean_object* l_Lean_Parser_Term_div___elambda__1___closed__1;
 lean_object* l___private_Lean_Elab_BuiltinNotation_2__elabTParserMacroAux___closed__4;
 extern lean_object* l_Lean_Parser_Term_tparser_x21___elambda__1___closed__2;
 lean_object* l___private_Lean_Elab_BuiltinNotation_1__elabParserMacroAux___closed__20;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 lean_object* l_Lean_Elab_Term_elabNativeRefl___closed__9;
 extern lean_object* l_Lean_Parser_Tactic_seq___elambda__1___closed__3;
 extern lean_object* l_Lean_Parser_Term_ge___elambda__1___closed__2;
@@ -324,7 +326,6 @@ lean_object* l_Lean_Elab_Term_elabBAnd(lean_object*, lean_object*, lean_object*)
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_orM___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_orM___elambda__1___closed__1;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
 lean_object* l_Lean_Elab_Term_expandSubtype___closed__4;
 extern lean_object* l_Lean_Parser_Term_iff___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabAnonymousCtor___closed__9;
@@ -336,7 +337,6 @@ lean_object* l_Lean_Elab_Term_elabAnonymousCtor___closed__3;
 extern lean_object* l_Lean_mkAppStx___closed__6;
 lean_object* l_Lean_Elab_Term_elabMap___closed__3;
 lean_object* l_Lean_Elab_Term_elabOr___boxed(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 extern lean_object* l_Lean_Parser_Term_beq___elambda__1___closed__1;
 lean_object* l___private_Lean_Elab_BuiltinNotation_1__elabParserMacroAux___closed__31;
 lean_object* l_Lean_Elab_Term_elabAppend___boxed(lean_object*, lean_object*, lean_object*);
@@ -445,7 +445,6 @@ lean_object* l___private_Lean_Elab_BuiltinNotation_1__elabParserMacroAux___close
 lean_object* l___private_Lean_Elab_BuiltinNotation_5__getPropToDecide___closed__2;
 lean_object* l___private_Lean_Elab_BuiltinNotation_3__mkNativeReflAuxDecl___closed__1;
 extern lean_object* l_Lean_Parser_Term_paren___elambda__1___closed__1;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 lean_object* l_Lean_Elab_Term_elabGE___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_seqRight___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_expandIf___closed__2;
@@ -543,6 +542,7 @@ lean_object* l_Lean_Elab_Term_elabCons(lean_object*, lean_object*, lean_object*)
 lean_object* l___regBuiltin_Lean_Elab_Term_expandIf___closed__1;
 lean_object* l_Lean_Elab_Term_elabMod(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_BuiltinNotation_2__elabTParserMacroAux___closed__10;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
 lean_object* l_Lean_Elab_Term_elabAnonymousCtor___closed__7;
 extern lean_object* l_Lean_Parser_Term_map___elambda__1___closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabPow(lean_object*);
@@ -1181,9 +1181,9 @@ x_88 = lean_array_push(x_87, x_69);
 x_89 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_89, 0, x_43);
 lean_ctor_set(x_89, 1, x_88);
-x_90 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_90 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_91 = lean_array_push(x_90, x_89);
-x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_93 = lean_array_push(x_91, x_92);
 x_94 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_95 = lean_alloc_ctor(1, 2, 0);
@@ -1496,9 +1496,9 @@ x_37 = l_Lean_nullKind___closed__2;
 x_38 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
-x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_40 = lean_array_push(x_39, x_38);
-x_41 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_41 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_42 = lean_array_push(x_40, x_41);
 x_43 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_44 = lean_alloc_ctor(1, 2, 0);
@@ -1662,9 +1662,9 @@ x_108 = lean_array_push(x_101, x_107);
 x_109 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_109, 0, x_67);
 lean_ctor_set(x_109, 1, x_108);
-x_110 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_110 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_111 = lean_array_push(x_110, x_109);
-x_112 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_112 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_113 = lean_array_push(x_111, x_112);
 x_114 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_115 = lean_alloc_ctor(1, 2, 0);
@@ -3705,10 +3705,10 @@ lean_ctor_set(x_74, 0, x_40);
 lean_ctor_set(x_74, 1, x_73);
 x_75 = lean_array_push(x_36, x_74);
 x_76 = lean_array_push(x_36, x_23);
-x_77 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_77 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 x_78 = l_Lean_addMacroScope(x_57, x_77, x_53);
-x_79 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_80 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_79 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_80 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_81 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_81, 0, x_18);
 lean_ctor_set(x_81, 1, x_79);
@@ -3732,9 +3732,9 @@ x_90 = lean_array_push(x_89, x_38);
 x_91 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_91, 0, x_46);
 lean_ctor_set(x_91, 1, x_90);
-x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_93 = lean_array_push(x_92, x_91);
-x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_95 = lean_array_push(x_93, x_94);
 x_96 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_97 = lean_alloc_ctor(1, 2, 0);
@@ -3795,10 +3795,10 @@ lean_ctor_set(x_121, 0, x_40);
 lean_ctor_set(x_121, 1, x_120);
 x_122 = lean_array_push(x_36, x_121);
 x_123 = lean_array_push(x_36, x_23);
-x_124 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_124 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 x_125 = l_Lean_addMacroScope(x_103, x_124, x_53);
-x_126 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_127 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_126 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_127 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_128 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_128, 0, x_18);
 lean_ctor_set(x_128, 1, x_126);
@@ -3822,9 +3822,9 @@ x_137 = lean_array_push(x_136, x_38);
 x_138 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_138, 0, x_46);
 lean_ctor_set(x_138, 1, x_137);
-x_139 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_139 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_140 = lean_array_push(x_139, x_138);
-x_141 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_141 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_142 = lean_array_push(x_140, x_141);
 x_143 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_144 = lean_alloc_ctor(1, 2, 0);
@@ -3923,9 +3923,9 @@ x_189 = lean_array_push(x_188, x_38);
 x_190 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_190, 0, x_46);
 lean_ctor_set(x_190, 1, x_189);
-x_191 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_191 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_192 = lean_array_push(x_191, x_190);
-x_193 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_193 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_194 = lean_array_push(x_192, x_193);
 x_195 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_196 = lean_alloc_ctor(1, 2, 0);
@@ -4031,9 +4031,9 @@ x_246 = lean_array_push(x_245, x_38);
 x_247 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_247, 0, x_46);
 lean_ctor_set(x_247, 1, x_246);
-x_248 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_248 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_249 = lean_array_push(x_248, x_247);
-x_250 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_250 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_251 = lean_array_push(x_249, x_250);
 x_252 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_253 = lean_alloc_ctor(1, 2, 0);
diff --git a/stage0/stdlib/Lean/Elab/Definition.c b/stage0/stdlib/Lean/Elab/Definition.c
index c30ddecc4f..f96f7a62f7 100644
--- a/stage0/stdlib/Lean/Elab/Definition.c
+++ b/stage0/stdlib/Lean/Elab/Definition.c
@@ -30,7 +30,6 @@ lean_object* l_Lean_Elab_Command_mkDef___lambda__1___closed__4;
 lean_object* l___private_Lean_Elab_Definition_3__withUsedWhen_x27___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_withDeclId___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
-extern lean_object* l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_6__mkTermContext(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDefVal___closed__2;
@@ -73,6 +72,7 @@ lean_object* l___private_Lean_Elab_Definition_3__withUsedWhen_x27___rarg(lean_ob
 lean_object* l_Lean_Elab_Term_collectUsedFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDefLike___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Command_DefKind_isTheorem(uint8_t);
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_Lean_Elab_Command_sortDeclLevelParams(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDefVal___closed__3;
@@ -877,7 +877,7 @@ lean_dec(x_48);
 lean_dec(x_45);
 lean_dec(x_42);
 lean_dec(x_9);
-x_95 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_95 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_96 = l_unreachable_x21___rarg(x_95);
 x_97 = lean_apply_2(x_96, x_12, x_54);
 return x_97;
diff --git a/stage0/stdlib/Lean/Elab/Quotation.c b/stage0/stdlib/Lean/Elab/Quotation.c
index 4f49bb257a..d400532937 100644
--- a/stage0/stdlib/Lean/Elab/Quotation.c
+++ b/stage0/stdlib/Lean/Elab/Quotation.c
@@ -208,7 +208,6 @@ lean_object* l_Lean_Syntax_findAux___main(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9;
 lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 lean_object* l___private_Lean_Elab_Quotation_4__getHeadInfo___lambda__2___closed__4;
-lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
 lean_object* l___private_Lean_Elab_Quotation_6__compileStxMatch___main___closed__23;
 extern lean_object* l_List_Monad;
 extern lean_object* l_Lean_Nat_HasQuote___closed__1;
@@ -359,7 +358,7 @@ uint8_t l_Lean_Elab_Term_Quotation_isAntiquot(lean_object*);
 lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60;
 lean_object* l_Lean_mkFVar(lean_object*);
 extern lean_object* l_Lean_optionToExpr___rarg___lambda__1___closed__3;
-lean_object* l_Lean_Elab_Term_TermElabM_inhabited___boxed(lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l___private_Lean_Elab_Quotation_5__explodeHeadPat___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
 extern lean_object* l_Lean_nullKind___closed__1;
@@ -1582,35 +1581,26 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_TermElabM_inhabited___boxed), 2, 1);
-lean_closure_set(x_1, 0, lean_box(0));
+x_1 = lean_mk_string("Array.empty");
 return x_1;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__2() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("Array.empty");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_2 = lean_string_utf8_byte_size(x_1);
+return x_2;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__2;
-x_2 = lean_string_utf8_byte_size(x_1);
-return x_2;
-}
-}
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__2;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1618,7 +1608,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -1626,23 +1616,35 @@ x_1 = lean_mk_string("empty");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_arrayToExpr___rarg___closed__2;
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
-x_3 = lean_alloc_ctor(0, 2, 0);
+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;
@@ -1651,39 +1653,27 @@ return x_3;
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("Syntax.node");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__9;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1691,7 +1681,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1701,11 +1691,21 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
+x_2 = l_Lean_Meta_DiscrTree_Trie_format___main___rarg___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Util_1__evalSyntaxConstantUnsafe___closed__1;
 x_2 = l_Lean_Meta_DiscrTree_Trie_format___main___rarg___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -1715,9 +1715,11 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Util_1__evalSyntaxConstantUnsafe___closed__1;
-x_2 = l_Lean_Meta_DiscrTree_Trie_format___main___rarg___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_1 = lean_box(0);
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -1727,7 +1729,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__14;
-x_3 = lean_alloc_ctor(0, 2, 0);
+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;
@@ -1736,21 +1738,19 @@ return x_3;
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
-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* x_1; 
+x_1 = lean_mk_string("unexpected antiquotation splice");
+return x_1;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__17() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("unexpected antiquotation splice");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__18() {
@@ -1758,7 +1758,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__17;
-x_2 = lean_alloc_ctor(2, 1, 0);
+x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -1766,37 +1766,27 @@ return x_2;
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__19() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__18;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__20() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("Syntax.atom");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__20() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__20;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__19;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__20;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__19;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__20;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1804,17 +1794,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 x_2 = l_Lean_Parser_Syntax_atom___elambda__1___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__24() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1824,31 +1814,31 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__24;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__24;
 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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1860,17 +1850,17 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_empty___closed__1;
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__29() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28() {
 _start:
 {
 lean_object* x_1; 
@@ -1878,22 +1868,22 @@ x_1 = lean_mk_string("SourceInfo.mk");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__29() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__29;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__29;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__29;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1901,7 +1891,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__32() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31() {
 _start:
 {
 lean_object* x_1; 
@@ -1909,12 +1899,22 @@ x_1 = lean_mk_string("SourceInfo");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__32() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__32;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__32;
+x_2 = l_Lean_prodToExpr___rarg___lambda__1___closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1923,8 +1923,8 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
-x_2 = l_Lean_prodToExpr___rarg___lambda__1___closed__3;
+x_1 = l_Lean_mkAppStx___closed__2;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1933,8 +1933,8 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_mkAppStx___closed__2;
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__32;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_2 = l_Lean_prodToExpr___rarg___lambda__1___closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1943,9 +1943,11 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__35;
-x_2 = l_Lean_prodToExpr___rarg___lambda__1___closed__3;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_1 = lean_box(0);
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__35;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -1955,7 +1957,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__36;
-x_3 = lean_alloc_ctor(0, 2, 0);
+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;
@@ -1964,31 +1966,19 @@ return x_3;
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
-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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Option_HasRepr___rarg___closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Option_HasRepr___rarg___closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1996,7 +1986,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -2006,7 +1996,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -2018,19 +2008,19 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
 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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -2042,7 +2032,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__45() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44() {
 _start:
 {
 lean_object* x_1; 
@@ -2050,22 +2040,22 @@ x_1 = lean_mk_string("Syntax.ident");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__45() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__45;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__45;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__45;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2073,17 +2063,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 x_2 = l_Lean_identKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__49() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -2093,13 +2083,25 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__49() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__50() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__49;
-x_3 = lean_alloc_ctor(0, 2, 0);
+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;
@@ -2109,25 +2111,13 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__50;
-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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Literal_type___closed__5;
 x_2 = l_Lean_Substring_HasQuote___closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52() {
 _start:
 {
 lean_object* x_1; 
@@ -2135,22 +2125,22 @@ x_1 = lean_mk_string("addMacroScope");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2158,12 +2148,22 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_mkAppStx___closed__2;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2172,9 +2172,11 @@ lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_mkAppStx___closed__2;
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__53;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_1 = lean_box(0);
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -2184,7 +2186,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__57;
-x_3 = lean_alloc_ctor(0, 2, 0);
+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;
@@ -2193,39 +2195,27 @@ return x_3;
 lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__58;
-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* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("mainModule");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2233,17 +2223,17 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__60;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63() {
 _start:
 {
 lean_object* x_1; 
@@ -2251,22 +2241,22 @@ x_1 = lean_mk_string("scp");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
+x_3 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2274,12 +2264,12 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67() {
+lean_object* _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__64;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2291,7 +2281,7 @@ switch (lean_obj_tag(x_1)) {
 case 0:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_4 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_5 = l_unreachable_x21___rarg(x_4);
 x_6 = lean_apply_2(x_5, x_2, x_3);
 return x_6;
@@ -2332,7 +2322,7 @@ return x_119;
 else
 {
 lean_object* x_120; lean_object* x_121; 
-x_120 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__19;
+x_120 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__18;
 x_121 = l_Lean_Elab_Term_throwError___rarg(x_1, x_120, x_2, x_3);
 lean_dec(x_1);
 return x_121;
@@ -2362,12 +2352,12 @@ lean_inc(x_13);
 x_14 = lean_ctor_get(x_12, 1);
 lean_inc(x_14);
 lean_dec(x_12);
-x_15 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__6;
+x_15 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__5;
 x_16 = l_Lean_addMacroScope(x_13, x_15, x_10);
 x_17 = lean_box(0);
 x_18 = l_Lean_SourceInfo_inhabited___closed__1;
-x_19 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__4;
-x_20 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__8;
+x_19 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__3;
+x_20 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__7;
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_18);
 lean_ctor_set(x_21, 1, x_19);
@@ -2421,10 +2411,10 @@ if (x_44 == 0)
 {
 lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 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; 
 x_45 = lean_ctor_get(x_43, 0);
-x_46 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_46 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_47 = l_Lean_addMacroScope(x_45, x_46, x_41);
-x_48 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_49 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_48 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_49 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_50 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_50, 0, x_18);
 lean_ctor_set(x_50, 1, x_48);
@@ -2457,10 +2447,10 @@ x_62 = lean_ctor_get(x_43, 1);
 lean_inc(x_62);
 lean_inc(x_61);
 lean_dec(x_43);
-x_63 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_63 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_64 = l_Lean_addMacroScope(x_61, x_63, x_41);
-x_65 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_66 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_65 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_66 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_67 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_67, 0, x_18);
 lean_ctor_set(x_67, 1, x_65);
@@ -2545,10 +2535,10 @@ if (lean_is_exclusive(x_88)) {
  lean_dec_ref(x_88);
  x_91 = lean_box(0);
 }
-x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__13;
+x_92 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
 x_93 = l_Lean_addMacroScope(x_89, x_92, x_86);
-x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
-x_95 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__16;
+x_94 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__10;
+x_95 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__15;
 x_96 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_96, 0, x_18);
 lean_ctor_set(x_96, 1, x_94);
@@ -2632,13 +2622,13 @@ if (x_130 == 0)
 {
 lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
 x_131 = lean_ctor_get(x_129, 0);
-x_132 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_132 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 lean_inc(x_127);
 lean_inc(x_131);
 x_133 = l_Lean_addMacroScope(x_131, x_132, x_127);
 x_134 = l_Lean_SourceInfo_inhabited___closed__1;
-x_135 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_136 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_135 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_136 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_137 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_137, 0, x_134);
 lean_ctor_set(x_137, 1, x_135);
@@ -2653,12 +2643,12 @@ lean_ctor_set_tag(x_1, 1);
 lean_ctor_set(x_1, 1, x_141);
 lean_ctor_set(x_1, 0, x_142);
 x_143 = lean_array_push(x_138, x_1);
-x_144 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_144 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_127);
 lean_inc(x_131);
 x_145 = l_Lean_addMacroScope(x_131, x_144, x_127);
-x_146 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_147 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_146 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_147 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_148 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_148, 0, x_134);
 lean_ctor_set(x_148, 1, x_146);
@@ -2670,10 +2660,10 @@ x_151 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_151, 0, x_142);
 lean_ctor_set(x_151, 1, x_150);
 x_152 = lean_array_push(x_138, x_151);
-x_153 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_153 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 x_154 = l_Lean_addMacroScope(x_131, x_153, x_127);
-x_155 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_156 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_155 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_156 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_157 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_157, 0, x_134);
 lean_ctor_set(x_157, 1, x_155);
@@ -2703,9 +2693,9 @@ x_170 = lean_array_push(x_169, x_140);
 x_171 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_171, 0, x_164);
 lean_ctor_set(x_171, 1, x_170);
-x_172 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_172 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_173 = lean_array_push(x_172, x_171);
-x_174 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_174 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_175 = lean_array_push(x_173, x_174);
 x_176 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_177 = lean_alloc_ctor(1, 2, 0);
@@ -2738,13 +2728,13 @@ x_189 = lean_ctor_get(x_129, 1);
 lean_inc(x_189);
 lean_inc(x_188);
 lean_dec(x_129);
-x_190 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_190 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 lean_inc(x_127);
 lean_inc(x_188);
 x_191 = l_Lean_addMacroScope(x_188, x_190, x_127);
 x_192 = l_Lean_SourceInfo_inhabited___closed__1;
-x_193 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_194 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_193 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_194 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_195 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_195, 0, x_192);
 lean_ctor_set(x_195, 1, x_193);
@@ -2759,12 +2749,12 @@ lean_ctor_set_tag(x_1, 1);
 lean_ctor_set(x_1, 1, x_199);
 lean_ctor_set(x_1, 0, x_200);
 x_201 = lean_array_push(x_196, x_1);
-x_202 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_202 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_127);
 lean_inc(x_188);
 x_203 = l_Lean_addMacroScope(x_188, x_202, x_127);
-x_204 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_205 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_204 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_205 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_206 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_206, 0, x_192);
 lean_ctor_set(x_206, 1, x_204);
@@ -2776,10 +2766,10 @@ x_209 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_209, 0, x_200);
 lean_ctor_set(x_209, 1, x_208);
 x_210 = lean_array_push(x_196, x_209);
-x_211 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_211 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 x_212 = l_Lean_addMacroScope(x_188, x_211, x_127);
-x_213 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_214 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_213 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_214 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_215 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_215, 0, x_192);
 lean_ctor_set(x_215, 1, x_213);
@@ -2809,9 +2799,9 @@ x_228 = lean_array_push(x_227, x_198);
 x_229 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_229, 0, x_222);
 lean_ctor_set(x_229, 1, x_228);
-x_230 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_230 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_231 = lean_array_push(x_230, x_229);
-x_232 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_232 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_233 = lean_array_push(x_231, x_232);
 x_234 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_235 = lean_alloc_ctor(1, 2, 0);
@@ -2865,13 +2855,13 @@ if (lean_is_exclusive(x_251)) {
  lean_dec_ref(x_251);
  x_254 = lean_box(0);
 }
-x_255 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__23;
+x_255 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
 lean_inc(x_249);
 lean_inc(x_252);
 x_256 = l_Lean_addMacroScope(x_252, x_255, x_249);
 x_257 = l_Lean_SourceInfo_inhabited___closed__1;
-x_258 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__22;
-x_259 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__26;
+x_258 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__21;
+x_259 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__25;
 x_260 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_260, 0, x_257);
 lean_ctor_set(x_260, 1, x_258);
@@ -2886,12 +2876,12 @@ x_266 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_266, 0, x_265);
 lean_ctor_set(x_266, 1, x_264);
 x_267 = lean_array_push(x_261, x_266);
-x_268 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_268 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_249);
 lean_inc(x_252);
 x_269 = l_Lean_addMacroScope(x_252, x_268, x_249);
-x_270 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_271 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_270 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_271 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_272 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_272, 0, x_257);
 lean_ctor_set(x_272, 1, x_270);
@@ -2903,10 +2893,10 @@ x_275 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_275, 0, x_265);
 lean_ctor_set(x_275, 1, x_274);
 x_276 = lean_array_push(x_261, x_275);
-x_277 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_277 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 x_278 = l_Lean_addMacroScope(x_252, x_277, x_249);
-x_279 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_280 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_279 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_280 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_281 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_281, 0, x_257);
 lean_ctor_set(x_281, 1, x_279);
@@ -2936,9 +2926,9 @@ x_294 = lean_array_push(x_293, x_263);
 x_295 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_295, 0, x_288);
 lean_ctor_set(x_295, 1, x_294);
-x_296 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_296 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_297 = lean_array_push(x_296, x_295);
-x_298 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_298 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_299 = lean_array_push(x_297, x_298);
 x_300 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_301 = lean_alloc_ctor(1, 2, 0);
@@ -3004,14 +2994,14 @@ if (x_327 == 0)
 {
 lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; lean_object* x_411; lean_object* x_412; lean_object* x_413; lean_object* x_414; lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; lean_object* x_423; lean_object* x_424; lean_object* x_425; lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; lean_object* x_430; 
 x_328 = lean_ctor_get(x_326, 0);
-x_329 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48;
+x_329 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
 lean_inc(x_324);
 lean_inc(x_328);
 x_330 = l_Lean_addMacroScope(x_328, x_329, x_324);
 x_331 = lean_box(0);
 x_332 = l_Lean_SourceInfo_inhabited___closed__1;
-x_333 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
-x_334 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
+x_333 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46;
+x_334 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__50;
 lean_ctor_set(x_1, 3, x_334);
 lean_ctor_set(x_1, 2, x_330);
 lean_ctor_set(x_1, 1, x_333);
@@ -3025,12 +3015,12 @@ x_340 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_340, 0, x_339);
 lean_ctor_set(x_340, 1, x_338);
 x_341 = lean_array_push(x_335, x_340);
-x_342 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_342 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_324);
 lean_inc(x_328);
 x_343 = l_Lean_addMacroScope(x_328, x_342, x_324);
-x_344 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_345 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_344 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_345 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_346 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_346, 0, x_332);
 lean_ctor_set(x_346, 1, x_344);
@@ -3042,12 +3032,12 @@ x_349 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_349, 0, x_339);
 lean_ctor_set(x_349, 1, x_348);
 x_350 = lean_array_push(x_335, x_349);
-x_351 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_351 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 lean_inc(x_324);
 lean_inc(x_328);
 x_352 = l_Lean_addMacroScope(x_328, x_351, x_324);
-x_353 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_354 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_353 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_354 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_355 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_355, 0, x_332);
 lean_ctor_set(x_355, 1, x_353);
@@ -3077,21 +3067,21 @@ x_368 = lean_array_push(x_367, x_337);
 x_369 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_369, 0, x_362);
 lean_ctor_set(x_369, 1, x_368);
-x_370 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_370 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_371 = lean_array_push(x_370, x_369);
-x_372 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_372 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_373 = lean_array_push(x_371, x_372);
 x_374 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_375 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_375, 0, x_374);
 lean_ctor_set(x_375, 1, x_373);
 x_376 = lean_array_push(x_335, x_375);
-x_377 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56;
+x_377 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
 lean_inc(x_324);
 lean_inc(x_328);
 x_378 = l_Lean_addMacroScope(x_328, x_377, x_324);
-x_379 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
-x_380 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
+x_379 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54;
+x_380 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__58;
 x_381 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_381, 0, x_332);
 lean_ctor_set(x_381, 1, x_379);
@@ -3103,11 +3093,11 @@ x_384 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_384, 0, x_339);
 lean_ctor_set(x_384, 1, x_383);
 x_385 = lean_array_push(x_335, x_384);
-x_386 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
+x_386 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
 lean_inc(x_324);
 lean_inc(x_328);
 x_387 = l_Lean_addMacroScope(x_328, x_386, x_324);
-x_388 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
+x_388 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
 x_389 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_389, 0, x_332);
 lean_ctor_set(x_389, 1, x_388);
@@ -3120,9 +3110,9 @@ lean_ctor_set(x_392, 0, x_339);
 lean_ctor_set(x_392, 1, x_391);
 x_393 = lean_array_push(x_335, x_392);
 x_394 = lean_array_push(x_393, x_322);
-x_395 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
+x_395 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
 x_396 = l_Lean_addMacroScope(x_328, x_395, x_324);
-x_397 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
+x_397 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
 x_398 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_398, 0, x_332);
 lean_ctor_set(x_398, 1, x_397);
@@ -3171,7 +3161,7 @@ x_421 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_421, 0, x_420);
 lean_ctor_set(x_421, 1, x_419);
 x_422 = lean_array_push(x_418, x_421);
-x_423 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
+x_423 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
 x_424 = l_Lean_mkCAppStx(x_423, x_422);
 x_425 = lean_array_push(x_376, x_424);
 x_426 = lean_array_push(x_425, x_411);
@@ -3194,14 +3184,14 @@ x_432 = lean_ctor_get(x_326, 1);
 lean_inc(x_432);
 lean_inc(x_431);
 lean_dec(x_326);
-x_433 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48;
+x_433 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
 lean_inc(x_324);
 lean_inc(x_431);
 x_434 = l_Lean_addMacroScope(x_431, x_433, x_324);
 x_435 = lean_box(0);
 x_436 = l_Lean_SourceInfo_inhabited___closed__1;
-x_437 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
-x_438 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
+x_437 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46;
+x_438 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__50;
 lean_ctor_set(x_1, 3, x_438);
 lean_ctor_set(x_1, 2, x_434);
 lean_ctor_set(x_1, 1, x_437);
@@ -3215,12 +3205,12 @@ x_444 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_444, 0, x_443);
 lean_ctor_set(x_444, 1, x_442);
 x_445 = lean_array_push(x_439, x_444);
-x_446 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_446 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_324);
 lean_inc(x_431);
 x_447 = l_Lean_addMacroScope(x_431, x_446, x_324);
-x_448 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_449 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_448 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_449 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_450 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_450, 0, x_436);
 lean_ctor_set(x_450, 1, x_448);
@@ -3232,12 +3222,12 @@ x_453 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_453, 0, x_443);
 lean_ctor_set(x_453, 1, x_452);
 x_454 = lean_array_push(x_439, x_453);
-x_455 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_455 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 lean_inc(x_324);
 lean_inc(x_431);
 x_456 = l_Lean_addMacroScope(x_431, x_455, x_324);
-x_457 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_458 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_457 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_458 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_459 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_459, 0, x_436);
 lean_ctor_set(x_459, 1, x_457);
@@ -3267,21 +3257,21 @@ x_472 = lean_array_push(x_471, x_441);
 x_473 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_473, 0, x_466);
 lean_ctor_set(x_473, 1, x_472);
-x_474 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_474 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_475 = lean_array_push(x_474, x_473);
-x_476 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_476 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_477 = lean_array_push(x_475, x_476);
 x_478 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_479 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_479, 0, x_478);
 lean_ctor_set(x_479, 1, x_477);
 x_480 = lean_array_push(x_439, x_479);
-x_481 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56;
+x_481 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
 lean_inc(x_324);
 lean_inc(x_431);
 x_482 = l_Lean_addMacroScope(x_431, x_481, x_324);
-x_483 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
-x_484 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
+x_483 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54;
+x_484 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__58;
 x_485 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_485, 0, x_436);
 lean_ctor_set(x_485, 1, x_483);
@@ -3293,11 +3283,11 @@ x_488 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_488, 0, x_443);
 lean_ctor_set(x_488, 1, x_487);
 x_489 = lean_array_push(x_439, x_488);
-x_490 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
+x_490 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
 lean_inc(x_324);
 lean_inc(x_431);
 x_491 = l_Lean_addMacroScope(x_431, x_490, x_324);
-x_492 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
+x_492 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
 x_493 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_493, 0, x_436);
 lean_ctor_set(x_493, 1, x_492);
@@ -3310,9 +3300,9 @@ lean_ctor_set(x_496, 0, x_443);
 lean_ctor_set(x_496, 1, x_495);
 x_497 = lean_array_push(x_439, x_496);
 x_498 = lean_array_push(x_497, x_322);
-x_499 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
+x_499 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
 x_500 = l_Lean_addMacroScope(x_431, x_499, x_324);
-x_501 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
+x_501 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
 x_502 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_502, 0, x_436);
 lean_ctor_set(x_502, 1, x_501);
@@ -3361,7 +3351,7 @@ x_525 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_525, 0, x_524);
 lean_ctor_set(x_525, 1, x_523);
 x_526 = lean_array_push(x_522, x_525);
-x_527 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
+x_527 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
 x_528 = l_Lean_mkCAppStx(x_527, x_526);
 x_529 = lean_array_push(x_480, x_528);
 x_530 = lean_array_push(x_529, x_515);
@@ -3418,14 +3408,14 @@ if (lean_is_exclusive(x_547)) {
  lean_dec_ref(x_547);
  x_550 = lean_box(0);
 }
-x_551 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__48;
+x_551 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
 lean_inc(x_545);
 lean_inc(x_548);
 x_552 = l_Lean_addMacroScope(x_548, x_551, x_545);
 x_553 = lean_box(0);
 x_554 = l_Lean_SourceInfo_inhabited___closed__1;
-x_555 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__47;
-x_556 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
+x_555 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__46;
+x_556 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__50;
 x_557 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_557, 0, x_554);
 lean_ctor_set(x_557, 1, x_555);
@@ -3440,12 +3430,12 @@ x_563 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_563, 0, x_562);
 lean_ctor_set(x_563, 1, x_561);
 x_564 = lean_array_push(x_558, x_563);
-x_565 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__34;
+x_565 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__33;
 lean_inc(x_545);
 lean_inc(x_548);
 x_566 = l_Lean_addMacroScope(x_548, x_565, x_545);
-x_567 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__31;
-x_568 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__38;
+x_567 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__30;
+x_568 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__37;
 x_569 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_569, 0, x_554);
 lean_ctor_set(x_569, 1, x_567);
@@ -3457,12 +3447,12 @@ x_572 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_572, 0, x_562);
 lean_ctor_set(x_572, 1, x_571);
 x_573 = lean_array_push(x_558, x_572);
-x_574 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__41;
+x_574 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
 lean_inc(x_545);
 lean_inc(x_548);
 x_575 = l_Lean_addMacroScope(x_548, x_574, x_545);
-x_576 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__40;
-x_577 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
+x_576 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__39;
+x_577 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
 x_578 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_578, 0, x_554);
 lean_ctor_set(x_578, 1, x_576);
@@ -3492,21 +3482,21 @@ x_591 = lean_array_push(x_590, x_560);
 x_592 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_592, 0, x_585);
 lean_ctor_set(x_592, 1, x_591);
-x_593 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_593 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_594 = lean_array_push(x_593, x_592);
-x_595 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_595 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_596 = lean_array_push(x_594, x_595);
 x_597 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_598 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_598, 0, x_597);
 lean_ctor_set(x_598, 1, x_596);
 x_599 = lean_array_push(x_558, x_598);
-x_600 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__56;
+x_600 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
 lean_inc(x_545);
 lean_inc(x_548);
 x_601 = l_Lean_addMacroScope(x_548, x_600, x_545);
-x_602 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__55;
-x_603 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__59;
+x_602 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__54;
+x_603 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__58;
 x_604 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_604, 0, x_554);
 lean_ctor_set(x_604, 1, x_602);
@@ -3518,11 +3508,11 @@ x_607 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_607, 0, x_562);
 lean_ctor_set(x_607, 1, x_606);
 x_608 = lean_array_push(x_558, x_607);
-x_609 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
+x_609 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
 lean_inc(x_545);
 lean_inc(x_548);
 x_610 = l_Lean_addMacroScope(x_548, x_609, x_545);
-x_611 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
+x_611 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
 x_612 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_612, 0, x_554);
 lean_ctor_set(x_612, 1, x_611);
@@ -3535,9 +3525,9 @@ lean_ctor_set(x_615, 0, x_562);
 lean_ctor_set(x_615, 1, x_614);
 x_616 = lean_array_push(x_558, x_615);
 x_617 = lean_array_push(x_616, x_543);
-x_618 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
+x_618 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
 x_619 = l_Lean_addMacroScope(x_548, x_618, x_545);
-x_620 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
+x_620 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
 x_621 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_621, 0, x_554);
 lean_ctor_set(x_621, 1, x_620);
@@ -3586,7 +3576,7 @@ x_644 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_644, 0, x_643);
 lean_ctor_set(x_644, 1, x_642);
 x_645 = lean_array_push(x_641, x_644);
-x_646 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__52;
+x_646 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__51;
 x_647 = l_Lean_mkCAppStx(x_646, x_645);
 x_648 = lean_array_push(x_599, x_647);
 x_649 = lean_array_push(x_648, x_634);
@@ -4017,11 +4007,11 @@ x_37 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_37, 0, x_27);
 lean_ctor_set(x_37, 1, x_36);
 x_38 = lean_array_push(x_23, x_37);
-x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
+x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
 lean_inc(x_11);
 lean_inc(x_15);
 x_40 = l_Lean_addMacroScope(x_15, x_39, x_11);
-x_41 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
+x_41 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
 x_42 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_42, 0, x_19);
 lean_ctor_set(x_42, 1, x_41);
@@ -4058,11 +4048,11 @@ x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_27);
 lean_ctor_set(x_60, 1, x_59);
 x_61 = lean_array_push(x_23, x_60);
-x_62 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
+x_62 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
 lean_inc(x_11);
 lean_inc(x_15);
 x_63 = l_Lean_addMacroScope(x_15, x_62, x_11);
-x_64 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
+x_64 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
 x_65 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_65, 0, x_19);
 lean_ctor_set(x_65, 1, x_64);
@@ -4113,9 +4103,9 @@ x_91 = lean_array_push(x_90, x_25);
 x_92 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_92, 0, x_47);
 lean_ctor_set(x_92, 1, x_91);
-x_93 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_93 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_94 = lean_array_push(x_93, x_92);
-x_95 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_95 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_96 = lean_array_push(x_94, x_95);
 x_97 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_98 = lean_alloc_ctor(1, 2, 0);
@@ -4202,11 +4192,11 @@ x_138 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_138, 0, x_128);
 lean_ctor_set(x_138, 1, x_137);
 x_139 = lean_array_push(x_124, x_138);
-x_140 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67;
+x_140 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
 lean_inc(x_11);
 lean_inc(x_115);
 x_141 = l_Lean_addMacroScope(x_115, x_140, x_11);
-x_142 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66;
+x_142 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65;
 x_143 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_143, 0, x_120);
 lean_ctor_set(x_143, 1, x_142);
@@ -4243,11 +4233,11 @@ x_161 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_161, 0, x_128);
 lean_ctor_set(x_161, 1, x_160);
 x_162 = lean_array_push(x_124, x_161);
-x_163 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__63;
+x_163 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
 lean_inc(x_11);
 lean_inc(x_115);
 x_164 = l_Lean_addMacroScope(x_115, x_163, x_11);
-x_165 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__62;
+x_165 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__61;
 x_166 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_166, 0, x_120);
 lean_ctor_set(x_166, 1, x_165);
@@ -4298,9 +4288,9 @@ x_192 = lean_array_push(x_191, x_126);
 x_193 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_193, 0, x_148);
 lean_ctor_set(x_193, 1, x_192);
-x_194 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_194 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_195 = lean_array_push(x_194, x_193);
-x_196 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_196 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_197 = lean_array_push(x_195, x_196);
 x_198 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_199 = lean_alloc_ctor(1, 2, 0);
@@ -4970,7 +4960,7 @@ lean_object* _init_l___private_Lean_Elab_Quotation_4__getHeadInfo___lambda__2___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 x_2 = l___private_Lean_Elab_Quotation_4__getHeadInfo___lambda__2___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -5222,7 +5212,7 @@ lean_object* l___private_Lean_Elab_Quotation_4__getHeadInfo___lambda__4(lean_obj
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__19;
+x_5 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__18;
 x_6 = l_Lean_Elab_Term_throwError___rarg(x_1, x_5, x_3, x_4);
 return x_6;
 }
@@ -5839,7 +5829,7 @@ lean_object* x_7; lean_object* x_8; lean_object* x_9;
 lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
-x_7 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_7 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_8 = l_unreachable_x21___rarg(x_7);
 x_9 = lean_apply_2(x_8, x_3, x_4);
 return x_9;
@@ -6756,7 +6746,7 @@ lean_object* _init_l_List_mapM___main___at___private_Lean_Elab_Quotation_6__comp
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 x_2 = l_List_mapM___main___at___private_Lean_Elab_Quotation_6__compileStxMatch___main___spec__8___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -7450,7 +7440,7 @@ lean_object* _init_l___private_Lean_Elab_Quotation_6__compileStxMatch___main___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__12;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__11;
 x_2 = l___private_Lean_Elab_Quotation_6__compileStxMatch___main___closed__7;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -7815,7 +7805,7 @@ else
 lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_9);
 lean_dec(x_8);
-x_12 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_12 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_13 = l_unreachable_x21___rarg(x_12);
 x_14 = lean_apply_2(x_13, x_4, x_5);
 return x_14;
@@ -9407,9 +9397,9 @@ x_677 = lean_array_push(x_676, x_632);
 x_678 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_678, 0, x_647);
 lean_ctor_set(x_678, 1, x_677);
-x_679 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_679 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_680 = lean_array_push(x_679, x_678);
-x_681 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_681 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_682 = lean_array_push(x_680, x_681);
 x_683 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_684 = lean_alloc_ctor(1, 2, 0);
@@ -9780,9 +9770,9 @@ x_871 = lean_array_push(x_870, x_826);
 x_872 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_872, 0, x_841);
 lean_ctor_set(x_872, 1, x_871);
-x_873 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_873 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_874 = lean_array_push(x_873, x_872);
-x_875 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_875 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_876 = lean_array_push(x_874, x_875);
 x_877 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_878 = lean_alloc_ctor(1, 2, 0);
@@ -10314,9 +10304,9 @@ x_1089 = lean_array_push(x_1088, x_1044);
 x_1090 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1090, 0, x_1059);
 lean_ctor_set(x_1090, 1, x_1089);
-x_1091 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_1091 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_1092 = lean_array_push(x_1091, x_1090);
-x_1093 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_1093 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_1094 = lean_array_push(x_1092, x_1093);
 x_1095 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_1096 = lean_alloc_ctor(1, 2, 0);
@@ -10906,7 +10896,7 @@ lean_object* _init_l___private_Lean_Elab_Quotation_8__letBindRhss___main___close
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_1 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_2 = l___private_Lean_Elab_Term_5__expandCDot___main___closed__4;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
@@ -10917,7 +10907,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Lean_Elab_Quotation_8__letBindRhss___main___closed__5;
-x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_2 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -16357,7 +16347,7 @@ lean_object* x_623; lean_object* x_624; lean_object* x_625; lean_object* x_626;
 x_623 = lean_ctor_get(x_621, 1);
 lean_inc(x_623);
 lean_dec(x_621);
-x_624 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_624 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_625 = l_unreachable_x21___rarg(x_624);
 x_626 = lean_apply_2(x_625, x_2, x_623);
 return x_626;
@@ -16828,7 +16818,7 @@ else
 lean_object* x_741; lean_object* x_742; lean_object* x_743; 
 lean_dec(x_617);
 lean_dec(x_1);
-x_741 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_741 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_742 = l_unreachable_x21___rarg(x_741);
 x_743 = lean_apply_2(x_742, x_2, x_3);
 return x_743;
@@ -18242,7 +18232,7 @@ lean_object* x_1168; lean_object* x_1169; lean_object* x_1170; lean_object* x_11
 x_1168 = lean_ctor_get(x_1166, 1);
 lean_inc(x_1168);
 lean_dec(x_1166);
-x_1169 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_1169 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_1170 = l_unreachable_x21___rarg(x_1169);
 x_1171 = lean_apply_2(x_1170, x_2, x_1168);
 return x_1171;
@@ -18633,7 +18623,7 @@ else
 lean_object* x_1245; lean_object* x_1246; lean_object* x_1247; 
 lean_dec(x_1162);
 lean_dec(x_1);
-x_1245 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_1245 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_1246 = l_unreachable_x21___rarg(x_1245);
 x_1247 = lean_apply_2(x_1246, x_2, x_3);
 return x_1247;
@@ -20103,7 +20093,7 @@ lean_object* x_1681; lean_object* x_1682; lean_object* x_1683; lean_object* x_16
 x_1681 = lean_ctor_get(x_1679, 1);
 lean_inc(x_1681);
 lean_dec(x_1679);
-x_1682 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_1682 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_1683 = l_unreachable_x21___rarg(x_1682);
 x_1684 = lean_apply_2(x_1683, x_2, x_1681);
 return x_1684;
@@ -20494,7 +20484,7 @@ else
 lean_object* x_1758; lean_object* x_1759; lean_object* x_1760; 
 lean_dec(x_1675);
 lean_dec(x_1);
-x_1758 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_1758 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_1759 = l_unreachable_x21___rarg(x_1758);
 x_1760 = lean_apply_2(x_1759, x_2, x_3);
 return x_1760;
@@ -21997,7 +21987,7 @@ lean_object* x_2200; lean_object* x_2201; lean_object* x_2202; lean_object* x_22
 x_2200 = lean_ctor_get(x_2198, 1);
 lean_inc(x_2200);
 lean_dec(x_2198);
-x_2201 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_2201 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_2202 = l_unreachable_x21___rarg(x_2201);
 x_2203 = lean_apply_2(x_2202, x_2, x_2200);
 return x_2203;
@@ -22388,7 +22378,7 @@ else
 lean_object* x_2277; lean_object* x_2278; lean_object* x_2279; 
 lean_dec(x_2194);
 lean_dec(x_1);
-x_2277 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_2277 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_2278 = l_unreachable_x21___rarg(x_2277);
 x_2279 = lean_apply_2(x_2278, x_2, x_3);
 return x_2279;
@@ -23923,7 +23913,7 @@ lean_object* x_2726; lean_object* x_2727; lean_object* x_2728; lean_object* x_27
 x_2726 = lean_ctor_get(x_2724, 1);
 lean_inc(x_2726);
 lean_dec(x_2724);
-x_2727 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_2727 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_2728 = l_unreachable_x21___rarg(x_2727);
 x_2729 = lean_apply_2(x_2728, x_2, x_2726);
 return x_2729;
@@ -24314,7 +24304,7 @@ else
 lean_object* x_2803; lean_object* x_2804; lean_object* x_2805; 
 lean_dec(x_2720);
 lean_dec(x_1);
-x_2803 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_2803 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_2804 = l_unreachable_x21___rarg(x_2803);
 x_2805 = lean_apply_2(x_2804, x_2, x_3);
 return x_2805;
@@ -25157,8 +25147,6 @@ l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65 = _init_l___p
 lean_mark_persistent(l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__65);
 l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66 = _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66();
 lean_mark_persistent(l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__66);
-l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67 = _init_l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67();
-lean_mark_persistent(l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__67);
 l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__1 = _init_l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__1);
 l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__2 = _init_l_Lean_Elab_Term_Quotation_stxQuot_expand___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/ResolveName.c b/stage0/stdlib/Lean/Elab/ResolveName.c
index 1183d582c6..8f47f19a00 100644
--- a/stage0/stdlib/Lean/Elab/ResolveName.c
+++ b/stage0/stdlib/Lean/Elab/ResolveName.c
@@ -892,102 +892,144 @@ lean_inc(x_1);
 x_15 = l___private_Lean_Elab_ResolveName_3__resolveExact(x_1, x_13);
 if (lean_obj_tag(x_15) == 0)
 {
-uint8_t x_16; lean_object* x_17; lean_object* x_18; 
+uint8_t x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; 
 lean_inc(x_1);
 x_16 = l_Lean_Environment_contains(x_1, x_13);
-x_17 = l_Lean_getAliases(x_1, x_13);
+lean_inc(x_13);
+lean_inc(x_1);
+x_17 = l_Lean_mkPrivateName(x_1, x_13);
+lean_inc(x_1);
+x_18 = l_Lean_Environment_contains(x_1, x_17);
+x_19 = l_Lean_getAliases(x_1, x_13);
 if (x_16 == 0)
 {
-lean_object* x_24; lean_object* x_25; 
+if (x_18 == 0)
+{
+lean_object* x_26; lean_object* x_27; 
+lean_dec(x_17);
 lean_inc(x_3);
 lean_inc(x_1);
-x_24 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_14);
-x_25 = l_List_append___rarg(x_17, x_24);
-x_18 = x_25;
-goto block_23;
+x_26 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_14);
+x_27 = l_List_append___rarg(x_19, x_26);
+x_20 = x_27;
+goto block_25;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-lean_inc(x_13);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_13);
-lean_ctor_set(x_26, 1, x_14);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_17);
+lean_ctor_set(x_28, 1, x_14);
+x_29 = l_List_append___rarg(x_28, x_14);
 lean_inc(x_3);
 lean_inc(x_1);
-x_27 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_26);
-x_28 = l_List_append___rarg(x_17, x_27);
-x_18 = x_28;
-goto block_23;
+x_30 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_29);
+x_31 = l_List_append___rarg(x_19, x_30);
+x_20 = x_31;
+goto block_25;
 }
-block_23:
+}
+else
 {
-if (lean_obj_tag(x_18) == 0)
+lean_object* x_32; 
+lean_inc(x_13);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_13);
+lean_ctor_set(x_32, 1, x_14);
+if (x_18 == 0)
 {
-lean_object* x_19; 
-x_19 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_19, 0, x_8);
-lean_ctor_set(x_19, 1, x_6);
+lean_object* x_33; lean_object* x_34; 
+lean_dec(x_17);
+lean_inc(x_3);
+lean_inc(x_1);
+x_33 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_32);
+x_34 = l_List_append___rarg(x_19, x_33);
+x_20 = x_34;
+goto block_25;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_17);
+lean_ctor_set(x_35, 1, x_14);
+x_36 = l_List_append___rarg(x_35, x_32);
+lean_inc(x_3);
+lean_inc(x_1);
+x_37 = l___private_Lean_Elab_ResolveName_4__resolveOpenDecls___main(x_1, x_13, x_3, x_36);
+x_38 = l_List_append___rarg(x_19, x_37);
+x_20 = x_38;
+goto block_25;
+}
+}
+block_25:
+{
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; 
+x_21 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_21, 0, x_8);
+lean_ctor_set(x_21, 1, x_6);
 x_5 = x_7;
-x_6 = x_19;
+x_6 = x_21;
 goto _start;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; 
+lean_object* x_23; lean_object* x_24; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_3);
 lean_dec(x_1);
-x_21 = l_List_eraseDups___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__1(x_18);
-x_22 = l_List_map___main___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__3(x_6, x_21);
-return x_22;
+x_23 = l_List_eraseDups___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__1(x_20);
+x_24 = l_List_map___main___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__3(x_6, x_23);
+return x_24;
 }
 }
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_3);
 lean_dec(x_1);
-x_29 = lean_ctor_get(x_15, 0);
-lean_inc(x_29);
+x_39 = lean_ctor_get(x_15, 0);
+lean_inc(x_39);
 lean_dec(x_15);
-x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_6);
-x_31 = lean_box(0);
-x_32 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_32, 0, x_30);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
+x_40 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_6);
+x_41 = lean_box(0);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
 }
 }
 else
 {
-lean_object* x_33; lean_object* x_34; 
+lean_object* x_43; lean_object* x_44; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_3);
 lean_dec(x_1);
-x_33 = l_List_eraseDups___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__1(x_14);
-x_34 = l_List_map___main___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__4(x_6, x_33);
-return x_34;
+x_43 = l_List_eraseDups___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__1(x_14);
+x_44 = l_List_map___main___at___private_Lean_Elab_ResolveName_5__resolveGlobalNameAux___main___spec__4(x_6, x_43);
+return x_44;
 }
 }
 else
 {
-lean_object* x_35; 
+lean_object* x_45; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_1);
-x_35 = lean_box(0);
-return x_35;
+x_45 = lean_box(0);
+return x_45;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/StructInst.c b/stage0/stdlib/Lean/Elab/StructInst.c
index 35edb198d0..99d991241d 100644
--- a/stage0/stdlib/Lean/Elab/StructInst.c
+++ b/stage0/stdlib/Lean/Elab/StructInst.c
@@ -180,6 +180,7 @@ lean_object* l_Lean_Elab_Term_StructInst_FieldLHS_toSyntax___boxed(lean_object*,
 lean_object* l___private_Lean_Elab_StructInst_17__groupFields___at___private_Lean_Elab_StructInst_19__expandStruct___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_FieldLHS_hasFormat(lean_object*);
 extern lean_object* l_Lean_mkTermIdFromIdent___closed__2;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 lean_object* l_List_mapM___main___at___private_Lean_Elab_StructInst_23__mkCtorHeader___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_Source_isNone___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_Struct_inhabited;
@@ -289,12 +290,10 @@ lean_object* l_Array_foldlStepMAux___main___at___private_Lean_Elab_StructInst_3_
 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*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___main___at___private_Lean_Elab_StructInst_9__expandNumLitFields___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 extern lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_findDefaultMissing_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_isRoundDone___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Term_StructInst_findField_x3f___lambda__1(lean_object*, lean_object*);
@@ -317,6 +316,7 @@ lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduce___main___lambda__2
 lean_object* l_Std_AssocList_find_x3f___main___at___private_Lean_Elab_StructInst_12__mkFieldMap___spec__2(lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isAppOfArity___main(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l_List_mapM___main___at___private_Lean_Elab_StructInst_9__expandNumLitFields___spec__1___closed__5;
 lean_object* l___private_Lean_Elab_StructInst_4__elabModifyOp___closed__18;
 extern lean_object* l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__10;
@@ -393,7 +393,6 @@ extern lean_object* l_Lean_Parser_Term_paren___elambda__1___closed__1;
 lean_object* l___private_Lean_Elab_StructInst_4__elabModifyOp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_StateT_Monad___rarg(lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_step___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at___private_Lean_Elab_StructInst_3__isModifyOp_x3f___spec__1___closed__2;
 lean_object* l_List_mapM___main___at___private_Lean_Elab_StructInst_9__expandNumLitFields___spec__1___closed__4;
@@ -534,6 +533,7 @@ lean_object* l___private_Lean_Elab_StructInst_21__getForallBody___main(lean_obje
 lean_object* l_Lean_Elab_Term_StructInst_FieldVal_toSyntax(lean_object*);
 lean_object* l_List_foldlM___main___at___private_Lean_Elab_StructInst_12__mkFieldMap___spec__10___closed__5;
 lean_object* l_Lean_findField_x3f___main(lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 lean_object* l___private_Lean_Elab_StructInst_5__getStructName___closed__1;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefaultAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_StructInst_DefaultFields_reduce___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1341,7 +1341,7 @@ lean_dec(x_5);
 x_17 = lean_ctor_get(x_15, 1);
 lean_inc(x_17);
 lean_dec(x_15);
-x_18 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_18 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_19 = l_unreachable_x21___rarg(x_18);
 x_20 = lean_apply_2(x_19, x_2, x_17);
 return x_20;
@@ -2376,12 +2376,12 @@ lean_ctor_set(x_77, 0, x_22);
 lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_75);
 lean_ctor_set(x_77, 3, x_21);
-x_78 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_78 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_79 = lean_array_push(x_78, x_77);
 x_80 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__4;
 x_81 = lean_array_push(x_79, x_80);
 x_82 = lean_array_push(x_81, x_42);
-x_83 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_83 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_84 = lean_array_push(x_82, x_83);
 x_85 = l_Lean_Parser_Term_namedArgument___elambda__1___closed__2;
 x_86 = lean_alloc_ctor(1, 2, 0);
@@ -2606,12 +2606,12 @@ lean_ctor_set(x_214, 0, x_203);
 lean_ctor_set(x_214, 1, x_213);
 lean_ctor_set(x_214, 2, x_212);
 lean_ctor_set(x_214, 3, x_202);
-x_215 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_215 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_216 = lean_array_push(x_215, x_214);
 x_217 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__4;
 x_218 = lean_array_push(x_216, x_217);
 x_219 = lean_array_push(x_218, x_188);
-x_220 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_220 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_221 = lean_array_push(x_219, x_220);
 x_222 = l_Lean_Parser_Term_namedArgument___elambda__1___closed__2;
 x_223 = lean_alloc_ctor(1, 2, 0);
@@ -11894,7 +11894,7 @@ lean_dec(x_1);
 x_8 = lean_ctor_get(x_2, 1);
 lean_inc(x_8);
 lean_dec(x_2);
-x_9 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_9 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_10 = l_unreachable_x21___rarg(x_9);
 lean_inc(x_3);
 x_11 = lean_apply_2(x_10, x_3, x_4);
@@ -12101,7 +12101,7 @@ lean_dec(x_1);
 x_58 = lean_ctor_get(x_2, 1);
 lean_inc(x_58);
 lean_dec(x_2);
-x_59 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_59 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_60 = l_unreachable_x21___rarg(x_59);
 lean_inc(x_3);
 x_61 = lean_apply_2(x_60, x_3, x_4);
@@ -12309,7 +12309,7 @@ lean_dec(x_1);
 x_109 = lean_ctor_get(x_2, 1);
 lean_inc(x_109);
 lean_dec(x_2);
-x_110 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__1;
+x_110 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_111 = l_unreachable_x21___rarg(x_110);
 lean_inc(x_3);
 x_112 = lean_apply_2(x_111, x_3, x_4);
@@ -24216,9 +24216,9 @@ x_20 = lean_array_push(x_12, x_19);
 x_21 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_21, 0, x_18);
 lean_ctor_set(x_21, 1, x_20);
-x_22 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_22 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_23 = lean_array_push(x_22, x_21);
-x_24 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_24 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_25 = lean_array_push(x_23, x_24);
 x_26 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_27 = lean_alloc_ctor(1, 2, 0);
diff --git a/stage0/stdlib/Lean/Elab/Structure.c b/stage0/stdlib/Lean/Elab/Structure.c
index dca9e4c0a2..d3d8b6d4e9 100644
--- a/stage0/stdlib/Lean/Elab/Structure.c
+++ b/stage0/stdlib/Lean/Elab/Structure.c
@@ -13,9 +13,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+extern lean_object* l_Lean_mkHole___closed__3;
 lean_object* l_Lean_Elab_Term_getEnv___rarg(lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___closed__2;
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -24,18 +24,21 @@ lean_object* l___private_Lean_Elab_Structure_6__findFieldInfo_x3f___boxed(lean_o
 lean_object* l_Lean_Elab_expandOptDeclSig(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__1;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__3;
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___boxed(lean_object*);
+lean_object* l_Lean_Elab_Command_StructFieldInfo_inhabited;
 lean_object* l_Lean_Name_eraseMacroScopes(lean_object*);
+lean_object* l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(lean_object*);
+lean_object* l_Lean_Elab_Command_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__4;
+lean_object* l_Lean_LocalDecl_userName(lean_object*);
 lean_object* l_unreachable_x21___rarg(lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3;
 lean_object* l___private_Lean_Elab_Structure_17__levelMVarToParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_22__collectLevelParamsInStructure___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_inferType(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__14;
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__5;
 uint8_t lean_name_eq(lean_object*, lean_object*);
@@ -43,31 +46,30 @@ lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___clos
 extern lean_object* l_Option_get_x21___rarg___closed__3;
 lean_object* l_Lean_Syntax_getIdAt(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__3;
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg___closed__1;
+lean_object* lean_array_fswap(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_type___elambda__1___closed__2;
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__4;
 lean_object* l_Lean_Elab_Command_withDeclId___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_12__removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Structure_14__levelMVarToParamFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
 lean_object* l___private_Lean_Elab_Command_6__mkTermContext(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_16__levelMVarToParamAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1;
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_3__setState(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_21__collectLevelParamsInFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkLambda(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
-lean_object* l___private_Lean_Elab_Structure_3__expandFields(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_3__expandFields(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_isInternalSubobjectFieldName(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__7;
 lean_object* l___private_Lean_Elab_Structure_11__getResultUniverse___closed__3;
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_shouldInferResultUniverse(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -78,7 +80,6 @@ lean_object* l___private_Lean_Elab_Structure_4__validStructType___boxed(lean_obj
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__8;
 lean_object* l___private_Lean_Elab_Term_3__fromMetaState(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___closed__4;
 lean_object* l_Lean_Elab_Term_ensureHasType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__4;
@@ -86,6 +87,7 @@ lean_object* l___private_Lean_Elab_Structure_22__collectLevelParamsInStructure(l
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_whnf(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_StructFieldInfo_isFromParent___boxed(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__2;
 extern lean_object* l_Array_forMAux___main___at_Lean_Meta_clear___spec__5___closed__8;
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_12__removeUnused___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -98,6 +100,7 @@ lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__12;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main(lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___closed__2;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__5;
+lean_object* l_Lean_LocalDecl_value(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__10;
 lean_object* l___private_Lean_Elab_Structure_9__withParents(lean_object*);
 uint8_t l___private_Lean_Elab_Structure_7__containsFieldName(lean_object*, lean_object*);
@@ -106,14 +109,15 @@ lean_object* l___private_Lean_Elab_Structure_13__withUsed(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_12__removeUnused___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__1;
+extern lean_object* l_Lean_Expr_Inhabited___closed__1;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields(lean_object*);
-lean_object* l_List_toString___at_Lean_Elab_OpenDecl_HasToString___spec__2(lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_Structure_15__levelMVarToParamFVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_type___elambda__1___closed__5;
 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_Name_append___main(lean_object*, lean_object*);
+lean_object* l_Array_shrink___main___rarg(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_21__collectLevelParamsInFVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_13__withUsed___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getStructureFieldsFlattened(lean_object*, lean_object*);
@@ -122,7 +126,11 @@ lean_object* l_Lean_Elab_Command_elabStructure___closed__8;
 lean_object* l___private_Lean_Elab_Structure_11__getResultUniverse___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_11__getResultUniverse___closed__1;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21(lean_object*, lean_object*, lean_object*);
+lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1;
 lean_object* l___private_Lean_Elab_Structure_16__levelMVarToParamAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_map___main___at_Lean_Meta_addGlobalInstance___spec__1(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__15;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__4;
@@ -131,38 +139,47 @@ lean_object* l_Lean_Elab_Command_elabStructure___closed__4;
 lean_object* l_Lean_Elab_Term_assignLevelMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__2;
 lean_object* l___private_Lean_Elab_Structure_1__defaultCtorName;
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__2;
 lean_object* l_Lean_Elab_Term_elabTermAux___main(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_elabStructure___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_2__expandCtor___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabStructure___lambda__3(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_LocalDecl_binderInfo(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_Structure_15__levelMVarToParamFVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_11__getResultUniverse(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_14__levelMVarToParamFVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_21__collectLevelParamsInFVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3;
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__1;
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_11__getResultUniverse___closed__2;
 lean_object* l_Lean_Elab_Command_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_20__collectLevelParamsInFVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLocalDecl___rarg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Meta_Exception_toTraceMessageData___closed__4;
 lean_object* l_Lean_Level_getOffsetAux___main(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___closed__5;
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main(lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_18__collectUniversesFromFields___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_13__withUsed___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_15__levelMVarToParamFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__9;
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__5;
 uint8_t l___private_Lean_Elab_Structure_4__validStructType(lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___closed__3;
 lean_object* l_Lean_Elab_Command_accLevelAtCtor___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_collectUsedFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__5;
 lean_object* l___private_Lean_Elab_Structure_19__updateResultingUniverse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__7;
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l___private_Lean_Elab_Structure_17__levelMVarToParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerClassAttr___closed__2;
 lean_object* l_Lean_Elab_Command_sortDeclLevelParams(lean_object*, lean_object*, lean_object*);
@@ -171,116 +188,207 @@ lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__11;
 extern lean_object* l___private_Lean_Elab_Quotation_5__explodeHeadPat___lambda__1___closed__2;
 lean_object* l___private_Lean_Elab_Command_2__getState(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__5;
+lean_object* l___private_Lean_Elab_Structure_26__mkProjections___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
-lean_object* l___private_Lean_Elab_Structure_2__expandCtor(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__3;
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__3;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__10;
 extern lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__1;
+lean_object* lean_mk_projections(lean_object*, lean_object*, lean_object*, uint8_t);
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_12__removeUnused___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_LocalDecl_type(lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8;
 lean_object* l_Lean_Elab_Term_levelMVarToParam_x27(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_inhabited;
 lean_object* l_Lean_Name_getString_x21(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__2;
 lean_object* l_Lean_Elab_Command_elabStructure___closed__6;
-lean_object* l___private_Lean_Elab_Structure_3__expandFields___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_3__expandFields___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_BinderInfo_beq(uint8_t, uint8_t);
 lean_object* l_Array_findMAux___main___at___private_Lean_Elab_Structure_6__findFieldInfo_x3f___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___closed__2;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__3;
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__2;
 lean_object* l___private_Lean_Elab_Command_7__mkTermState(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__7;
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___closed__1;
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*);
 extern lean_object* l_Lean_SourceInfo_inhabited___closed__1;
 lean_object* l_Lean_Elab_Command_getMainModule(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___closed__2;
 lean_object* l_Lean_Syntax_getKind(lean_object*);
-lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__8;
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__1;
 lean_object* l_Lean_Elab_Command_elabStructure___closed__1;
-lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_22__collectLevelParamsInStructure___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__6;
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__4;
 lean_object* l_Lean_Elab_Command_elabStructure(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Modifiers_addAttribute(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_structInstBinder___elambda__1___closed__2;
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_expandDeclSig(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__2;
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__11;
 lean_object* l_Lean_Elab_Term_elabType(lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Definition_1__removeUnused___closed__1;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__6;
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5;
+lean_object* l_Lean_mkForall(lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l_Array_filterAux___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__6;
 lean_object* l___private_Lean_Elab_Structure_20__collectLevelParamsInFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Command_mkDef___lambda__1___closed__5;
-lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_9__getVarDecls(lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
+lean_object* l_Lean_Elab_Command_getEnv(lean_object*, lean_object*);
 extern lean_object* l_Lean_TraceState_Inhabited___closed__1;
+uint8_t l_Lean_Elab_Command_StructFieldInfo_isFromParent(lean_object*);
 extern lean_object* l_Lean_prodToExpr___rarg___lambda__1___closed__3;
 lean_object* l___private_Lean_Elab_Structure_6__findFieldInfo_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabModifiers(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__1;
+lean_object* l___private_Lean_Elab_Structure_24__mkCtor___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toList___rarg(lean_object*);
 extern lean_object* l_Lean_Elab_Command_CtorView_inhabited___closed__1;
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_19__updateResultingUniverse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6;
 lean_object* l___private_Lean_Elab_Structure_22__collectLevelParamsInStructure___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_expr_abstract(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__13;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_setEnv(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__12;
+uint8_t l_Lean_Elab_Command_Modifiers_isProtected(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__1;
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Structure_16__levelMVarToParamAux___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Command_Modifiers_isPrivate(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_27__addProjections___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_10__withFields(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
+lean_object* l_Lean_Name_appendBefore(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_15__levelMVarToParamFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_mkOptionalNode___closed__2;
+lean_object* l___private_Lean_Elab_Structure_27__addProjections(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_21__collectLevelParamsInFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_inferImplicit___main(lean_object*, lean_object*, uint8_t);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___closed__3;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__1;
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___closed__3;
 lean_object* l___private_Lean_Elab_Structure_12__removeUnused___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9;
+lean_object* l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___closed__7;
 lean_object* l_Lean_Level_mkNaryMax___main(lean_object*);
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__2;
 extern lean_object* l_Lean_Parser_Command_structImplicitBinder___elambda__1___closed__2;
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4;
 lean_object* l_Lean_Meta_mkProjection___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_7__containsFieldName___boxed(lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_24__mkCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_Structure_16__levelMVarToParamAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_2__fromMetaException(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidInductiveModifier(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateLevelMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_CollectLevelParams_main___main(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Command_liftTermElabM___rarg___closed__1;
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___closed__3;
 lean_object* l_Array_findMAux___main___at___private_Lean_Elab_Structure_6__findFieldInfo_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_classTk___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__6;
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___closed__5;
 uint8_t lean_is_class(lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___closed__1;
 lean_object* l___private_Lean_Elab_Structure_18__collectUniversesFromFields___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___closed__3;
 uint8_t l_Lean_isStructure(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_18__collectUniversesFromFields(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_mkProjection___main___closed__3;
+lean_object* _init_l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; uint8_t x_4; uint8_t x_5; lean_object* x_6; 
+x_1 = lean_box(0);
+x_2 = lean_box(0);
+x_3 = l_Lean_Expr_Inhabited___closed__1;
+x_4 = 0;
+x_5 = 0;
+x_6 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_6, 0, x_2);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_1);
+lean_ctor_set_uint8(x_6, sizeof(void*)*4, x_4);
+lean_ctor_set_uint8(x_6, sizeof(void*)*4 + 1, x_5);
+return x_6;
+}
+}
+lean_object* _init_l_Lean_Elab_Command_StructFieldInfo_inhabited() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1;
+return x_1;
+}
+}
+uint8_t l_Lean_Elab_Command_StructFieldInfo_isFromParent(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_ctor_get_uint8(x_1, sizeof(void*)*4);
+x_3 = lean_box(x_2);
+if (lean_obj_tag(x_3) == 1)
+{
+uint8_t x_4; 
+x_4 = 1;
+return x_4;
+}
+else
+{
+uint8_t x_5; 
+lean_dec(x_3);
+x_5 = 0;
+return x_5;
+}
+}
+}
+lean_object* l_Lean_Elab_Command_StructFieldInfo_isFromParent___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Elab_Command_StructFieldInfo_isFromParent(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 lean_object* _init_l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1() {
 _start:
 {
@@ -299,302 +407,440 @@ x_1 = l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1;
 return x_1;
 }
 }
-lean_object* l___private_Lean_Elab_Structure_2__expandCtor(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__1() {
 _start:
 {
-lean_object* x_5; lean_object* x_6; uint8_t x_7; 
-x_5 = lean_unsigned_to_nat(6u);
-x_6 = l_Lean_Syntax_getArg(x_1, x_5);
-x_7 = l_Lean_Syntax_isNone(x_6);
-if (x_7 == 0)
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid 'protected' constructor in a 'private' structure");
+return x_1;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__2() {
+_start:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Structure_2__expandCtor___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___private_Lean_Elab_Structure_2__expandCtor___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Structure_2__expandCtor___closed__2;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__4() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid 'private' constructor in a 'private' structure");
+return x_1;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Structure_2__expandCtor___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Structure_2__expandCtor___closed__5;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_6 = lean_unsigned_to_nat(6u);
+x_7 = l_Lean_Syntax_getArg(x_1, x_6);
+x_8 = l_Lean_Syntax_isNone(x_7);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 lean_dec(x_1);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_Lean_Syntax_getArg(x_6, x_8);
-lean_dec(x_6);
-x_10 = l_Lean_Syntax_getArg(x_9, x_8);
-lean_inc(x_3);
-x_11 = l_Lean_Elab_Command_elabModifiers(x_10, x_3, x_4);
-lean_dec(x_10);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l_Lean_Syntax_getArg(x_7, x_9);
+lean_dec(x_7);
+x_11 = l_Lean_Syntax_getArg(x_10, x_9);
+lean_inc(x_4);
+x_12 = l_Lean_Elab_Command_elabModifiers(x_11, x_4, x_5);
 lean_dec(x_11);
-x_14 = lean_unsigned_to_nat(2u);
-x_15 = l_Lean_Syntax_getArg(x_9, x_14);
-x_16 = l_Lean_Syntax_isNone(x_15);
-lean_dec(x_15);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = l_Lean_Syntax_getIdAt(x_9, x_17);
-lean_inc(x_18);
-x_19 = l_Lean_Name_append___main(x_2, x_18);
-x_20 = lean_ctor_get_uint8(x_12, sizeof(void*)*2);
-lean_inc(x_3);
-x_21 = l_Lean_Elab_Command_checkValidCtorModifier(x_9, x_12, x_3, x_13);
+if (lean_obj_tag(x_12) == 0)
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; 
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = l_Lean_Elab_Command_Modifiers_isPrivate(x_13);
+x_16 = l_Lean_Elab_Command_Modifiers_isProtected(x_13);
+x_17 = lean_unsigned_to_nat(2u);
+x_18 = l_Lean_Syntax_getArg(x_10, x_17);
+x_19 = l_Lean_Syntax_isNone(x_18);
+lean_dec(x_18);
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = l_Lean_Syntax_getIdAt(x_10, x_20);
+lean_inc(x_21);
+x_22 = l_Lean_Name_append___main(x_3, x_21);
+x_23 = lean_ctor_get_uint8(x_13, sizeof(void*)*2);
+lean_inc(x_4);
+x_24 = l_Lean_Elab_Command_checkValidCtorModifier(x_10, x_13, x_4, x_14);
+if (x_15 == 0)
+{
+uint8_t x_78; 
+x_78 = 0;
+x_25 = x_78;
+goto block_77;
+}
+else
+{
+uint8_t x_79; 
+x_79 = l_Lean_Elab_Command_Modifiers_isPrivate(x_2);
+x_25 = x_79;
+goto block_77;
+}
+block_77:
+{
+uint8_t x_26; 
+if (x_25 == 0)
+{
+uint8_t x_75; 
+x_75 = 0;
+x_26 = x_75;
+goto block_74;
+}
+else
+{
+uint8_t x_76; 
+x_76 = 1;
+x_26 = x_76;
+goto block_74;
+}
+block_74:
+{
+uint8_t x_27; 
 if (x_16 == 0)
 {
-if (lean_obj_tag(x_21) == 0)
+uint8_t x_72; 
+x_72 = 0;
+x_27 = x_72;
+goto block_71;
+}
+else
 {
-lean_object* x_22; lean_object* x_23; 
-x_22 = lean_ctor_get(x_21, 1);
-lean_inc(x_22);
+uint8_t x_73; 
+x_73 = l_Lean_Elab_Command_Modifiers_isPrivate(x_2);
+x_27 = x_73;
+goto block_71;
+}
+block_71:
+{
+uint8_t x_28; 
+if (x_27 == 0)
+{
+uint8_t x_69; 
+x_69 = 0;
+x_28 = x_69;
+goto block_68;
+}
+else
+{
+uint8_t x_70; 
+x_70 = 1;
+x_28 = x_70;
+goto block_68;
+}
+block_68:
+{
+uint8_t x_29; lean_object* x_30; 
+if (x_19 == 0)
+{
+if (lean_obj_tag(x_24) == 0)
+{
+lean_object* x_56; uint8_t x_57; 
+x_56 = lean_ctor_get(x_24, 1);
+lean_inc(x_56);
+lean_dec(x_24);
+x_57 = 1;
+x_29 = x_57;
+x_30 = x_56;
+goto block_55;
+}
+else
+{
+uint8_t x_58; 
+lean_dec(x_22);
 lean_dec(x_21);
-x_23 = l_Lean_Elab_Command_applyVisibility(x_9, x_20, x_19, x_3, x_22);
-if (lean_obj_tag(x_23) == 0)
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_4);
+x_58 = !lean_is_exclusive(x_24);
+if (x_58 == 0)
 {
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
-{
-lean_object* x_25; uint8_t x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_23, 0);
-x_26 = 1;
-x_27 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_27, 0, x_9);
-lean_ctor_set(x_27, 1, x_12);
-lean_ctor_set(x_27, 2, x_18);
-lean_ctor_set(x_27, 3, x_25);
-lean_ctor_set_uint8(x_27, sizeof(void*)*4, x_26);
-lean_ctor_set(x_23, 0, x_27);
-return x_23;
+return x_24;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; 
-x_28 = lean_ctor_get(x_23, 0);
-x_29 = lean_ctor_get(x_23, 1);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_23);
-x_30 = 1;
-x_31 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_31, 0, x_9);
-lean_ctor_set(x_31, 1, x_12);
-lean_ctor_set(x_31, 2, x_18);
-lean_ctor_set(x_31, 3, x_28);
-lean_ctor_set_uint8(x_31, sizeof(void*)*4, x_30);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_29);
-return x_32;
-}
-}
-else
-{
-uint8_t x_33; 
-lean_dec(x_18);
-lean_dec(x_12);
-lean_dec(x_9);
-x_33 = !lean_is_exclusive(x_23);
-if (x_33 == 0)
-{
-return x_23;
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_23, 0);
-x_35 = lean_ctor_get(x_23, 1);
-lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_23);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_59 = lean_ctor_get(x_24, 0);
+x_60 = lean_ctor_get(x_24, 1);
+lean_inc(x_60);
+lean_inc(x_59);
+lean_dec(x_24);
+x_61 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_61, 0, x_59);
+lean_ctor_set(x_61, 1, x_60);
+return x_61;
 }
 }
 }
 else
 {
-uint8_t x_37; 
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_12);
-lean_dec(x_9);
-lean_dec(x_3);
-x_37 = !lean_is_exclusive(x_21);
-if (x_37 == 0)
+if (lean_obj_tag(x_24) == 0)
 {
-return x_21;
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_21, 0);
-x_39 = lean_ctor_get(x_21, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_21);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
-}
-}
-}
-else
-{
-if (lean_obj_tag(x_21) == 0)
-{
-lean_object* x_41; lean_object* x_42; 
-x_41 = lean_ctor_get(x_21, 1);
-lean_inc(x_41);
-lean_dec(x_21);
-x_42 = l_Lean_Elab_Command_applyVisibility(x_9, x_20, x_19, x_3, x_41);
-if (lean_obj_tag(x_42) == 0)
-{
-uint8_t x_43; 
-x_43 = !lean_is_exclusive(x_42);
-if (x_43 == 0)
-{
-lean_object* x_44; uint8_t x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_42, 0);
-x_45 = 0;
-x_46 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_46, 0, x_9);
-lean_ctor_set(x_46, 1, x_12);
-lean_ctor_set(x_46, 2, x_18);
-lean_ctor_set(x_46, 3, x_44);
-lean_ctor_set_uint8(x_46, sizeof(void*)*4, x_45);
-lean_ctor_set(x_42, 0, x_46);
-return x_42;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; uint8_t x_49; lean_object* x_50; lean_object* x_51; 
-x_47 = lean_ctor_get(x_42, 0);
-x_48 = lean_ctor_get(x_42, 1);
-lean_inc(x_48);
-lean_inc(x_47);
-lean_dec(x_42);
-x_49 = 0;
-x_50 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_50, 0, x_9);
-lean_ctor_set(x_50, 1, x_12);
-lean_ctor_set(x_50, 2, x_18);
-lean_ctor_set(x_50, 3, x_47);
-lean_ctor_set_uint8(x_50, sizeof(void*)*4, x_49);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_48);
-return x_51;
-}
-}
-else
-{
-uint8_t x_52; 
-lean_dec(x_18);
-lean_dec(x_12);
-lean_dec(x_9);
-x_52 = !lean_is_exclusive(x_42);
-if (x_52 == 0)
-{
-return x_42;
-}
-else
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_53 = lean_ctor_get(x_42, 0);
-x_54 = lean_ctor_get(x_42, 1);
-lean_inc(x_54);
-lean_inc(x_53);
-lean_dec(x_42);
-x_55 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_55, 0, x_53);
-lean_ctor_set(x_55, 1, x_54);
-return x_55;
-}
-}
-}
-else
-{
-uint8_t x_56; 
-lean_dec(x_19);
-lean_dec(x_18);
-lean_dec(x_12);
-lean_dec(x_9);
-lean_dec(x_3);
-x_56 = !lean_is_exclusive(x_21);
-if (x_56 == 0)
-{
-return x_21;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_ctor_get(x_21, 0);
-x_58 = lean_ctor_get(x_21, 1);
-lean_inc(x_58);
-lean_inc(x_57);
-lean_dec(x_21);
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_57);
-lean_ctor_set(x_59, 1, x_58);
-return x_59;
-}
-}
-}
-}
-else
-{
-uint8_t x_60; 
-lean_dec(x_9);
-lean_dec(x_3);
-x_60 = !lean_is_exclusive(x_11);
-if (x_60 == 0)
-{
-return x_11;
-}
-else
-{
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_ctor_get(x_11, 0);
-x_62 = lean_ctor_get(x_11, 1);
+lean_object* x_62; uint8_t x_63; 
+x_62 = lean_ctor_get(x_24, 1);
 lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_11);
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_61);
-lean_ctor_set(x_63, 1, x_62);
-return x_63;
+lean_dec(x_24);
+x_63 = 0;
+x_29 = x_63;
+x_30 = x_62;
+goto block_55;
+}
+else
+{
+uint8_t x_64; 
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_4);
+x_64 = !lean_is_exclusive(x_24);
+if (x_64 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_24, 0);
+x_66 = lean_ctor_get(x_24, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_24);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
+}
+}
+}
+block_55:
+{
+if (x_26 == 0)
+{
+if (x_28 == 0)
+{
+lean_object* x_31; 
+x_31 = l_Lean_Elab_Command_applyVisibility(x_10, x_23, x_22, x_4, x_30);
+if (lean_obj_tag(x_31) == 0)
+{
+uint8_t x_32; 
+x_32 = !lean_is_exclusive(x_31);
+if (x_32 == 0)
+{
+lean_object* x_33; lean_object* x_34; 
+x_33 = lean_ctor_get(x_31, 0);
+x_34 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_34, 0, x_10);
+lean_ctor_set(x_34, 1, x_13);
+lean_ctor_set(x_34, 2, x_21);
+lean_ctor_set(x_34, 3, x_33);
+lean_ctor_set_uint8(x_34, sizeof(void*)*4, x_29);
+lean_ctor_set(x_31, 0, x_34);
+return x_31;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_ctor_get(x_31, 0);
+x_36 = lean_ctor_get(x_31, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_31);
+x_37 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_37, 0, x_10);
+lean_ctor_set(x_37, 1, x_13);
+lean_ctor_set(x_37, 2, x_21);
+lean_ctor_set(x_37, 3, x_35);
+lean_ctor_set_uint8(x_37, sizeof(void*)*4, x_29);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+return x_38;
+}
+}
+else
+{
+uint8_t x_39; 
+lean_dec(x_21);
+lean_dec(x_13);
+lean_dec(x_10);
+x_39 = !lean_is_exclusive(x_31);
+if (x_39 == 0)
+{
+return x_31;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_31, 0);
+x_41 = lean_ctor_get(x_31, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_31);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
 }
 }
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; lean_object* x_69; 
-lean_dec(x_6);
-lean_dec(x_3);
-x_64 = l___private_Lean_Elab_Structure_1__defaultCtorName;
-x_65 = l_Lean_Name_append___main(x_2, x_64);
-x_66 = l_Lean_Elab_Command_CtorView_inhabited___closed__1;
-x_67 = 0;
-x_68 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_68, 0, x_1);
-lean_ctor_set(x_68, 1, x_66);
-lean_ctor_set(x_68, 2, x_64);
-lean_ctor_set(x_68, 3, x_65);
-lean_ctor_set_uint8(x_68, sizeof(void*)*4, x_67);
-x_69 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_69, 0, x_68);
-lean_ctor_set(x_69, 1, x_4);
-return x_69;
+lean_object* x_43; lean_object* x_44; uint8_t x_45; 
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_13);
+x_43 = l___private_Lean_Elab_Structure_2__expandCtor___closed__3;
+x_44 = l_Lean_Elab_Command_throwError___rarg(x_10, x_43, x_4, x_30);
+lean_dec(x_10);
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
+{
+return x_44;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_44, 0);
+x_47 = lean_ctor_get(x_44, 1);
+lean_inc(x_47);
+lean_inc(x_46);
+lean_dec(x_44);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_2__expandCtor___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+else
+{
+lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+lean_dec(x_22);
+lean_dec(x_21);
+lean_dec(x_13);
+x_49 = l___private_Lean_Elab_Structure_2__expandCtor___closed__6;
+x_50 = l_Lean_Elab_Command_throwError___rarg(x_10, x_49, x_4, x_30);
+lean_dec(x_10);
+x_51 = !lean_is_exclusive(x_50);
+if (x_51 == 0)
+{
+return x_50;
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_50, 0);
+x_53 = lean_ctor_get(x_50, 1);
+lean_inc(x_53);
+lean_inc(x_52);
+lean_dec(x_50);
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_52);
+lean_ctor_set(x_54, 1, x_53);
+return x_54;
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_80; 
+lean_dec(x_10);
+lean_dec(x_4);
+x_80 = !lean_is_exclusive(x_12);
+if (x_80 == 0)
+{
+return x_12;
+}
+else
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_12, 0);
+x_82 = lean_ctor_get(x_12, 1);
+lean_inc(x_82);
+lean_inc(x_81);
+lean_dec(x_12);
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
+}
+}
+}
+else
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; uint8_t x_87; lean_object* x_88; lean_object* x_89; 
+lean_dec(x_7);
+lean_dec(x_4);
+x_84 = l___private_Lean_Elab_Structure_1__defaultCtorName;
+x_85 = l_Lean_Name_append___main(x_3, x_84);
+x_86 = l_Lean_Elab_Command_CtorView_inhabited___closed__1;
+x_87 = 0;
+x_88 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_88, 0, x_1);
+lean_ctor_set(x_88, 1, x_86);
+lean_ctor_set(x_88, 2, x_84);
+lean_ctor_set(x_88, 3, x_85);
+lean_ctor_set_uint8(x_88, sizeof(void*)*4, x_87);
+x_89 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_89, 0, x_88);
+lean_ctor_set(x_89, 1, x_5);
+return x_89;
+}
+}
+}
+lean_object* l___private_Lean_Elab_Structure_2__expandCtor___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; 
-x_5 = l___private_Lean_Elab_Structure_2__expandCtor(x_1, x_2, x_3, x_4);
+lean_object* x_6; 
+x_6 = l___private_Lean_Elab_Structure_2__expandCtor(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_3);
 lean_dec(x_2);
-return x_5;
+return x_6;
 }
 }
 lean_object* _init_l_Lean_Elab_Command_checkValidFieldModifier___closed__1() {
@@ -1216,7 +1462,7 @@ lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("unexpected kind of structure field");
+x_1 = lean_mk_string("invalid 'protected' field in a 'private' structure");
 return x_1;
 }
 }
@@ -1240,420 +1486,587 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4() {
 _start:
 {
-lean_object* x_8; uint8_t x_9; 
-x_8 = lean_array_get_size(x_3);
-x_9 = lean_nat_dec_lt(x_4, x_8);
-lean_dec(x_8);
-if (x_9 == 0)
-{
-lean_object* x_10; 
-lean_dec(x_6);
-lean_dec(x_4);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_5);
-lean_ctor_set(x_10, 1, x_7);
-return x_10;
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid 'private' field in a 'private' structure");
+return x_1;
 }
-else
+}
+lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5() {
+_start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_100; lean_object* x_101; uint8_t x_102; 
-x_11 = lean_array_fget(x_3, x_4);
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_nat_add(x_4, x_12);
-lean_dec(x_4);
-lean_inc(x_11);
-x_100 = l_Lean_Syntax_getKind(x_11);
-x_101 = l_Lean_Parser_Command_structExplicitBinder___elambda__1___closed__2;
-x_102 = lean_name_eq(x_100, x_101);
-if (x_102 == 0)
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6() {
+_start:
 {
-lean_object* x_103; uint8_t x_104; 
-x_103 = l_Lean_Parser_Command_structImplicitBinder___elambda__1___closed__2;
-x_104 = lean_name_eq(x_100, x_103);
-if (x_104 == 0)
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__7() {
+_start:
 {
-lean_object* x_105; uint8_t x_106; 
-x_105 = l_Lean_Parser_Command_structInstBinder___elambda__1___closed__2;
-x_106 = lean_name_eq(x_100, x_105);
-lean_dec(x_100);
-if (x_106 == 0)
+lean_object* x_1; 
+x_1 = lean_mk_string("unexpected kind of structure field");
+return x_1;
+}
+}
+lean_object* _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8() {
+_start:
 {
-lean_object* x_107; lean_object* x_108; uint8_t x_109; 
-lean_dec(x_13);
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___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_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_array_get_size(x_4);
+x_10 = lean_nat_dec_lt(x_5, x_9);
+lean_dec(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_7);
 lean_dec(x_5);
-x_107 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3;
-x_108 = l_Lean_Elab_Command_throwError___rarg(x_11, x_107, x_6, x_7);
-lean_dec(x_11);
-x_109 = !lean_is_exclusive(x_108);
-if (x_109 == 0)
-{
-return x_108;
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_6);
+lean_ctor_set(x_11, 1, x_8);
+return x_11;
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; 
-x_110 = lean_ctor_get(x_108, 0);
-x_111 = lean_ctor_get(x_108, 1);
-lean_inc(x_111);
-lean_inc(x_110);
-lean_dec(x_108);
-x_112 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_112, 0, x_110);
-lean_ctor_set(x_112, 1, x_111);
-return x_112;
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_128; lean_object* x_129; uint8_t x_130; 
+x_12 = lean_array_fget(x_4, x_5);
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = lean_nat_add(x_5, x_13);
+lean_dec(x_5);
+lean_inc(x_12);
+x_128 = l_Lean_Syntax_getKind(x_12);
+x_129 = l_Lean_Parser_Command_structExplicitBinder___elambda__1___closed__2;
+x_130 = lean_name_eq(x_128, x_129);
+if (x_130 == 0)
+{
+lean_object* x_131; uint8_t x_132; 
+x_131 = l_Lean_Parser_Command_structImplicitBinder___elambda__1___closed__2;
+x_132 = lean_name_eq(x_128, x_131);
+if (x_132 == 0)
+{
+lean_object* x_133; uint8_t x_134; 
+x_133 = l_Lean_Parser_Command_structInstBinder___elambda__1___closed__2;
+x_134 = lean_name_eq(x_128, x_133);
+lean_dec(x_128);
+if (x_134 == 0)
+{
+lean_object* x_135; lean_object* x_136; uint8_t x_137; 
+lean_dec(x_14);
+lean_dec(x_6);
+x_135 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9;
+x_136 = l_Lean_Elab_Command_throwError___rarg(x_12, x_135, x_7, x_8);
+lean_dec(x_12);
+x_137 = !lean_is_exclusive(x_136);
+if (x_137 == 0)
+{
+return x_136;
 }
+else
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+x_138 = lean_ctor_get(x_136, 0);
+x_139 = lean_ctor_get(x_136, 1);
+lean_inc(x_139);
+lean_inc(x_138);
+lean_dec(x_136);
+x_140 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_140, 0, x_138);
+lean_ctor_set(x_140, 1, x_139);
+return x_140;
+}
+}
+else
+{
+uint8_t x_141; 
+x_141 = 3;
+x_15 = x_141;
+x_16 = x_8;
+goto block_127;
+}
+}
+else
+{
+uint8_t x_142; 
+lean_dec(x_128);
+x_142 = 1;
+x_15 = x_142;
+x_16 = x_8;
+goto block_127;
+}
+}
+else
+{
+uint8_t x_143; 
+lean_dec(x_128);
+x_143 = 0;
+x_15 = x_143;
+x_16 = x_8;
+goto block_127;
+}
+block_127:
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_unsigned_to_nat(0u);
+x_18 = l_Lean_Syntax_getArg(x_12, x_17);
+lean_inc(x_7);
+x_19 = l_Lean_Elab_Command_elabModifiers(x_18, x_7, x_16);
+lean_dec(x_18);
+if (lean_obj_tag(x_19) == 0)
+{
+lean_object* x_20; lean_object* x_21; uint8_t x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; uint8_t x_27; uint8_t x_28; lean_object* x_29; uint8_t x_30; 
+x_20 = lean_ctor_get(x_19, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_19, 1);
+lean_inc(x_21);
+lean_dec(x_19);
+x_22 = l_Lean_Elab_Command_Modifiers_isPrivate(x_20);
+x_23 = l_Lean_Elab_Command_Modifiers_isProtected(x_20);
+x_24 = lean_unsigned_to_nat(3u);
+x_25 = l_Lean_Syntax_getArg(x_12, x_24);
+x_26 = l_Lean_Syntax_isNone(x_25);
+lean_dec(x_25);
+x_27 = 0;
+x_28 = l_Lean_BinderInfo_beq(x_15, x_27);
+lean_inc(x_7);
+x_29 = l_Lean_Elab_Command_checkValidFieldModifier(x_12, x_20, x_7, x_21);
+if (x_22 == 0)
+{
+uint8_t x_121; 
+x_121 = 0;
+x_30 = x_121;
+goto block_120;
+}
+else
+{
+uint8_t x_122; 
+x_122 = l_Lean_Elab_Command_Modifiers_isPrivate(x_2);
+x_30 = x_122;
+goto block_120;
+}
+block_120:
+{
+uint8_t x_31; 
+if (x_30 == 0)
+{
+uint8_t x_118; 
+x_118 = 0;
+x_31 = x_118;
+goto block_117;
+}
+else
+{
+uint8_t x_119; 
+x_119 = 1;
+x_31 = x_119;
+goto block_117;
+}
+block_117:
+{
+uint8_t x_32; 
+if (x_23 == 0)
+{
+uint8_t x_115; 
+x_115 = 0;
+x_32 = x_115;
+goto block_114;
+}
+else
+{
+uint8_t x_116; 
+x_116 = l_Lean_Elab_Command_Modifiers_isPrivate(x_2);
+x_32 = x_116;
+goto block_114;
+}
+block_114:
+{
+uint8_t x_33; 
+if (x_32 == 0)
+{
+uint8_t x_112; 
+x_112 = 0;
+x_33 = x_112;
+goto block_111;
 }
 else
 {
 uint8_t x_113; 
-x_113 = 3;
-x_14 = x_113;
-x_15 = x_7;
-goto block_99;
+x_113 = 1;
+x_33 = x_113;
+goto block_111;
+}
+block_111:
+{
+uint8_t x_34; 
+if (x_26 == 0)
+{
+uint8_t x_109; 
+x_109 = 1;
+x_34 = x_109;
+goto block_108;
+}
+else
+{
+uint8_t x_110; 
+x_110 = 0;
+x_34 = x_110;
+goto block_108;
+}
+block_108:
+{
+lean_object* x_35; 
+if (x_28 == 0)
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; 
+x_95 = lean_unsigned_to_nat(4u);
+x_96 = l_Lean_Syntax_getArg(x_12, x_95);
+x_97 = l_Lean_Elab_expandDeclSig(x_96);
+lean_dec(x_96);
+x_98 = !lean_is_exclusive(x_97);
+if (x_98 == 0)
+{
+lean_object* x_99; lean_object* x_100; 
+x_99 = lean_ctor_get(x_97, 1);
+x_100 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_100, 0, x_99);
+lean_ctor_set(x_97, 1, x_100);
+x_35 = x_97;
+goto block_94;
+}
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_101 = lean_ctor_get(x_97, 0);
+x_102 = lean_ctor_get(x_97, 1);
+lean_inc(x_102);
+lean_inc(x_101);
+lean_dec(x_97);
+x_103 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_103, 0, x_102);
+x_104 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_101);
+lean_ctor_set(x_104, 1, x_103);
+x_35 = x_104;
+goto block_94;
 }
 }
 else
 {
-uint8_t x_114; 
-lean_dec(x_100);
-x_114 = 1;
-x_14 = x_114;
-x_15 = x_7;
-goto block_99;
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_unsigned_to_nat(4u);
+x_106 = l_Lean_Syntax_getArg(x_12, x_105);
+x_107 = l_Lean_Elab_expandOptDeclSig(x_106);
+lean_dec(x_106);
+x_35 = x_107;
+goto block_94;
 }
-}
-else
+block_94:
 {
-uint8_t x_115; 
-lean_dec(x_100);
-x_115 = 0;
-x_14 = x_115;
-x_15 = x_7;
-goto block_99;
-}
-block_99:
+lean_object* x_36; 
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_unsigned_to_nat(0u);
-x_17 = l_Lean_Syntax_getArg(x_11, x_16);
-lean_inc(x_6);
-x_18 = l_Lean_Elab_Command_elabModifiers(x_17, x_6, x_15);
-lean_dec(x_17);
-if (lean_obj_tag(x_18) == 0)
+if (x_31 == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; uint8_t x_24; uint8_t x_25; lean_object* x_26; uint8_t x_27; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
-lean_inc(x_20);
-lean_dec(x_18);
-x_21 = lean_unsigned_to_nat(3u);
-x_22 = l_Lean_Syntax_getArg(x_11, x_21);
-x_23 = l_Lean_Syntax_isNone(x_22);
-lean_dec(x_22);
-x_24 = 0;
-x_25 = l_Lean_BinderInfo_beq(x_14, x_24);
-lean_inc(x_6);
-x_26 = l_Lean_Elab_Command_checkValidFieldModifier(x_11, x_19, x_6, x_20);
-if (x_23 == 0)
+if (x_33 == 0)
 {
-uint8_t x_93; 
-x_93 = 1;
-x_27 = x_93;
-goto block_92;
-}
-else
-{
-uint8_t x_94; 
-x_94 = 0;
-x_27 = x_94;
-goto block_92;
-}
-block_92:
-{
-lean_object* x_28; lean_object* x_29; 
-if (x_25 == 0)
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_unsigned_to_nat(4u);
-x_69 = l_Lean_Syntax_getArg(x_11, x_68);
-x_70 = l_Lean_Elab_expandDeclSig(x_69);
-lean_dec(x_69);
-if (lean_obj_tag(x_26) == 0)
-{
-uint8_t x_71; 
-x_71 = !lean_is_exclusive(x_70);
-if (x_71 == 0)
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_70, 1);
-x_73 = lean_ctor_get(x_26, 1);
-lean_inc(x_73);
-lean_dec(x_26);
-x_74 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_70, 1, x_74);
-x_28 = x_70;
-x_29 = x_73;
-goto block_67;
-}
-else
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_75 = lean_ctor_get(x_70, 0);
-x_76 = lean_ctor_get(x_70, 1);
-lean_inc(x_76);
+lean_object* x_75; 
+x_75 = lean_ctor_get(x_29, 1);
 lean_inc(x_75);
-lean_dec(x_70);
-x_77 = lean_ctor_get(x_26, 1);
-lean_inc(x_77);
-lean_dec(x_26);
-x_78 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_78, 0, x_76);
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_75);
-lean_ctor_set(x_79, 1, x_78);
-x_28 = x_79;
-x_29 = x_77;
-goto block_67;
-}
+lean_dec(x_29);
+x_36 = x_75;
+goto block_74;
 }
 else
 {
-uint8_t x_80; 
-lean_dec(x_70);
-lean_dec(x_19);
-lean_dec(x_13);
-lean_dec(x_11);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_79; 
+lean_dec(x_35);
+lean_dec(x_20);
+lean_dec(x_14);
 lean_dec(x_6);
-lean_dec(x_5);
-x_80 = !lean_is_exclusive(x_26);
-if (x_80 == 0)
+x_76 = lean_ctor_get(x_29, 1);
+lean_inc(x_76);
+lean_dec(x_29);
+x_77 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3;
+x_78 = l_Lean_Elab_Command_throwError___rarg(x_12, x_77, x_7, x_76);
+lean_dec(x_12);
+x_79 = !lean_is_exclusive(x_78);
+if (x_79 == 0)
 {
-return x_26;
+return x_78;
 }
 else
 {
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_26, 0);
-x_82 = lean_ctor_get(x_26, 1);
-lean_inc(x_82);
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_78, 0);
+x_81 = lean_ctor_get(x_78, 1);
 lean_inc(x_81);
-lean_dec(x_26);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
+lean_inc(x_80);
+lean_dec(x_78);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
 }
 }
 }
 else
 {
-if (lean_obj_tag(x_26) == 0)
-{
-lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_84 = lean_ctor_get(x_26, 1);
-lean_inc(x_84);
-lean_dec(x_26);
-x_85 = lean_unsigned_to_nat(4u);
-x_86 = l_Lean_Syntax_getArg(x_11, x_85);
-x_87 = l_Lean_Elab_expandOptDeclSig(x_86);
-lean_dec(x_86);
-x_28 = x_87;
-x_29 = x_84;
-goto block_67;
-}
-else
-{
-uint8_t x_88; 
-lean_dec(x_19);
-lean_dec(x_13);
-lean_dec(x_11);
+lean_object* x_83; lean_object* x_84; lean_object* x_85; uint8_t x_86; 
+lean_dec(x_35);
+lean_dec(x_20);
+lean_dec(x_14);
 lean_dec(x_6);
-lean_dec(x_5);
-x_88 = !lean_is_exclusive(x_26);
-if (x_88 == 0)
+x_83 = lean_ctor_get(x_29, 1);
+lean_inc(x_83);
+lean_dec(x_29);
+x_84 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6;
+x_85 = l_Lean_Elab_Command_throwError___rarg(x_12, x_84, x_7, x_83);
+lean_dec(x_12);
+x_86 = !lean_is_exclusive(x_85);
+if (x_86 == 0)
 {
-return x_26;
+return x_85;
 }
 else
 {
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_26, 0);
-x_90 = lean_ctor_get(x_26, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_26);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_85, 0);
+x_88 = lean_ctor_get(x_85, 1);
+lean_inc(x_88);
+lean_inc(x_87);
+lean_dec(x_85);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_87);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
 }
 }
 }
-block_67:
+else
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_30 = lean_ctor_get(x_28, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_28, 1);
-lean_inc(x_31);
-lean_dec(x_28);
-x_32 = lean_unsigned_to_nat(2u);
-x_33 = l_Lean_Syntax_getArg(x_11, x_32);
-x_34 = l_Lean_Syntax_getArgs(x_33);
-lean_dec(x_33);
-if (x_25 == 0)
+uint8_t x_90; 
+lean_dec(x_35);
+lean_dec(x_20);
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_7);
+lean_dec(x_6);
+x_90 = !lean_is_exclusive(x_29);
+if (x_90 == 0)
 {
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_box(0);
-lean_inc(x_6);
-x_36 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_2, x_11, x_14, x_19, x_27, x_30, x_31, x_35, x_34, x_16, x_5, x_6, x_29);
-lean_dec(x_34);
-lean_dec(x_11);
-if (lean_obj_tag(x_36) == 0)
+return x_29;
+}
+else
 {
-lean_object* x_37; lean_object* x_38; 
-x_37 = lean_ctor_get(x_36, 0);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_29, 0);
+x_92 = lean_ctor_get(x_29, 1);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_dec(x_29);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
+}
+}
+block_74:
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_37 = lean_ctor_get(x_35, 0);
 lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
+x_38 = lean_ctor_get(x_35, 1);
 lean_inc(x_38);
-lean_dec(x_36);
-x_4 = x_13;
-x_5 = x_37;
-x_7 = x_38;
+lean_dec(x_35);
+x_39 = lean_unsigned_to_nat(2u);
+x_40 = l_Lean_Syntax_getArg(x_12, x_39);
+x_41 = l_Lean_Syntax_getArgs(x_40);
+lean_dec(x_40);
+if (x_28 == 0)
+{
+lean_object* x_42; lean_object* x_43; 
+x_42 = lean_box(0);
+lean_inc(x_7);
+x_43 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_3, x_12, x_15, x_20, x_34, x_37, x_38, x_42, x_41, x_17, x_6, x_7, x_36);
+lean_dec(x_41);
+lean_dec(x_12);
+if (lean_obj_tag(x_43) == 0)
+{
+lean_object* x_44; lean_object* x_45; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
+x_5 = x_14;
+x_6 = x_44;
+x_8 = x_45;
 goto _start;
 }
 else
 {
-uint8_t x_40; 
-lean_dec(x_13);
-lean_dec(x_6);
-x_40 = !lean_is_exclusive(x_36);
-if (x_40 == 0)
+uint8_t x_47; 
+lean_dec(x_14);
+lean_dec(x_7);
+x_47 = !lean_is_exclusive(x_43);
+if (x_47 == 0)
 {
-return x_36;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_36, 0);
-x_42 = lean_ctor_get(x_36, 1);
-lean_inc(x_42);
-lean_inc(x_41);
-lean_dec(x_36);
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_41);
-lean_ctor_set(x_43, 1, x_42);
 return x_43;
 }
-}
-}
 else
 {
-lean_object* x_44; lean_object* x_45; uint8_t x_46; 
-x_44 = lean_unsigned_to_nat(5u);
-x_45 = l_Lean_Syntax_getArg(x_11, x_44);
-x_46 = l_Lean_Syntax_isNone(x_45);
-if (x_46 == 0)
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_47 = l_Lean_Syntax_getArg(x_45, x_16);
-lean_dec(x_45);
-x_48 = l_Lean_Syntax_getArg(x_47, x_12);
-lean_dec(x_47);
-x_49 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-lean_inc(x_6);
-x_50 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_2, x_11, x_14, x_19, x_27, x_30, x_31, x_49, x_34, x_16, x_5, x_6, x_29);
-lean_dec(x_34);
-lean_dec(x_11);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_51; lean_object* x_52; 
-x_51 = lean_ctor_get(x_50, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_50, 1);
-lean_inc(x_52);
-lean_dec(x_50);
-x_4 = x_13;
-x_5 = x_51;
-x_7 = x_52;
-goto _start;
-}
-else
-{
-uint8_t x_54; 
-lean_dec(x_13);
-lean_dec(x_6);
-x_54 = !lean_is_exclusive(x_50);
-if (x_54 == 0)
-{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_48 = lean_ctor_get(x_43, 0);
+x_49 = lean_ctor_get(x_43, 1);
+lean_inc(x_49);
+lean_inc(x_48);
+lean_dec(x_43);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_48);
+lean_ctor_set(x_50, 1, x_49);
 return x_50;
 }
+}
+}
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_50, 0);
-x_56 = lean_ctor_get(x_50, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_50);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
-}
-}
-}
-else
+lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_51 = lean_unsigned_to_nat(5u);
+x_52 = l_Lean_Syntax_getArg(x_12, x_51);
+x_53 = l_Lean_Syntax_isNone(x_52);
+if (x_53 == 0)
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_54 = l_Lean_Syntax_getArg(x_52, x_17);
+lean_dec(x_52);
+x_55 = l_Lean_Syntax_getArg(x_54, x_13);
+lean_dec(x_54);
+x_56 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_inc(x_7);
+x_57 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_3, x_12, x_15, x_20, x_34, x_37, x_38, x_56, x_41, x_17, x_6, x_7, x_36);
+lean_dec(x_41);
+lean_dec(x_12);
+if (lean_obj_tag(x_57) == 0)
 {
 lean_object* x_58; lean_object* x_59; 
-lean_dec(x_45);
-x_58 = lean_box(0);
-lean_inc(x_6);
-x_59 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_2, x_11, x_14, x_19, x_27, x_30, x_31, x_58, x_34, x_16, x_5, x_6, x_29);
-lean_dec(x_34);
-lean_dec(x_11);
-if (lean_obj_tag(x_59) == 0)
-{
-lean_object* x_60; lean_object* x_61; 
-x_60 = lean_ctor_get(x_59, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_59, 1);
-lean_inc(x_61);
-lean_dec(x_59);
-x_4 = x_13;
-x_5 = x_60;
-x_7 = x_61;
+x_58 = lean_ctor_get(x_57, 0);
+lean_inc(x_58);
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+x_5 = x_14;
+x_6 = x_58;
+x_8 = x_59;
 goto _start;
 }
 else
 {
-uint8_t x_63; 
-lean_dec(x_13);
-lean_dec(x_6);
-x_63 = !lean_is_exclusive(x_59);
-if (x_63 == 0)
+uint8_t x_61; 
+lean_dec(x_14);
+lean_dec(x_7);
+x_61 = !lean_is_exclusive(x_57);
+if (x_61 == 0)
 {
-return x_59;
+return x_57;
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_59, 0);
-x_65 = lean_ctor_get(x_59, 1);
-lean_inc(x_65);
-lean_inc(x_64);
-lean_dec(x_59);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_57, 0);
+x_63 = lean_ctor_get(x_57, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_57);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_62);
+lean_ctor_set(x_64, 1, x_63);
+return x_64;
+}
+}
+}
+else
+{
+lean_object* x_65; lean_object* x_66; 
+lean_dec(x_52);
+x_65 = lean_box(0);
+lean_inc(x_7);
+x_66 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1(x_3, x_12, x_15, x_20, x_34, x_37, x_38, x_65, x_41, x_17, x_6, x_7, x_36);
+lean_dec(x_41);
+lean_dec(x_12);
+if (lean_obj_tag(x_66) == 0)
+{
+lean_object* x_67; lean_object* x_68; 
+x_67 = lean_ctor_get(x_66, 0);
+lean_inc(x_67);
+x_68 = lean_ctor_get(x_66, 1);
+lean_inc(x_68);
+lean_dec(x_66);
+x_5 = x_14;
+x_6 = x_67;
+x_8 = x_68;
+goto _start;
+}
+else
+{
+uint8_t x_70; 
+lean_dec(x_14);
+lean_dec(x_7);
+x_70 = !lean_is_exclusive(x_66);
+if (x_70 == 0)
+{
 return x_66;
 }
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_71 = lean_ctor_get(x_66, 0);
+x_72 = lean_ctor_get(x_66, 1);
+lean_inc(x_72);
+lean_inc(x_71);
+lean_dec(x_66);
+x_73 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_73, 0, x_71);
+lean_ctor_set(x_73, 1, x_72);
+return x_73;
+}
+}
+}
+}
+}
+}
 }
 }
 }
@@ -1662,49 +2075,49 @@ return x_66;
 }
 else
 {
-uint8_t x_95; 
-lean_dec(x_13);
-lean_dec(x_11);
+uint8_t x_123; 
+lean_dec(x_14);
+lean_dec(x_12);
+lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
-x_95 = !lean_is_exclusive(x_18);
-if (x_95 == 0)
+x_123 = !lean_is_exclusive(x_19);
+if (x_123 == 0)
 {
-return x_18;
+return x_19;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_18, 0);
-x_97 = lean_ctor_get(x_18, 1);
-lean_inc(x_97);
-lean_inc(x_96);
-lean_dec(x_18);
-x_98 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_98, 0, x_96);
-lean_ctor_set(x_98, 1, x_97);
-return x_98;
+lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+x_124 = lean_ctor_get(x_19, 0);
+x_125 = lean_ctor_get(x_19, 1);
+lean_inc(x_125);
+lean_inc(x_124);
+lean_dec(x_19);
+x_126 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_126, 0, x_124);
+lean_ctor_set(x_126, 1, x_125);
+return x_126;
 }
 }
 }
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_3__expandFields(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Lean_Elab_Structure_3__expandFields(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_unsigned_to_nat(7u);
-x_6 = l_Lean_Syntax_getArg(x_1, x_5);
-x_7 = lean_unsigned_to_nat(0u);
-x_8 = l_Lean_Syntax_getArg(x_6, x_7);
-lean_dec(x_6);
-x_9 = l_Lean_Syntax_getArgs(x_8);
-lean_dec(x_8);
-x_10 = l_Array_empty___closed__1;
-x_11 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(x_1, x_2, x_9, x_7, x_10, x_3, x_4);
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_6 = lean_unsigned_to_nat(7u);
+x_7 = l_Lean_Syntax_getArg(x_1, x_6);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = l_Lean_Syntax_getArg(x_7, x_8);
+lean_dec(x_7);
+x_10 = l_Lean_Syntax_getArgs(x_9);
 lean_dec(x_9);
-return x_11;
+x_11 = l_Array_empty___closed__1;
+x_12 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(x_1, x_2, x_3, x_10, x_8, x_11, x_4, x_5);
+lean_dec(x_10);
+return x_12;
 }
 }
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
@@ -1722,25 +2135,27 @@ lean_dec(x_1);
 return x_16;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_8; 
-x_8 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_object* x_9; 
+x_9 = l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-return x_8;
+return x_9;
 }
 }
-lean_object* l___private_Lean_Elab_Structure_3__expandFields___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Lean_Elab_Structure_3__expandFields___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; 
-x_5 = l___private_Lean_Elab_Structure_3__expandFields(x_1, x_2, x_3, x_4);
+lean_object* x_6; 
+x_6 = l___private_Lean_Elab_Structure_3__expandFields(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-return x_5;
+return x_6;
 }
 }
 uint8_t l___private_Lean_Elab_Structure_4__validStructType(lean_object* x_1) {
@@ -2089,19 +2504,23 @@ return x_4;
 lean_object* l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
-lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_object* x_12; lean_object* x_13; uint8_t x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
 x_12 = lean_box(0);
-x_13 = 1;
-x_14 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_14, 0, x_1);
-lean_ctor_set(x_14, 1, x_9);
-lean_ctor_set(x_14, 2, x_12);
-lean_ctor_set_uint8(x_14, sizeof(void*)*3, x_13);
-x_15 = lean_array_push(x_2, x_14);
-x_16 = lean_unsigned_to_nat(1u);
-x_17 = lean_nat_add(x_3, x_16);
-x_18 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg(x_4, x_5, x_6, x_7, x_17, x_15, x_8, x_10, x_11);
-return x_18;
+x_13 = lean_box(0);
+x_14 = 1;
+x_15 = 0;
+x_16 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_16, 0, x_1);
+lean_ctor_set(x_16, 1, x_13);
+lean_ctor_set(x_16, 2, x_9);
+lean_ctor_set(x_16, 3, x_12);
+lean_ctor_set_uint8(x_16, sizeof(void*)*4, x_14);
+lean_ctor_set_uint8(x_16, sizeof(void*)*4 + 1, x_15);
+x_17 = lean_array_push(x_2, x_16);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_add(x_3, x_18);
+x_20 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg(x_4, x_5, x_6, x_7, x_19, x_17, x_8, x_10, x_11);
+return x_20;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__1() {
@@ -2555,25 +2974,33 @@ return x_9;
 lean_object* l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
-lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_box(0);
-x_13 = 2;
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_12 = lean_ctor_get(x_1, 4);
+lean_inc(x_12);
+lean_inc(x_2);
+x_13 = l_Lean_Name_append___main(x_12, x_2);
+lean_dec(x_12);
+x_14 = lean_box(0);
+x_15 = 2;
+x_16 = 0;
 lean_inc(x_9);
-x_14 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_14, 0, x_1);
-lean_ctor_set(x_14, 1, x_9);
-lean_ctor_set(x_14, 2, x_12);
-lean_ctor_set_uint8(x_14, sizeof(void*)*3, x_13);
-x_15 = lean_array_push(x_2, x_14);
-lean_inc(x_4);
-x_16 = l_Lean_getStructureFieldsFlattened(x_3, x_4);
-x_17 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__1___boxed), 6, 3);
-lean_closure_set(x_17, 0, x_5);
-lean_closure_set(x_17, 1, x_6);
-lean_closure_set(x_17, 2, x_7);
-x_18 = lean_unsigned_to_nat(0u);
-x_19 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg(x_8, x_9, x_4, x_16, x_18, x_15, x_17, x_10, x_11);
-return x_19;
+x_17 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_17, 0, x_2);
+lean_ctor_set(x_17, 1, x_13);
+lean_ctor_set(x_17, 2, x_9);
+lean_ctor_set(x_17, 3, x_14);
+lean_ctor_set_uint8(x_17, sizeof(void*)*4, x_15);
+lean_ctor_set_uint8(x_17, sizeof(void*)*4 + 1, x_16);
+x_18 = lean_array_push(x_3, x_17);
+lean_inc(x_5);
+x_19 = l_Lean_getStructureFieldsFlattened(x_4, x_5);
+x_20 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__1___boxed), 6, 3);
+lean_closure_set(x_20, 0, x_6);
+lean_closure_set(x_20, 1, x_1);
+lean_closure_set(x_20, 2, x_7);
+x_21 = lean_unsigned_to_nat(0u);
+x_22 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg(x_8, x_9, x_5, x_19, x_21, x_18, x_20, x_10, x_11);
+return x_22;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Structure_9__withParents___main___rarg___closed__1() {
@@ -2652,12 +3079,12 @@ lean_inc(x_16);
 lean_inc(x_26);
 lean_inc(x_23);
 x_29 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_9__withParents___main___rarg___lambda__2), 11, 8);
-lean_closure_set(x_29, 0, x_23);
-lean_closure_set(x_29, 1, x_3);
-lean_closure_set(x_29, 2, x_26);
-lean_closure_set(x_29, 3, x_16);
-lean_closure_set(x_29, 4, x_2);
-lean_closure_set(x_29, 5, x_1);
+lean_closure_set(x_29, 0, x_1);
+lean_closure_set(x_29, 1, x_23);
+lean_closure_set(x_29, 2, x_3);
+lean_closure_set(x_29, 3, x_26);
+lean_closure_set(x_29, 4, x_16);
+lean_closure_set(x_29, 5, x_2);
 lean_closure_set(x_29, 6, x_4);
 lean_closure_set(x_29, 7, x_11);
 if (x_28 == 0)
@@ -3338,21 +3765,26 @@ return x_66;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-uint8_t x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_10 = 0;
-x_11 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_11, 0, x_1);
-lean_ctor_set(x_11, 1, x_7);
-lean_ctor_set(x_11, 2, x_2);
-lean_ctor_set_uint8(x_11, sizeof(void*)*3, x_10);
-x_12 = lean_array_push(x_3, x_11);
-x_13 = lean_unsigned_to_nat(1u);
-x_14 = lean_nat_add(x_4, x_13);
-x_15 = l___private_Lean_Elab_Structure_10__withFields___main___rarg(x_5, x_14, x_12, x_6, x_8, x_9);
-return x_15;
+lean_object* x_11; uint8_t x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_11 = lean_ctor_get(x_1, 2);
+x_12 = lean_ctor_get_uint8(x_1, sizeof(void*)*7 + 1);
+x_13 = 0;
+lean_inc(x_11);
+x_14 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_11);
+lean_ctor_set(x_14, 2, x_8);
+lean_ctor_set(x_14, 3, x_3);
+lean_ctor_set_uint8(x_14, sizeof(void*)*4, x_13);
+lean_ctor_set_uint8(x_14, sizeof(void*)*4 + 1, x_12);
+x_15 = lean_array_push(x_4, x_14);
+x_16 = lean_unsigned_to_nat(1u);
+x_17 = lean_nat_add(x_5, x_16);
+x_18 = l___private_Lean_Elab_Structure_10__withFields___main___rarg(x_6, x_17, x_15, x_7, x_9, x_10);
+return x_18;
 }
 }
 lean_object* _init_l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__1() {
@@ -3552,15 +3984,15 @@ x_29 = lean_ctor_get(x_27, 1);
 lean_inc(x_29);
 lean_dec(x_27);
 x_30 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
-lean_dec(x_10);
 lean_inc(x_19);
-x_31 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed), 9, 6);
-lean_closure_set(x_31, 0, x_19);
-lean_closure_set(x_31, 1, x_17);
-lean_closure_set(x_31, 2, x_3);
-lean_closure_set(x_31, 3, x_2);
-lean_closure_set(x_31, 4, x_1);
-lean_closure_set(x_31, 5, x_4);
+x_31 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed), 10, 7);
+lean_closure_set(x_31, 0, x_10);
+lean_closure_set(x_31, 1, x_19);
+lean_closure_set(x_31, 2, x_17);
+lean_closure_set(x_31, 3, x_3);
+lean_closure_set(x_31, 4, x_2);
+lean_closure_set(x_31, 5, x_1);
+lean_closure_set(x_31, 6, x_4);
 x_32 = l_Lean_Elab_Term_withLocalDecl___rarg(x_26, x_19, x_30, x_28, x_31, x_5, x_29);
 lean_dec(x_26);
 return x_32;
@@ -3606,15 +4038,15 @@ lean_dec(x_17);
 x_38 = lean_ctor_get(x_10, 0);
 lean_inc(x_38);
 x_39 = lean_ctor_get_uint8(x_10, sizeof(void*)*7);
-lean_dec(x_10);
 lean_inc(x_19);
-x_40 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed), 9, 6);
-lean_closure_set(x_40, 0, x_19);
-lean_closure_set(x_40, 1, x_18);
-lean_closure_set(x_40, 2, x_3);
-lean_closure_set(x_40, 3, x_2);
-lean_closure_set(x_40, 4, x_1);
-lean_closure_set(x_40, 5, x_4);
+x_40 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed), 10, 7);
+lean_closure_set(x_40, 0, x_10);
+lean_closure_set(x_40, 1, x_19);
+lean_closure_set(x_40, 2, x_18);
+lean_closure_set(x_40, 3, x_3);
+lean_closure_set(x_40, 4, x_2);
+lean_closure_set(x_40, 5, x_1);
+lean_closure_set(x_40, 6, x_4);
 x_41 = l_Lean_Elab_Term_withLocalDecl___rarg(x_38, x_19, x_39, x_37, x_40, x_5, x_16);
 lean_dec(x_38);
 return x_41;
@@ -3628,7 +4060,7 @@ if (x_42 == 0)
 {
 lean_object* x_43; uint8_t x_44; 
 x_43 = lean_ctor_get(x_21, 0);
-x_44 = lean_ctor_get_uint8(x_43, sizeof(void*)*3);
+x_44 = lean_ctor_get_uint8(x_43, sizeof(void*)*4);
 switch (x_44) {
 case 0:
 {
@@ -3696,65 +4128,67 @@ lean_dec(x_19);
 x_59 = !lean_is_exclusive(x_43);
 if (x_59 == 0)
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
 x_60 = lean_ctor_get(x_43, 0);
 x_61 = lean_ctor_get(x_43, 1);
 x_62 = lean_ctor_get(x_43, 2);
-lean_dec(x_62);
-x_63 = !lean_is_exclusive(x_18);
-if (x_63 == 0)
+x_63 = lean_ctor_get(x_43, 3);
+lean_dec(x_63);
+x_64 = !lean_is_exclusive(x_18);
+if (x_64 == 0)
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_18, 0);
-x_65 = lean_ctor_get(x_10, 0);
-lean_inc(x_65);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_18, 0);
+x_66 = lean_ctor_get(x_10, 0);
+lean_inc(x_66);
 lean_inc(x_5);
-lean_inc(x_61);
-x_66 = l_Lean_Elab_Term_inferType(x_65, x_61, x_5, x_16);
-lean_dec(x_65);
-if (lean_obj_tag(x_66) == 0)
+lean_inc(x_62);
+x_67 = l_Lean_Elab_Term_inferType(x_66, x_62, x_5, x_16);
+lean_dec(x_66);
+if (lean_obj_tag(x_67) == 0)
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_66, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_67, 0);
 lean_inc(x_68);
-lean_dec(x_66);
-x_69 = lean_ctor_get(x_10, 6);
+x_69 = lean_ctor_get(x_67, 1);
 lean_inc(x_69);
+lean_dec(x_67);
+x_70 = lean_ctor_get(x_10, 6);
+lean_inc(x_70);
 lean_dec(x_10);
-lean_ctor_set(x_18, 0, x_67);
-if (lean_obj_tag(x_69) == 0)
+lean_ctor_set(x_18, 0, x_68);
+if (lean_obj_tag(x_70) == 0)
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_70 = l_Lean_Syntax_inhabited;
-x_71 = l_Option_get_x21___rarg___closed__3;
-x_72 = lean_panic_fn(x_70, x_71);
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_71 = l_Lean_Syntax_inhabited;
+x_72 = l_Option_get_x21___rarg___closed__3;
+x_73 = lean_panic_fn(x_71, x_72);
 lean_inc(x_5);
-x_73 = l_Lean_Elab_Term_ensureHasType(x_72, x_18, x_64, x_5, x_68);
-if (lean_obj_tag(x_73) == 0)
+x_74 = l_Lean_Elab_Term_ensureHasType(x_73, x_18, x_65, x_5, x_69);
+if (lean_obj_tag(x_74) == 0)
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_74 = lean_ctor_get(x_73, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_75 = lean_ctor_get(x_74, 0);
 lean_inc(x_75);
-lean_dec(x_73);
-lean_ctor_set(x_21, 0, x_74);
-lean_ctor_set(x_43, 2, x_21);
-x_76 = lean_array_push(x_3, x_43);
-x_77 = lean_unsigned_to_nat(1u);
-x_78 = lean_nat_add(x_2, x_77);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+lean_dec(x_74);
+lean_ctor_set(x_21, 0, x_75);
+lean_ctor_set(x_43, 3, x_21);
+x_77 = lean_array_push(x_3, x_43);
+x_78 = lean_unsigned_to_nat(1u);
+x_79 = lean_nat_add(x_2, x_78);
 lean_dec(x_2);
-x_2 = x_78;
-x_3 = x_76;
-x_6 = x_75;
+x_2 = x_79;
+x_3 = x_77;
+x_6 = x_76;
 goto _start;
 }
 else
 {
-uint8_t x_80; 
+uint8_t x_81; 
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_free_object(x_21);
@@ -3763,61 +4197,62 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_80 = !lean_is_exclusive(x_73);
-if (x_80 == 0)
+x_81 = !lean_is_exclusive(x_74);
+if (x_81 == 0)
 {
-return x_73;
+return x_74;
 }
 else
 {
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_73, 0);
-x_82 = lean_ctor_get(x_73, 1);
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_82 = lean_ctor_get(x_74, 0);
+x_83 = lean_ctor_get(x_74, 1);
+lean_inc(x_83);
 lean_inc(x_82);
-lean_inc(x_81);
-lean_dec(x_73);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
+lean_dec(x_74);
+x_84 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_84, 0, x_82);
+lean_ctor_set(x_84, 1, x_83);
+return x_84;
 }
 }
 }
 else
 {
-uint8_t x_84; 
+uint8_t x_85; 
 lean_free_object(x_21);
-x_84 = !lean_is_exclusive(x_69);
-if (x_84 == 0)
+x_85 = !lean_is_exclusive(x_70);
+if (x_85 == 0)
 {
-lean_object* x_85; lean_object* x_86; 
-x_85 = lean_ctor_get(x_69, 0);
+lean_object* x_86; lean_object* x_87; 
+x_86 = lean_ctor_get(x_70, 0);
 lean_inc(x_5);
-x_86 = l_Lean_Elab_Term_ensureHasType(x_85, x_18, x_64, x_5, x_68);
-if (lean_obj_tag(x_86) == 0)
+x_87 = l_Lean_Elab_Term_ensureHasType(x_86, x_18, x_65, x_5, x_69);
+if (lean_obj_tag(x_87) == 0)
 {
-lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_87 = lean_ctor_get(x_86, 0);
-lean_inc(x_87);
-x_88 = lean_ctor_get(x_86, 1);
+lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_88 = lean_ctor_get(x_87, 0);
 lean_inc(x_88);
-lean_dec(x_86);
-lean_ctor_set(x_69, 0, x_87);
-lean_ctor_set(x_43, 2, x_69);
-x_89 = lean_array_push(x_3, x_43);
-x_90 = lean_unsigned_to_nat(1u);
-x_91 = lean_nat_add(x_2, x_90);
+x_89 = lean_ctor_get(x_87, 1);
+lean_inc(x_89);
+lean_dec(x_87);
+lean_ctor_set(x_70, 0, x_88);
+lean_ctor_set(x_43, 3, x_70);
+x_90 = lean_array_push(x_3, x_43);
+x_91 = lean_unsigned_to_nat(1u);
+x_92 = lean_nat_add(x_2, x_91);
 lean_dec(x_2);
-x_2 = x_91;
-x_3 = x_89;
-x_6 = x_88;
+x_2 = x_92;
+x_3 = x_90;
+x_6 = x_89;
 goto _start;
 }
 else
 {
-uint8_t x_93; 
-lean_free_object(x_69);
+uint8_t x_94; 
+lean_free_object(x_70);
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_dec(x_5);
@@ -3825,58 +4260,59 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_93 = !lean_is_exclusive(x_86);
-if (x_93 == 0)
+x_94 = !lean_is_exclusive(x_87);
+if (x_94 == 0)
 {
-return x_86;
+return x_87;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_86, 0);
-x_95 = lean_ctor_get(x_86, 1);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_87, 0);
+x_96 = lean_ctor_get(x_87, 1);
+lean_inc(x_96);
 lean_inc(x_95);
-lean_inc(x_94);
-lean_dec(x_86);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
+lean_dec(x_87);
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
 }
 }
 }
 else
 {
-lean_object* x_97; lean_object* x_98; 
-x_97 = lean_ctor_get(x_69, 0);
-lean_inc(x_97);
-lean_dec(x_69);
+lean_object* x_98; lean_object* x_99; 
+x_98 = lean_ctor_get(x_70, 0);
+lean_inc(x_98);
+lean_dec(x_70);
 lean_inc(x_5);
-x_98 = l_Lean_Elab_Term_ensureHasType(x_97, x_18, x_64, x_5, x_68);
-if (lean_obj_tag(x_98) == 0)
+x_99 = l_Lean_Elab_Term_ensureHasType(x_98, x_18, x_65, x_5, x_69);
+if (lean_obj_tag(x_99) == 0)
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_99 = lean_ctor_get(x_98, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
+lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
-lean_dec(x_98);
-x_101 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_101, 0, x_99);
-lean_ctor_set(x_43, 2, x_101);
-x_102 = lean_array_push(x_3, x_43);
-x_103 = lean_unsigned_to_nat(1u);
-x_104 = lean_nat_add(x_2, x_103);
+x_101 = lean_ctor_get(x_99, 1);
+lean_inc(x_101);
+lean_dec(x_99);
+x_102 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_102, 0, x_100);
+lean_ctor_set(x_43, 3, x_102);
+x_103 = lean_array_push(x_3, x_43);
+x_104 = lean_unsigned_to_nat(1u);
+x_105 = lean_nat_add(x_2, x_104);
 lean_dec(x_2);
-x_2 = x_104;
-x_3 = x_102;
-x_6 = x_100;
+x_2 = x_105;
+x_3 = x_103;
+x_6 = x_101;
 goto _start;
 }
 else
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_dec(x_5);
@@ -3884,36 +4320,37 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_106 = lean_ctor_get(x_98, 0);
-lean_inc(x_106);
-x_107 = lean_ctor_get(x_98, 1);
+x_107 = lean_ctor_get(x_99, 0);
 lean_inc(x_107);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_108 = x_98;
+x_108 = lean_ctor_get(x_99, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_99)) {
+ lean_ctor_release(x_99, 0);
+ lean_ctor_release(x_99, 1);
+ x_109 = x_99;
 } else {
- lean_dec_ref(x_98);
- x_108 = lean_box(0);
+ lean_dec_ref(x_99);
+ x_109 = lean_box(0);
 }
-if (lean_is_scalar(x_108)) {
- x_109 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_109 = x_108;
+ x_110 = x_109;
 }
-lean_ctor_set(x_109, 0, x_106);
-lean_ctor_set(x_109, 1, x_107);
-return x_109;
+lean_ctor_set(x_110, 0, x_107);
+lean_ctor_set(x_110, 1, x_108);
+return x_110;
 }
 }
 }
 }
 else
 {
-uint8_t x_110; 
+uint8_t x_111; 
 lean_free_object(x_18);
-lean_dec(x_64);
+lean_dec(x_65);
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_free_object(x_21);
@@ -3923,82 +4360,83 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_110 = !lean_is_exclusive(x_66);
-if (x_110 == 0)
+x_111 = !lean_is_exclusive(x_67);
+if (x_111 == 0)
 {
-return x_66;
+return x_67;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_66, 0);
-x_112 = lean_ctor_get(x_66, 1);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+x_112 = lean_ctor_get(x_67, 0);
+x_113 = lean_ctor_get(x_67, 1);
+lean_inc(x_113);
 lean_inc(x_112);
-lean_inc(x_111);
-lean_dec(x_66);
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_111);
-lean_ctor_set(x_113, 1, x_112);
-return x_113;
+lean_dec(x_67);
+x_114 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_114, 0, x_112);
+lean_ctor_set(x_114, 1, x_113);
+return x_114;
 }
 }
 }
 else
 {
-lean_object* x_114; lean_object* x_115; lean_object* x_116; 
-x_114 = lean_ctor_get(x_18, 0);
-lean_inc(x_114);
-lean_dec(x_18);
-x_115 = lean_ctor_get(x_10, 0);
+lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_115 = lean_ctor_get(x_18, 0);
 lean_inc(x_115);
+lean_dec(x_18);
+x_116 = lean_ctor_get(x_10, 0);
+lean_inc(x_116);
 lean_inc(x_5);
-lean_inc(x_61);
-x_116 = l_Lean_Elab_Term_inferType(x_115, x_61, x_5, x_16);
-lean_dec(x_115);
-if (lean_obj_tag(x_116) == 0)
-{
-lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
-x_117 = lean_ctor_get(x_116, 0);
-lean_inc(x_117);
-x_118 = lean_ctor_get(x_116, 1);
-lean_inc(x_118);
+lean_inc(x_62);
+x_117 = l_Lean_Elab_Term_inferType(x_116, x_62, x_5, x_16);
 lean_dec(x_116);
-x_119 = lean_ctor_get(x_10, 6);
+if (lean_obj_tag(x_117) == 0)
+{
+lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+x_118 = lean_ctor_get(x_117, 0);
+lean_inc(x_118);
+x_119 = lean_ctor_get(x_117, 1);
 lean_inc(x_119);
+lean_dec(x_117);
+x_120 = lean_ctor_get(x_10, 6);
+lean_inc(x_120);
 lean_dec(x_10);
-x_120 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_120, 0, x_117);
-if (lean_obj_tag(x_119) == 0)
+x_121 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_121, 0, x_118);
+if (lean_obj_tag(x_120) == 0)
 {
-lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
-x_121 = l_Lean_Syntax_inhabited;
-x_122 = l_Option_get_x21___rarg___closed__3;
-x_123 = lean_panic_fn(x_121, x_122);
+lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_122 = l_Lean_Syntax_inhabited;
+x_123 = l_Option_get_x21___rarg___closed__3;
+x_124 = lean_panic_fn(x_122, x_123);
 lean_inc(x_5);
-x_124 = l_Lean_Elab_Term_ensureHasType(x_123, x_120, x_114, x_5, x_118);
-if (lean_obj_tag(x_124) == 0)
+x_125 = l_Lean_Elab_Term_ensureHasType(x_124, x_121, x_115, x_5, x_119);
+if (lean_obj_tag(x_125) == 0)
 {
-lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
-x_125 = lean_ctor_get(x_124, 0);
-lean_inc(x_125);
-x_126 = lean_ctor_get(x_124, 1);
+lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+x_126 = lean_ctor_get(x_125, 0);
 lean_inc(x_126);
-lean_dec(x_124);
-lean_ctor_set(x_21, 0, x_125);
-lean_ctor_set(x_43, 2, x_21);
-x_127 = lean_array_push(x_3, x_43);
-x_128 = lean_unsigned_to_nat(1u);
-x_129 = lean_nat_add(x_2, x_128);
+x_127 = lean_ctor_get(x_125, 1);
+lean_inc(x_127);
+lean_dec(x_125);
+lean_ctor_set(x_21, 0, x_126);
+lean_ctor_set(x_43, 3, x_21);
+x_128 = lean_array_push(x_3, x_43);
+x_129 = lean_unsigned_to_nat(1u);
+x_130 = lean_nat_add(x_2, x_129);
 lean_dec(x_2);
-x_2 = x_129;
-x_3 = x_127;
-x_6 = x_126;
+x_2 = x_130;
+x_3 = x_128;
+x_6 = x_127;
 goto _start;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_free_object(x_21);
@@ -4007,72 +4445,73 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_131 = lean_ctor_get(x_124, 0);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_124, 1);
+x_132 = lean_ctor_get(x_125, 0);
 lean_inc(x_132);
-if (lean_is_exclusive(x_124)) {
- lean_ctor_release(x_124, 0);
- lean_ctor_release(x_124, 1);
- x_133 = x_124;
+x_133 = lean_ctor_get(x_125, 1);
+lean_inc(x_133);
+if (lean_is_exclusive(x_125)) {
+ lean_ctor_release(x_125, 0);
+ lean_ctor_release(x_125, 1);
+ x_134 = x_125;
 } else {
- lean_dec_ref(x_124);
- x_133 = lean_box(0);
+ lean_dec_ref(x_125);
+ x_134 = lean_box(0);
 }
-if (lean_is_scalar(x_133)) {
- x_134 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_134)) {
+ x_135 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_134 = x_133;
+ x_135 = x_134;
 }
-lean_ctor_set(x_134, 0, x_131);
-lean_ctor_set(x_134, 1, x_132);
-return x_134;
+lean_ctor_set(x_135, 0, x_132);
+lean_ctor_set(x_135, 1, x_133);
+return x_135;
 }
 }
 else
 {
-lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+lean_object* x_136; lean_object* x_137; lean_object* x_138; 
 lean_free_object(x_21);
-x_135 = lean_ctor_get(x_119, 0);
-lean_inc(x_135);
-if (lean_is_exclusive(x_119)) {
- lean_ctor_release(x_119, 0);
- x_136 = x_119;
+x_136 = lean_ctor_get(x_120, 0);
+lean_inc(x_136);
+if (lean_is_exclusive(x_120)) {
+ lean_ctor_release(x_120, 0);
+ x_137 = x_120;
 } else {
- lean_dec_ref(x_119);
- x_136 = lean_box(0);
+ lean_dec_ref(x_120);
+ x_137 = lean_box(0);
 }
 lean_inc(x_5);
-x_137 = l_Lean_Elab_Term_ensureHasType(x_135, x_120, x_114, x_5, x_118);
-if (lean_obj_tag(x_137) == 0)
+x_138 = l_Lean_Elab_Term_ensureHasType(x_136, x_121, x_115, x_5, x_119);
+if (lean_obj_tag(x_138) == 0)
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_138 = lean_ctor_get(x_137, 0);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_137, 1);
+lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_139 = lean_ctor_get(x_138, 0);
 lean_inc(x_139);
-lean_dec(x_137);
-if (lean_is_scalar(x_136)) {
- x_140 = lean_alloc_ctor(1, 1, 0);
+x_140 = lean_ctor_get(x_138, 1);
+lean_inc(x_140);
+lean_dec(x_138);
+if (lean_is_scalar(x_137)) {
+ x_141 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_140 = x_136;
+ x_141 = x_137;
 }
-lean_ctor_set(x_140, 0, x_138);
-lean_ctor_set(x_43, 2, x_140);
-x_141 = lean_array_push(x_3, x_43);
-x_142 = lean_unsigned_to_nat(1u);
-x_143 = lean_nat_add(x_2, x_142);
+lean_ctor_set(x_141, 0, x_139);
+lean_ctor_set(x_43, 3, x_141);
+x_142 = lean_array_push(x_3, x_43);
+x_143 = lean_unsigned_to_nat(1u);
+x_144 = lean_nat_add(x_2, x_143);
 lean_dec(x_2);
-x_2 = x_143;
-x_3 = x_141;
-x_6 = x_139;
+x_2 = x_144;
+x_3 = x_142;
+x_6 = x_140;
 goto _start;
 }
 else
 {
-lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-lean_dec(x_136);
+lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; 
+lean_dec(x_137);
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_dec(x_5);
@@ -4080,34 +4519,35 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_145 = lean_ctor_get(x_137, 0);
-lean_inc(x_145);
-x_146 = lean_ctor_get(x_137, 1);
+x_146 = lean_ctor_get(x_138, 0);
 lean_inc(x_146);
-if (lean_is_exclusive(x_137)) {
- lean_ctor_release(x_137, 0);
- lean_ctor_release(x_137, 1);
- x_147 = x_137;
+x_147 = lean_ctor_get(x_138, 1);
+lean_inc(x_147);
+if (lean_is_exclusive(x_138)) {
+ lean_ctor_release(x_138, 0);
+ lean_ctor_release(x_138, 1);
+ x_148 = x_138;
 } else {
- lean_dec_ref(x_137);
- x_147 = lean_box(0);
+ lean_dec_ref(x_138);
+ x_148 = lean_box(0);
 }
-if (lean_is_scalar(x_147)) {
- x_148 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_148)) {
+ x_149 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_148 = x_147;
+ x_149 = x_148;
 }
-lean_ctor_set(x_148, 0, x_145);
-lean_ctor_set(x_148, 1, x_146);
-return x_148;
+lean_ctor_set(x_149, 0, x_146);
+lean_ctor_set(x_149, 1, x_147);
+return x_149;
 }
 }
 }
 else
 {
-lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-lean_dec(x_114);
+lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+lean_dec(x_115);
 lean_free_object(x_43);
+lean_dec(x_62);
 lean_dec(x_61);
 lean_dec(x_60);
 lean_free_object(x_21);
@@ -4117,217 +4557,227 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_149 = lean_ctor_get(x_116, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_116, 1);
+x_150 = lean_ctor_get(x_117, 0);
 lean_inc(x_150);
-if (lean_is_exclusive(x_116)) {
- lean_ctor_release(x_116, 0);
- lean_ctor_release(x_116, 1);
- x_151 = x_116;
+x_151 = lean_ctor_get(x_117, 1);
+lean_inc(x_151);
+if (lean_is_exclusive(x_117)) {
+ lean_ctor_release(x_117, 0);
+ lean_ctor_release(x_117, 1);
+ x_152 = x_117;
 } else {
- lean_dec_ref(x_116);
- x_151 = lean_box(0);
+ lean_dec_ref(x_117);
+ x_152 = lean_box(0);
 }
-if (lean_is_scalar(x_151)) {
- x_152 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_152)) {
+ x_153 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_152 = x_151;
+ x_153 = x_152;
 }
-lean_ctor_set(x_152, 0, x_149);
-lean_ctor_set(x_152, 1, x_150);
-return x_152;
+lean_ctor_set(x_153, 0, x_150);
+lean_ctor_set(x_153, 1, x_151);
+return x_153;
 }
 }
 }
 else
 {
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_153 = lean_ctor_get(x_43, 0);
-x_154 = lean_ctor_get(x_43, 1);
-lean_inc(x_154);
-lean_inc(x_153);
-lean_dec(x_43);
-x_155 = lean_ctor_get(x_18, 0);
+lean_object* x_154; lean_object* x_155; lean_object* x_156; uint8_t x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_154 = lean_ctor_get(x_43, 0);
+x_155 = lean_ctor_get(x_43, 1);
+x_156 = lean_ctor_get(x_43, 2);
+x_157 = lean_ctor_get_uint8(x_43, sizeof(void*)*4 + 1);
+lean_inc(x_156);
 lean_inc(x_155);
+lean_inc(x_154);
+lean_dec(x_43);
+x_158 = lean_ctor_get(x_18, 0);
+lean_inc(x_158);
 if (lean_is_exclusive(x_18)) {
  lean_ctor_release(x_18, 0);
- x_156 = x_18;
+ x_159 = x_18;
 } else {
  lean_dec_ref(x_18);
- x_156 = lean_box(0);
+ x_159 = lean_box(0);
 }
-x_157 = lean_ctor_get(x_10, 0);
-lean_inc(x_157);
-lean_inc(x_5);
-lean_inc(x_154);
-x_158 = l_Lean_Elab_Term_inferType(x_157, x_154, x_5, x_16);
-lean_dec(x_157);
-if (lean_obj_tag(x_158) == 0)
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-x_159 = lean_ctor_get(x_158, 0);
-lean_inc(x_159);
-x_160 = lean_ctor_get(x_158, 1);
+x_160 = lean_ctor_get(x_10, 0);
 lean_inc(x_160);
-lean_dec(x_158);
-x_161 = lean_ctor_get(x_10, 6);
-lean_inc(x_161);
-lean_dec(x_10);
-if (lean_is_scalar(x_156)) {
- x_162 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_162 = x_156;
-}
-lean_ctor_set(x_162, 0, x_159);
+lean_inc(x_5);
+lean_inc(x_156);
+x_161 = l_Lean_Elab_Term_inferType(x_160, x_156, x_5, x_16);
+lean_dec(x_160);
 if (lean_obj_tag(x_161) == 0)
 {
-lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
-x_163 = l_Lean_Syntax_inhabited;
-x_164 = l_Option_get_x21___rarg___closed__3;
-x_165 = lean_panic_fn(x_163, x_164);
-lean_inc(x_5);
-x_166 = l_Lean_Elab_Term_ensureHasType(x_165, x_162, x_155, x_5, x_160);
-if (lean_obj_tag(x_166) == 0)
+lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
+x_162 = lean_ctor_get(x_161, 0);
+lean_inc(x_162);
+x_163 = lean_ctor_get(x_161, 1);
+lean_inc(x_163);
+lean_dec(x_161);
+x_164 = lean_ctor_get(x_10, 6);
+lean_inc(x_164);
+lean_dec(x_10);
+if (lean_is_scalar(x_159)) {
+ x_165 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_165 = x_159;
+}
+lean_ctor_set(x_165, 0, x_162);
+if (lean_obj_tag(x_164) == 0)
 {
-lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
-x_167 = lean_ctor_get(x_166, 0);
-lean_inc(x_167);
-x_168 = lean_ctor_get(x_166, 1);
-lean_inc(x_168);
-lean_dec(x_166);
-lean_ctor_set(x_21, 0, x_167);
-x_169 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_169, 0, x_153);
-lean_ctor_set(x_169, 1, x_154);
-lean_ctor_set(x_169, 2, x_21);
-lean_ctor_set_uint8(x_169, sizeof(void*)*3, x_44);
-x_170 = lean_array_push(x_3, x_169);
-x_171 = lean_unsigned_to_nat(1u);
-x_172 = lean_nat_add(x_2, x_171);
+lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+x_166 = l_Lean_Syntax_inhabited;
+x_167 = l_Option_get_x21___rarg___closed__3;
+x_168 = lean_panic_fn(x_166, x_167);
+lean_inc(x_5);
+x_169 = l_Lean_Elab_Term_ensureHasType(x_168, x_165, x_158, x_5, x_163);
+if (lean_obj_tag(x_169) == 0)
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+x_170 = lean_ctor_get(x_169, 0);
+lean_inc(x_170);
+x_171 = lean_ctor_get(x_169, 1);
+lean_inc(x_171);
+lean_dec(x_169);
+lean_ctor_set(x_21, 0, x_170);
+x_172 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_172, 0, x_154);
+lean_ctor_set(x_172, 1, x_155);
+lean_ctor_set(x_172, 2, x_156);
+lean_ctor_set(x_172, 3, x_21);
+lean_ctor_set_uint8(x_172, sizeof(void*)*4, x_44);
+lean_ctor_set_uint8(x_172, sizeof(void*)*4 + 1, x_157);
+x_173 = lean_array_push(x_3, x_172);
+x_174 = lean_unsigned_to_nat(1u);
+x_175 = lean_nat_add(x_2, x_174);
 lean_dec(x_2);
-x_2 = x_172;
-x_3 = x_170;
-x_6 = x_168;
+x_2 = x_175;
+x_3 = x_173;
+x_6 = x_171;
 goto _start;
 }
 else
 {
-lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; 
-lean_dec(x_154);
-lean_dec(x_153);
-lean_free_object(x_21);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_174 = lean_ctor_get(x_166, 0);
-lean_inc(x_174);
-x_175 = lean_ctor_get(x_166, 1);
-lean_inc(x_175);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_176 = x_166;
-} else {
- lean_dec_ref(x_166);
- x_176 = lean_box(0);
-}
-if (lean_is_scalar(x_176)) {
- x_177 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_177 = x_176;
-}
-lean_ctor_set(x_177, 0, x_174);
-lean_ctor_set(x_177, 1, x_175);
-return x_177;
-}
-}
-else
-{
-lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-lean_free_object(x_21);
-x_178 = lean_ctor_get(x_161, 0);
-lean_inc(x_178);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- x_179 = x_161;
-} else {
- lean_dec_ref(x_161);
- x_179 = lean_box(0);
-}
-lean_inc(x_5);
-x_180 = l_Lean_Elab_Term_ensureHasType(x_178, x_162, x_155, x_5, x_160);
-if (lean_obj_tag(x_180) == 0)
-{
-lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
-x_181 = lean_ctor_get(x_180, 0);
-lean_inc(x_181);
-x_182 = lean_ctor_get(x_180, 1);
-lean_inc(x_182);
-lean_dec(x_180);
-if (lean_is_scalar(x_179)) {
- x_183 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_183 = x_179;
-}
-lean_ctor_set(x_183, 0, x_181);
-x_184 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_184, 0, x_153);
-lean_ctor_set(x_184, 1, x_154);
-lean_ctor_set(x_184, 2, x_183);
-lean_ctor_set_uint8(x_184, sizeof(void*)*3, x_44);
-x_185 = lean_array_push(x_3, x_184);
-x_186 = lean_unsigned_to_nat(1u);
-x_187 = lean_nat_add(x_2, x_186);
-lean_dec(x_2);
-x_2 = x_187;
-x_3 = x_185;
-x_6 = x_182;
-goto _start;
-}
-else
-{
-lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-lean_dec(x_179);
-lean_dec(x_154);
-lean_dec(x_153);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_189 = lean_ctor_get(x_180, 0);
-lean_inc(x_189);
-x_190 = lean_ctor_get(x_180, 1);
-lean_inc(x_190);
-if (lean_is_exclusive(x_180)) {
- lean_ctor_release(x_180, 0);
- lean_ctor_release(x_180, 1);
- x_191 = x_180;
-} else {
- lean_dec_ref(x_180);
- x_191 = lean_box(0);
-}
-if (lean_is_scalar(x_191)) {
- x_192 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_192 = x_191;
-}
-lean_ctor_set(x_192, 0, x_189);
-lean_ctor_set(x_192, 1, x_190);
-return x_192;
-}
-}
-}
-else
-{
-lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; 
+lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
+lean_dec(x_156);
+lean_dec(x_155);
+lean_dec(x_154);
+lean_free_object(x_21);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_177 = lean_ctor_get(x_169, 0);
+lean_inc(x_177);
+x_178 = lean_ctor_get(x_169, 1);
+lean_inc(x_178);
+if (lean_is_exclusive(x_169)) {
+ lean_ctor_release(x_169, 0);
+ lean_ctor_release(x_169, 1);
+ x_179 = x_169;
+} else {
+ lean_dec_ref(x_169);
+ x_179 = lean_box(0);
+}
+if (lean_is_scalar(x_179)) {
+ x_180 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_180 = x_179;
+}
+lean_ctor_set(x_180, 0, x_177);
+lean_ctor_set(x_180, 1, x_178);
+return x_180;
+}
+}
+else
+{
+lean_object* x_181; lean_object* x_182; lean_object* x_183; 
+lean_free_object(x_21);
+x_181 = lean_ctor_get(x_164, 0);
+lean_inc(x_181);
+if (lean_is_exclusive(x_164)) {
+ lean_ctor_release(x_164, 0);
+ x_182 = x_164;
+} else {
+ lean_dec_ref(x_164);
+ x_182 = lean_box(0);
+}
+lean_inc(x_5);
+x_183 = l_Lean_Elab_Term_ensureHasType(x_181, x_165, x_158, x_5, x_163);
+if (lean_obj_tag(x_183) == 0)
+{
+lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_184 = lean_ctor_get(x_183, 0);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_183, 1);
+lean_inc(x_185);
+lean_dec(x_183);
+if (lean_is_scalar(x_182)) {
+ x_186 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_186 = x_182;
+}
+lean_ctor_set(x_186, 0, x_184);
+x_187 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_187, 0, x_154);
+lean_ctor_set(x_187, 1, x_155);
+lean_ctor_set(x_187, 2, x_156);
+lean_ctor_set(x_187, 3, x_186);
+lean_ctor_set_uint8(x_187, sizeof(void*)*4, x_44);
+lean_ctor_set_uint8(x_187, sizeof(void*)*4 + 1, x_157);
+x_188 = lean_array_push(x_3, x_187);
+x_189 = lean_unsigned_to_nat(1u);
+x_190 = lean_nat_add(x_2, x_189);
+lean_dec(x_2);
+x_2 = x_190;
+x_3 = x_188;
+x_6 = x_185;
+goto _start;
+}
+else
+{
+lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; 
+lean_dec(x_182);
+lean_dec(x_156);
+lean_dec(x_155);
+lean_dec(x_154);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_192 = lean_ctor_get(x_183, 0);
+lean_inc(x_192);
+x_193 = lean_ctor_get(x_183, 1);
+lean_inc(x_193);
+if (lean_is_exclusive(x_183)) {
+ lean_ctor_release(x_183, 0);
+ lean_ctor_release(x_183, 1);
+ x_194 = x_183;
+} else {
+ lean_dec_ref(x_183);
+ x_194 = lean_box(0);
+}
+if (lean_is_scalar(x_194)) {
+ x_195 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_195 = x_194;
+}
+lean_ctor_set(x_195, 0, x_192);
+lean_ctor_set(x_195, 1, x_193);
+return x_195;
+}
+}
+}
+else
+{
+lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
+lean_dec(x_159);
+lean_dec(x_158);
 lean_dec(x_156);
 lean_dec(x_155);
 lean_dec(x_154);
-lean_dec(x_153);
 lean_free_object(x_21);
 lean_dec(x_10);
 lean_dec(x_5);
@@ -4335,32 +4785,32 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_193 = lean_ctor_get(x_158, 0);
-lean_inc(x_193);
-x_194 = lean_ctor_get(x_158, 1);
-lean_inc(x_194);
-if (lean_is_exclusive(x_158)) {
- lean_ctor_release(x_158, 0);
- lean_ctor_release(x_158, 1);
- x_195 = x_158;
+x_196 = lean_ctor_get(x_161, 0);
+lean_inc(x_196);
+x_197 = lean_ctor_get(x_161, 1);
+lean_inc(x_197);
+if (lean_is_exclusive(x_161)) {
+ lean_ctor_release(x_161, 0);
+ lean_ctor_release(x_161, 1);
+ x_198 = x_161;
 } else {
- lean_dec_ref(x_158);
- x_195 = lean_box(0);
+ lean_dec_ref(x_161);
+ x_198 = lean_box(0);
 }
-if (lean_is_scalar(x_195)) {
- x_196 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_198)) {
+ x_199 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_196 = x_195;
+ x_199 = x_198;
 }
-lean_ctor_set(x_196, 0, x_193);
-lean_ctor_set(x_196, 1, x_194);
-return x_196;
+lean_ctor_set(x_199, 0, x_196);
+lean_ctor_set(x_199, 1, x_197);
+return x_199;
 }
 }
 }
 else
 {
-lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; 
 lean_free_object(x_21);
 lean_dec(x_43);
 lean_dec(x_18);
@@ -4369,45 +4819,45 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_197 = lean_ctor_get(x_10, 5);
-lean_inc(x_197);
+x_200 = lean_ctor_get(x_10, 5);
+lean_inc(x_200);
 lean_dec(x_10);
-x_198 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_198, 0, x_19);
-x_199 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__9;
-x_200 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_200, 0, x_199);
-lean_ctor_set(x_200, 1, x_198);
-x_201 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__12;
-x_202 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_202, 0, x_200);
-lean_ctor_set(x_202, 1, x_201);
-if (lean_obj_tag(x_197) == 0)
+x_201 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_201, 0, x_19);
+x_202 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__9;
+x_203 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_203, 0, x_202);
+lean_ctor_set(x_203, 1, x_201);
+x_204 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__12;
+x_205 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_205, 0, x_203);
+lean_ctor_set(x_205, 1, x_204);
+if (lean_obj_tag(x_200) == 0)
 {
-lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
-x_203 = l_Lean_Syntax_inhabited;
-x_204 = l_Option_get_x21___rarg___closed__3;
-x_205 = lean_panic_fn(x_203, x_204);
-x_206 = l_Lean_Elab_Term_throwError___rarg(x_205, x_202, x_5, x_16);
-lean_dec(x_205);
-return x_206;
+lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; 
+x_206 = l_Lean_Syntax_inhabited;
+x_207 = l_Option_get_x21___rarg___closed__3;
+x_208 = lean_panic_fn(x_206, x_207);
+x_209 = l_Lean_Elab_Term_throwError___rarg(x_208, x_205, x_5, x_16);
+lean_dec(x_208);
+return x_209;
 }
 else
 {
-lean_object* x_207; lean_object* x_208; 
-x_207 = lean_ctor_get(x_197, 0);
-lean_inc(x_207);
-lean_dec(x_197);
-x_208 = l_Lean_Elab_Term_throwError___rarg(x_207, x_202, x_5, x_16);
-lean_dec(x_207);
-return x_208;
+lean_object* x_210; lean_object* x_211; 
+x_210 = lean_ctor_get(x_200, 0);
+lean_inc(x_210);
+lean_dec(x_200);
+x_211 = l_Lean_Elab_Term_throwError___rarg(x_210, x_205, x_5, x_16);
+lean_dec(x_210);
+return x_211;
 }
 }
 }
 }
 default: 
 {
-lean_object* x_209; lean_object* x_210; lean_object* x_211; 
+lean_object* x_212; lean_object* x_213; lean_object* x_214; 
 lean_free_object(x_21);
 lean_dec(x_43);
 lean_dec(x_19);
@@ -4418,363 +4868,374 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_209 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
-x_210 = l_unreachable_x21___rarg(x_209);
-x_211 = lean_apply_2(x_210, x_5, x_16);
-return x_211;
+x_212 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
+x_213 = l_unreachable_x21___rarg(x_212);
+x_214 = lean_apply_2(x_213, x_5, x_16);
+return x_214;
 }
 }
 }
 else
 {
-lean_object* x_212; uint8_t x_213; 
-x_212 = lean_ctor_get(x_21, 0);
-lean_inc(x_212);
+lean_object* x_215; uint8_t x_216; 
+x_215 = lean_ctor_get(x_21, 0);
+lean_inc(x_215);
 lean_dec(x_21);
-x_213 = lean_ctor_get_uint8(x_212, sizeof(void*)*3);
-switch (x_213) {
+x_216 = lean_ctor_get_uint8(x_215, sizeof(void*)*4);
+switch (x_216) {
 case 0:
 {
-lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
-lean_dec(x_212);
+lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; 
+lean_dec(x_215);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_214 = lean_ctor_get(x_10, 0);
-lean_inc(x_214);
+x_217 = lean_ctor_get(x_10, 0);
+lean_inc(x_217);
 lean_dec(x_10);
-x_215 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_215, 0, x_19);
-x_216 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__3;
-x_217 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_217, 0, x_216);
-lean_ctor_set(x_217, 1, x_215);
-x_218 = l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___closed__5;
-x_219 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_219, 0, x_217);
-lean_ctor_set(x_219, 1, x_218);
-x_220 = l_Lean_Elab_Term_throwError___rarg(x_214, x_219, x_5, x_16);
-lean_dec(x_214);
-return x_220;
+x_218 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_218, 0, x_19);
+x_219 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__3;
+x_220 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_220, 0, x_219);
+lean_ctor_set(x_220, 1, x_218);
+x_221 = l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___closed__5;
+x_222 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_222, 0, x_220);
+lean_ctor_set(x_222, 1, x_221);
+x_223 = l_Lean_Elab_Term_throwError___rarg(x_217, x_222, x_5, x_16);
+lean_dec(x_217);
+return x_223;
 }
 case 1:
 {
 if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; 
-lean_dec(x_212);
+lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; 
+lean_dec(x_215);
 lean_dec(x_17);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_221 = lean_ctor_get(x_10, 0);
-lean_inc(x_221);
+x_224 = lean_ctor_get(x_10, 0);
+lean_inc(x_224);
 lean_dec(x_10);
-x_222 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_222, 0, x_19);
-x_223 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__3;
-x_224 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_224, 0, x_223);
-lean_ctor_set(x_224, 1, x_222);
-x_225 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__6;
-x_226 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_226, 0, x_224);
-lean_ctor_set(x_226, 1, x_225);
-x_227 = l_Lean_Elab_Term_throwError___rarg(x_221, x_226, x_5, x_16);
-lean_dec(x_221);
-return x_227;
+x_225 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_225, 0, x_19);
+x_226 = l___private_Lean_Elab_Structure_8__processSubfields___main___rarg___closed__3;
+x_227 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_227, 0, x_226);
+lean_ctor_set(x_227, 1, x_225);
+x_228 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__6;
+x_229 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_229, 0, x_227);
+lean_ctor_set(x_229, 1, x_228);
+x_230 = l_Lean_Elab_Term_throwError___rarg(x_224, x_229, x_5, x_16);
+lean_dec(x_224);
+return x_230;
 }
 else
 {
 if (lean_obj_tag(x_17) == 0)
 {
-lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; 
+lean_object* x_231; lean_object* x_232; lean_object* x_233; uint8_t x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; 
 lean_dec(x_19);
-x_228 = lean_ctor_get(x_212, 0);
-lean_inc(x_228);
-x_229 = lean_ctor_get(x_212, 1);
-lean_inc(x_229);
-if (lean_is_exclusive(x_212)) {
- lean_ctor_release(x_212, 0);
- lean_ctor_release(x_212, 1);
- lean_ctor_release(x_212, 2);
- x_230 = x_212;
-} else {
- lean_dec_ref(x_212);
- x_230 = lean_box(0);
-}
-x_231 = lean_ctor_get(x_18, 0);
+x_231 = lean_ctor_get(x_215, 0);
 lean_inc(x_231);
+x_232 = lean_ctor_get(x_215, 1);
+lean_inc(x_232);
+x_233 = lean_ctor_get(x_215, 2);
+lean_inc(x_233);
+x_234 = lean_ctor_get_uint8(x_215, sizeof(void*)*4 + 1);
+if (lean_is_exclusive(x_215)) {
+ lean_ctor_release(x_215, 0);
+ lean_ctor_release(x_215, 1);
+ lean_ctor_release(x_215, 2);
+ lean_ctor_release(x_215, 3);
+ x_235 = x_215;
+} else {
+ lean_dec_ref(x_215);
+ x_235 = lean_box(0);
+}
+x_236 = lean_ctor_get(x_18, 0);
+lean_inc(x_236);
 if (lean_is_exclusive(x_18)) {
  lean_ctor_release(x_18, 0);
- x_232 = x_18;
+ x_237 = x_18;
 } else {
  lean_dec_ref(x_18);
- x_232 = lean_box(0);
+ x_237 = lean_box(0);
 }
-x_233 = lean_ctor_get(x_10, 0);
+x_238 = lean_ctor_get(x_10, 0);
+lean_inc(x_238);
+lean_inc(x_5);
 lean_inc(x_233);
-lean_inc(x_5);
-lean_inc(x_229);
-x_234 = l_Lean_Elab_Term_inferType(x_233, x_229, x_5, x_16);
-lean_dec(x_233);
-if (lean_obj_tag(x_234) == 0)
+x_239 = l_Lean_Elab_Term_inferType(x_238, x_233, x_5, x_16);
+lean_dec(x_238);
+if (lean_obj_tag(x_239) == 0)
 {
-lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; 
-x_235 = lean_ctor_get(x_234, 0);
-lean_inc(x_235);
-x_236 = lean_ctor_get(x_234, 1);
-lean_inc(x_236);
-lean_dec(x_234);
-x_237 = lean_ctor_get(x_10, 6);
-lean_inc(x_237);
+lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; 
+x_240 = lean_ctor_get(x_239, 0);
+lean_inc(x_240);
+x_241 = lean_ctor_get(x_239, 1);
+lean_inc(x_241);
+lean_dec(x_239);
+x_242 = lean_ctor_get(x_10, 6);
+lean_inc(x_242);
 lean_dec(x_10);
-if (lean_is_scalar(x_232)) {
- x_238 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_237)) {
+ x_243 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_238 = x_232;
+ x_243 = x_237;
 }
-lean_ctor_set(x_238, 0, x_235);
-if (lean_obj_tag(x_237) == 0)
-{
-lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; 
-x_239 = l_Lean_Syntax_inhabited;
-x_240 = l_Option_get_x21___rarg___closed__3;
-x_241 = lean_panic_fn(x_239, x_240);
-lean_inc(x_5);
-x_242 = l_Lean_Elab_Term_ensureHasType(x_241, x_238, x_231, x_5, x_236);
+lean_ctor_set(x_243, 0, x_240);
 if (lean_obj_tag(x_242) == 0)
 {
-lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
-x_243 = lean_ctor_get(x_242, 0);
-lean_inc(x_243);
-x_244 = lean_ctor_get(x_242, 1);
-lean_inc(x_244);
-lean_dec(x_242);
-x_245 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_245, 0, x_243);
-if (lean_is_scalar(x_230)) {
- x_246 = lean_alloc_ctor(0, 3, 1);
-} else {
- x_246 = x_230;
-}
-lean_ctor_set(x_246, 0, x_228);
-lean_ctor_set(x_246, 1, x_229);
-lean_ctor_set(x_246, 2, x_245);
-lean_ctor_set_uint8(x_246, sizeof(void*)*3, x_213);
-x_247 = lean_array_push(x_3, x_246);
-x_248 = lean_unsigned_to_nat(1u);
-x_249 = lean_nat_add(x_2, x_248);
-lean_dec(x_2);
-x_2 = x_249;
-x_3 = x_247;
-x_6 = x_244;
-goto _start;
-}
-else
-{
-lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; 
-lean_dec(x_230);
-lean_dec(x_229);
-lean_dec(x_228);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_251 = lean_ctor_get(x_242, 0);
-lean_inc(x_251);
-x_252 = lean_ctor_get(x_242, 1);
-lean_inc(x_252);
-if (lean_is_exclusive(x_242)) {
- lean_ctor_release(x_242, 0);
- lean_ctor_release(x_242, 1);
- x_253 = x_242;
-} else {
- lean_dec_ref(x_242);
- x_253 = lean_box(0);
-}
-if (lean_is_scalar(x_253)) {
- x_254 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_254 = x_253;
-}
-lean_ctor_set(x_254, 0, x_251);
-lean_ctor_set(x_254, 1, x_252);
-return x_254;
-}
-}
-else
-{
-lean_object* x_255; lean_object* x_256; lean_object* x_257; 
-x_255 = lean_ctor_get(x_237, 0);
-lean_inc(x_255);
-if (lean_is_exclusive(x_237)) {
- lean_ctor_release(x_237, 0);
- x_256 = x_237;
-} else {
- lean_dec_ref(x_237);
- x_256 = lean_box(0);
-}
+lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; 
+x_244 = l_Lean_Syntax_inhabited;
+x_245 = l_Option_get_x21___rarg___closed__3;
+x_246 = lean_panic_fn(x_244, x_245);
 lean_inc(x_5);
-x_257 = l_Lean_Elab_Term_ensureHasType(x_255, x_238, x_231, x_5, x_236);
-if (lean_obj_tag(x_257) == 0)
+x_247 = l_Lean_Elab_Term_ensureHasType(x_246, x_243, x_236, x_5, x_241);
+if (lean_obj_tag(x_247) == 0)
 {
-lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; 
-x_258 = lean_ctor_get(x_257, 0);
-lean_inc(x_258);
-x_259 = lean_ctor_get(x_257, 1);
-lean_inc(x_259);
-lean_dec(x_257);
-if (lean_is_scalar(x_256)) {
- x_260 = lean_alloc_ctor(1, 1, 0);
+lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; 
+x_248 = lean_ctor_get(x_247, 0);
+lean_inc(x_248);
+x_249 = lean_ctor_get(x_247, 1);
+lean_inc(x_249);
+lean_dec(x_247);
+x_250 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_250, 0, x_248);
+if (lean_is_scalar(x_235)) {
+ x_251 = lean_alloc_ctor(0, 4, 2);
 } else {
- x_260 = x_256;
+ x_251 = x_235;
 }
-lean_ctor_set(x_260, 0, x_258);
-if (lean_is_scalar(x_230)) {
- x_261 = lean_alloc_ctor(0, 3, 1);
-} else {
- x_261 = x_230;
-}
-lean_ctor_set(x_261, 0, x_228);
-lean_ctor_set(x_261, 1, x_229);
-lean_ctor_set(x_261, 2, x_260);
-lean_ctor_set_uint8(x_261, sizeof(void*)*3, x_213);
-x_262 = lean_array_push(x_3, x_261);
-x_263 = lean_unsigned_to_nat(1u);
-x_264 = lean_nat_add(x_2, x_263);
+lean_ctor_set(x_251, 0, x_231);
+lean_ctor_set(x_251, 1, x_232);
+lean_ctor_set(x_251, 2, x_233);
+lean_ctor_set(x_251, 3, x_250);
+lean_ctor_set_uint8(x_251, sizeof(void*)*4, x_216);
+lean_ctor_set_uint8(x_251, sizeof(void*)*4 + 1, x_234);
+x_252 = lean_array_push(x_3, x_251);
+x_253 = lean_unsigned_to_nat(1u);
+x_254 = lean_nat_add(x_2, x_253);
 lean_dec(x_2);
-x_2 = x_264;
-x_3 = x_262;
-x_6 = x_259;
+x_2 = x_254;
+x_3 = x_252;
+x_6 = x_249;
 goto _start;
 }
 else
 {
-lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-lean_dec(x_256);
-lean_dec(x_230);
-lean_dec(x_229);
-lean_dec(x_228);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_266 = lean_ctor_get(x_257, 0);
-lean_inc(x_266);
-x_267 = lean_ctor_get(x_257, 1);
-lean_inc(x_267);
-if (lean_is_exclusive(x_257)) {
- lean_ctor_release(x_257, 0);
- lean_ctor_release(x_257, 1);
- x_268 = x_257;
-} else {
- lean_dec_ref(x_257);
- x_268 = lean_box(0);
-}
-if (lean_is_scalar(x_268)) {
- x_269 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_269 = x_268;
-}
-lean_ctor_set(x_269, 0, x_266);
-lean_ctor_set(x_269, 1, x_267);
-return x_269;
-}
-}
-}
-else
-{
-lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; 
+lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; 
+lean_dec(x_235);
+lean_dec(x_233);
+lean_dec(x_232);
+lean_dec(x_231);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_256 = lean_ctor_get(x_247, 0);
+lean_inc(x_256);
+x_257 = lean_ctor_get(x_247, 1);
+lean_inc(x_257);
+if (lean_is_exclusive(x_247)) {
+ lean_ctor_release(x_247, 0);
+ lean_ctor_release(x_247, 1);
+ x_258 = x_247;
+} else {
+ lean_dec_ref(x_247);
+ x_258 = lean_box(0);
+}
+if (lean_is_scalar(x_258)) {
+ x_259 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_259 = x_258;
+}
+lean_ctor_set(x_259, 0, x_256);
+lean_ctor_set(x_259, 1, x_257);
+return x_259;
+}
+}
+else
+{
+lean_object* x_260; lean_object* x_261; lean_object* x_262; 
+x_260 = lean_ctor_get(x_242, 0);
+lean_inc(x_260);
+if (lean_is_exclusive(x_242)) {
+ lean_ctor_release(x_242, 0);
+ x_261 = x_242;
+} else {
+ lean_dec_ref(x_242);
+ x_261 = lean_box(0);
+}
+lean_inc(x_5);
+x_262 = l_Lean_Elab_Term_ensureHasType(x_260, x_243, x_236, x_5, x_241);
+if (lean_obj_tag(x_262) == 0)
+{
+lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
+x_263 = lean_ctor_get(x_262, 0);
+lean_inc(x_263);
+x_264 = lean_ctor_get(x_262, 1);
+lean_inc(x_264);
+lean_dec(x_262);
+if (lean_is_scalar(x_261)) {
+ x_265 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_265 = x_261;
+}
+lean_ctor_set(x_265, 0, x_263);
+if (lean_is_scalar(x_235)) {
+ x_266 = lean_alloc_ctor(0, 4, 2);
+} else {
+ x_266 = x_235;
+}
+lean_ctor_set(x_266, 0, x_231);
+lean_ctor_set(x_266, 1, x_232);
+lean_ctor_set(x_266, 2, x_233);
+lean_ctor_set(x_266, 3, x_265);
+lean_ctor_set_uint8(x_266, sizeof(void*)*4, x_216);
+lean_ctor_set_uint8(x_266, sizeof(void*)*4 + 1, x_234);
+x_267 = lean_array_push(x_3, x_266);
+x_268 = lean_unsigned_to_nat(1u);
+x_269 = lean_nat_add(x_2, x_268);
+lean_dec(x_2);
+x_2 = x_269;
+x_3 = x_267;
+x_6 = x_264;
+goto _start;
+}
+else
+{
+lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
+lean_dec(x_261);
+lean_dec(x_235);
+lean_dec(x_233);
+lean_dec(x_232);
+lean_dec(x_231);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_271 = lean_ctor_get(x_262, 0);
+lean_inc(x_271);
+x_272 = lean_ctor_get(x_262, 1);
+lean_inc(x_272);
+if (lean_is_exclusive(x_262)) {
+ lean_ctor_release(x_262, 0);
+ lean_ctor_release(x_262, 1);
+ x_273 = x_262;
+} else {
+ lean_dec_ref(x_262);
+ x_273 = lean_box(0);
+}
+if (lean_is_scalar(x_273)) {
+ x_274 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_274 = x_273;
+}
+lean_ctor_set(x_274, 0, x_271);
+lean_ctor_set(x_274, 1, x_272);
+return x_274;
+}
+}
+}
+else
+{
+lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; 
+lean_dec(x_237);
+lean_dec(x_236);
+lean_dec(x_235);
+lean_dec(x_233);
 lean_dec(x_232);
 lean_dec(x_231);
-lean_dec(x_230);
-lean_dec(x_229);
-lean_dec(x_228);
 lean_dec(x_10);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_270 = lean_ctor_get(x_234, 0);
-lean_inc(x_270);
-x_271 = lean_ctor_get(x_234, 1);
-lean_inc(x_271);
-if (lean_is_exclusive(x_234)) {
- lean_ctor_release(x_234, 0);
- lean_ctor_release(x_234, 1);
- x_272 = x_234;
+x_275 = lean_ctor_get(x_239, 0);
+lean_inc(x_275);
+x_276 = lean_ctor_get(x_239, 1);
+lean_inc(x_276);
+if (lean_is_exclusive(x_239)) {
+ lean_ctor_release(x_239, 0);
+ lean_ctor_release(x_239, 1);
+ x_277 = x_239;
 } else {
- lean_dec_ref(x_234);
- x_272 = lean_box(0);
+ lean_dec_ref(x_239);
+ x_277 = lean_box(0);
 }
-if (lean_is_scalar(x_272)) {
- x_273 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_277)) {
+ x_278 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_273 = x_272;
+ x_278 = x_277;
 }
-lean_ctor_set(x_273, 0, x_270);
-lean_ctor_set(x_273, 1, x_271);
-return x_273;
+lean_ctor_set(x_278, 0, x_275);
+lean_ctor_set(x_278, 1, x_276);
+return x_278;
 }
 }
 else
 {
-lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; 
-lean_dec(x_212);
+lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 
+lean_dec(x_215);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_274 = lean_ctor_get(x_10, 5);
-lean_inc(x_274);
+x_279 = lean_ctor_get(x_10, 5);
+lean_inc(x_279);
 lean_dec(x_10);
-x_275 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_275, 0, x_19);
-x_276 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__9;
-x_277 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_277, 0, x_276);
-lean_ctor_set(x_277, 1, x_275);
-x_278 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__12;
-x_279 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_279, 0, x_277);
-lean_ctor_set(x_279, 1, x_278);
-if (lean_obj_tag(x_274) == 0)
+x_280 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_280, 0, x_19);
+x_281 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__9;
+x_282 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_282, 0, x_281);
+lean_ctor_set(x_282, 1, x_280);
+x_283 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___closed__12;
+x_284 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_284, 0, x_282);
+lean_ctor_set(x_284, 1, x_283);
+if (lean_obj_tag(x_279) == 0)
 {
-lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; 
-x_280 = l_Lean_Syntax_inhabited;
-x_281 = l_Option_get_x21___rarg___closed__3;
-x_282 = lean_panic_fn(x_280, x_281);
-x_283 = l_Lean_Elab_Term_throwError___rarg(x_282, x_279, x_5, x_16);
-lean_dec(x_282);
-return x_283;
+lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; 
+x_285 = l_Lean_Syntax_inhabited;
+x_286 = l_Option_get_x21___rarg___closed__3;
+x_287 = lean_panic_fn(x_285, x_286);
+x_288 = l_Lean_Elab_Term_throwError___rarg(x_287, x_284, x_5, x_16);
+lean_dec(x_287);
+return x_288;
 }
 else
 {
-lean_object* x_284; lean_object* x_285; 
-x_284 = lean_ctor_get(x_274, 0);
-lean_inc(x_284);
-lean_dec(x_274);
-x_285 = l_Lean_Elab_Term_throwError___rarg(x_284, x_279, x_5, x_16);
-lean_dec(x_284);
-return x_285;
+lean_object* x_289; lean_object* x_290; 
+x_289 = lean_ctor_get(x_279, 0);
+lean_inc(x_289);
+lean_dec(x_279);
+x_290 = l_Lean_Elab_Term_throwError___rarg(x_289, x_284, x_5, x_16);
+lean_dec(x_289);
+return x_290;
 }
 }
 }
 }
 default: 
 {
-lean_object* x_286; lean_object* x_287; lean_object* x_288; 
-lean_dec(x_212);
+lean_object* x_291; lean_object* x_292; lean_object* x_293; 
+lean_dec(x_215);
 lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
@@ -4783,10 +5244,10 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_286 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
-x_287 = l_unreachable_x21___rarg(x_286);
-x_288 = lean_apply_2(x_287, x_5, x_16);
-return x_288;
+x_291 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
+x_292 = l_unreachable_x21___rarg(x_291);
+x_293 = lean_apply_2(x_292, x_5, x_16);
+return x_293;
 }
 }
 }
@@ -4794,30 +5255,30 @@ return x_288;
 }
 else
 {
-uint8_t x_289; 
+uint8_t x_294; 
 lean_dec(x_10);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_289 = !lean_is_exclusive(x_14);
-if (x_289 == 0)
+x_294 = !lean_is_exclusive(x_14);
+if (x_294 == 0)
 {
 return x_14;
 }
 else
 {
-lean_object* x_290; lean_object* x_291; lean_object* x_292; 
-x_290 = lean_ctor_get(x_14, 0);
-x_291 = lean_ctor_get(x_14, 1);
-lean_inc(x_291);
-lean_inc(x_290);
+lean_object* x_295; lean_object* x_296; lean_object* x_297; 
+x_295 = lean_ctor_get(x_14, 0);
+x_296 = lean_ctor_get(x_14, 1);
+lean_inc(x_296);
+lean_inc(x_295);
 lean_dec(x_14);
-x_292 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_292, 0, x_290);
-lean_ctor_set(x_292, 1, x_291);
-return x_292;
+x_297 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_297, 0, x_295);
+lean_ctor_set(x_297, 1, x_296);
+return x_297;
 }
 }
 }
@@ -4831,13 +5292,14 @@ x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_10__withFields_
 return x_2;
 }
 }
-lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_10; 
-x_10 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_4);
-return x_10;
+lean_object* x_11; 
+x_11 = l___private_Lean_Elab_Structure_10__withFields___main___rarg___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_5);
+lean_dec(x_1);
+return x_11;
 }
 }
 lean_object* l___private_Lean_Elab_Structure_10__withFields___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
@@ -5070,7 +5532,7 @@ x_11 = lean_array_fget(x_3, x_4);
 x_12 = lean_unsigned_to_nat(1u);
 x_13 = lean_nat_add(x_4, x_12);
 lean_dec(x_4);
-x_14 = lean_ctor_get(x_11, 1);
+x_14 = lean_ctor_get(x_11, 2);
 lean_inc(x_14);
 lean_inc(x_6);
 x_15 = l_Lean_Elab_Term_inferType(x_1, x_14, x_6, x_7);
@@ -5084,7 +5546,7 @@ lean_inc(x_17);
 lean_dec(x_15);
 lean_inc(x_6);
 x_18 = l_Lean_Elab_Term_collectUsedFVars(x_1, x_5, x_16, x_6, x_17);
-x_19 = lean_ctor_get(x_11, 2);
+x_19 = lean_ctor_get(x_11, 3);
 lean_inc(x_19);
 lean_dec(x_11);
 if (lean_obj_tag(x_19) == 0)
@@ -5683,7 +6145,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
 x_12 = lean_array_fget(x_3, x_2);
 x_13 = lean_unsigned_to_nat(0u);
 x_14 = lean_array_fset(x_3, x_2, x_13);
@@ -5692,202 +6154,211 @@ x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
 x_17 = lean_ctor_get(x_15, 1);
 lean_inc(x_17);
-x_18 = lean_ctor_get_uint8(x_15, sizeof(void*)*3);
-x_19 = lean_ctor_get(x_15, 2);
-lean_inc(x_19);
-lean_inc(x_5);
-lean_inc(x_17);
-x_20 = l___private_Lean_Elab_Structure_14__levelMVarToParamFVar(x_1, x_17, x_4, x_5, x_6);
-if (lean_obj_tag(x_20) == 0)
-{
-lean_object* x_21; 
-x_21 = lean_ctor_get(x_20, 0);
+x_18 = lean_ctor_get(x_15, 2);
+lean_inc(x_18);
+x_19 = lean_ctor_get_uint8(x_15, sizeof(void*)*4);
+x_20 = lean_ctor_get_uint8(x_15, sizeof(void*)*4 + 1);
+x_21 = lean_ctor_get(x_15, 3);
 lean_inc(x_21);
-if (lean_obj_tag(x_19) == 0)
+lean_inc(x_5);
+lean_inc(x_18);
+x_22 = l___private_Lean_Elab_Structure_14__levelMVarToParamFVar(x_1, x_18, x_4, x_5, x_6);
+if (lean_obj_tag(x_22) == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+if (lean_obj_tag(x_21) == 0)
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-x_22 = lean_ctor_get(x_20, 1);
-lean_inc(x_22);
-lean_dec(x_20);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = lean_unsigned_to_nat(1u);
-x_25 = lean_nat_add(x_2, x_24);
-x_26 = x_15;
-x_27 = lean_array_fset(x_14, x_2, x_26);
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_unsigned_to_nat(1u);
+x_27 = lean_nat_add(x_2, x_26);
+x_28 = x_15;
+x_29 = lean_array_fset(x_14, x_2, x_28);
 lean_dec(x_2);
-x_2 = x_25;
-x_3 = x_27;
-x_4 = x_23;
-x_6 = x_22;
+x_2 = x_27;
+x_3 = x_29;
+x_4 = x_25;
+x_6 = x_24;
 goto _start;
 }
 else
 {
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_15);
-if (x_29 == 0)
+uint8_t x_31; 
+x_31 = !lean_is_exclusive(x_15);
+if (x_31 == 0)
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_30 = lean_ctor_get(x_15, 2);
-lean_dec(x_30);
-x_31 = lean_ctor_get(x_15, 1);
-lean_dec(x_31);
-x_32 = lean_ctor_get(x_15, 0);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_32 = lean_ctor_get(x_15, 3);
 lean_dec(x_32);
-x_33 = lean_ctor_get(x_20, 1);
-lean_inc(x_33);
-lean_dec(x_20);
-x_34 = lean_ctor_get(x_21, 1);
-lean_inc(x_34);
-lean_dec(x_21);
-x_35 = !lean_is_exclusive(x_19);
-if (x_35 == 0)
+x_33 = lean_ctor_get(x_15, 2);
+lean_dec(x_33);
+x_34 = lean_ctor_get(x_15, 1);
+lean_dec(x_34);
+x_35 = lean_ctor_get(x_15, 0);
+lean_dec(x_35);
+x_36 = lean_ctor_get(x_22, 1);
+lean_inc(x_36);
+lean_dec(x_22);
+x_37 = lean_ctor_get(x_23, 1);
+lean_inc(x_37);
+lean_dec(x_23);
+x_38 = !lean_is_exclusive(x_21);
+if (x_38 == 0)
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_36 = lean_ctor_get(x_19, 0);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_39 = lean_ctor_get(x_21, 0);
 lean_inc(x_5);
-x_37 = l_Lean_Elab_Term_levelMVarToParam_x27(x_36, x_34, x_5, x_33);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-x_40 = lean_ctor_get(x_38, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_38, 1);
+x_40 = l_Lean_Elab_Term_levelMVarToParam_x27(x_39, x_37, x_5, x_36);
+x_41 = lean_ctor_get(x_40, 0);
 lean_inc(x_41);
-lean_dec(x_38);
-lean_ctor_set(x_19, 0, x_40);
-x_42 = lean_unsigned_to_nat(1u);
-x_43 = lean_nat_add(x_2, x_42);
-x_44 = x_15;
-x_45 = lean_array_fset(x_14, x_2, x_44);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+x_43 = lean_ctor_get(x_41, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_41, 1);
+lean_inc(x_44);
+lean_dec(x_41);
+lean_ctor_set(x_21, 0, x_43);
+x_45 = lean_unsigned_to_nat(1u);
+x_46 = lean_nat_add(x_2, x_45);
+x_47 = x_15;
+x_48 = lean_array_fset(x_14, x_2, x_47);
 lean_dec(x_2);
-x_2 = x_43;
-x_3 = x_45;
-x_4 = x_41;
-x_6 = x_39;
+x_2 = x_46;
+x_3 = x_48;
+x_4 = x_44;
+x_6 = x_42;
 goto _start;
 }
 else
 {
-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; 
-x_47 = lean_ctor_get(x_19, 0);
-lean_inc(x_47);
-lean_dec(x_19);
-lean_inc(x_5);
-x_48 = l_Lean_Elab_Term_levelMVarToParam_x27(x_47, x_34, x_5, x_33);
-x_49 = lean_ctor_get(x_48, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
+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; 
+x_50 = lean_ctor_get(x_21, 0);
 lean_inc(x_50);
-lean_dec(x_48);
-x_51 = lean_ctor_get(x_49, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_49, 1);
+lean_dec(x_21);
+lean_inc(x_5);
+x_51 = l_Lean_Elab_Term_levelMVarToParam_x27(x_50, x_37, x_5, x_36);
+x_52 = lean_ctor_get(x_51, 0);
 lean_inc(x_52);
-lean_dec(x_49);
-x_53 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_53, 0, x_51);
-lean_ctor_set(x_15, 2, x_53);
-x_54 = lean_unsigned_to_nat(1u);
-x_55 = lean_nat_add(x_2, x_54);
-x_56 = x_15;
-x_57 = lean_array_fset(x_14, x_2, x_56);
+x_53 = lean_ctor_get(x_51, 1);
+lean_inc(x_53);
+lean_dec(x_51);
+x_54 = lean_ctor_get(x_52, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_52, 1);
+lean_inc(x_55);
+lean_dec(x_52);
+x_56 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_15, 3, x_56);
+x_57 = lean_unsigned_to_nat(1u);
+x_58 = lean_nat_add(x_2, x_57);
+x_59 = x_15;
+x_60 = lean_array_fset(x_14, x_2, x_59);
 lean_dec(x_2);
-x_2 = x_55;
-x_3 = x_57;
-x_4 = x_52;
-x_6 = x_50;
+x_2 = x_58;
+x_3 = x_60;
+x_4 = x_55;
+x_6 = x_53;
 goto _start;
 }
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
 lean_dec(x_15);
-x_59 = lean_ctor_get(x_20, 1);
-lean_inc(x_59);
-lean_dec(x_20);
-x_60 = lean_ctor_get(x_21, 1);
-lean_inc(x_60);
-lean_dec(x_21);
-x_61 = lean_ctor_get(x_19, 0);
-lean_inc(x_61);
-if (lean_is_exclusive(x_19)) {
- lean_ctor_release(x_19, 0);
- x_62 = x_19;
+x_62 = lean_ctor_get(x_22, 1);
+lean_inc(x_62);
+lean_dec(x_22);
+x_63 = lean_ctor_get(x_23, 1);
+lean_inc(x_63);
+lean_dec(x_23);
+x_64 = lean_ctor_get(x_21, 0);
+lean_inc(x_64);
+if (lean_is_exclusive(x_21)) {
+ lean_ctor_release(x_21, 0);
+ x_65 = x_21;
 } else {
- lean_dec_ref(x_19);
- x_62 = lean_box(0);
+ lean_dec_ref(x_21);
+ x_65 = lean_box(0);
 }
 lean_inc(x_5);
-x_63 = l_Lean_Elab_Term_levelMVarToParam_x27(x_61, x_60, x_5, x_59);
-x_64 = lean_ctor_get(x_63, 0);
-lean_inc(x_64);
-x_65 = lean_ctor_get(x_63, 1);
-lean_inc(x_65);
-lean_dec(x_63);
-x_66 = lean_ctor_get(x_64, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_64, 1);
+x_66 = l_Lean_Elab_Term_levelMVarToParam_x27(x_64, x_63, x_5, x_62);
+x_67 = lean_ctor_get(x_66, 0);
 lean_inc(x_67);
-lean_dec(x_64);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(1, 1, 0);
+x_68 = lean_ctor_get(x_66, 1);
+lean_inc(x_68);
+lean_dec(x_66);
+x_69 = lean_ctor_get(x_67, 0);
+lean_inc(x_69);
+x_70 = lean_ctor_get(x_67, 1);
+lean_inc(x_70);
+lean_dec(x_67);
+if (lean_is_scalar(x_65)) {
+ x_71 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_68 = x_62;
+ x_71 = x_65;
 }
-lean_ctor_set(x_68, 0, x_66);
-x_69 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_69, 0, x_16);
-lean_ctor_set(x_69, 1, x_17);
-lean_ctor_set(x_69, 2, x_68);
-lean_ctor_set_uint8(x_69, sizeof(void*)*3, x_18);
-x_70 = lean_unsigned_to_nat(1u);
-x_71 = lean_nat_add(x_2, x_70);
-x_72 = x_69;
-x_73 = lean_array_fset(x_14, x_2, x_72);
+lean_ctor_set(x_71, 0, x_69);
+x_72 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_72, 0, x_16);
+lean_ctor_set(x_72, 1, x_17);
+lean_ctor_set(x_72, 2, x_18);
+lean_ctor_set(x_72, 3, x_71);
+lean_ctor_set_uint8(x_72, sizeof(void*)*4, x_19);
+lean_ctor_set_uint8(x_72, sizeof(void*)*4 + 1, x_20);
+x_73 = lean_unsigned_to_nat(1u);
+x_74 = lean_nat_add(x_2, x_73);
+x_75 = x_72;
+x_76 = lean_array_fset(x_14, x_2, x_75);
 lean_dec(x_2);
-x_2 = x_71;
-x_3 = x_73;
-x_4 = x_67;
-x_6 = x_65;
+x_2 = x_74;
+x_3 = x_76;
+x_4 = x_70;
+x_6 = x_68;
 goto _start;
 }
 }
 }
 else
 {
-uint8_t x_75; 
-lean_dec(x_19);
+uint8_t x_78; 
+lean_dec(x_21);
+lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_5);
 lean_dec(x_2);
-x_75 = !lean_is_exclusive(x_20);
-if (x_75 == 0)
+x_78 = !lean_is_exclusive(x_22);
+if (x_78 == 0)
 {
-return x_20;
+return x_22;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_20, 0);
-x_77 = lean_ctor_get(x_20, 1);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_dec(x_20);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set(x_78, 1, x_77);
-return x_78;
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_22, 0);
+x_80 = lean_ctor_get(x_22, 1);
+lean_inc(x_80);
+lean_inc(x_79);
+lean_dec(x_22);
+x_81 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_81, 0, x_79);
+lean_ctor_set(x_81, 1, x_80);
+return x_81;
 }
 }
 }
@@ -6102,7 +6573,7 @@ x_13 = lean_array_fget(x_5, x_6);
 x_14 = lean_unsigned_to_nat(1u);
 x_15 = lean_nat_add(x_6, x_14);
 lean_dec(x_6);
-x_16 = lean_ctor_get(x_13, 1);
+x_16 = lean_ctor_get(x_13, 2);
 lean_inc(x_16);
 lean_dec(x_13);
 lean_inc(x_8);
@@ -6607,7 +7078,7 @@ x_11 = lean_array_fget(x_3, x_4);
 x_12 = lean_unsigned_to_nat(1u);
 x_13 = lean_nat_add(x_4, x_12);
 lean_dec(x_4);
-x_14 = lean_ctor_get(x_11, 1);
+x_14 = lean_ctor_get(x_11, 2);
 lean_inc(x_14);
 lean_dec(x_11);
 lean_inc(x_6);
@@ -6805,35 +7276,479 @@ lean_dec(x_1);
 return x_7;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1() {
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("WIP ");
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_nat_dec_eq(x_2, x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_8 = lean_unsigned_to_nat(1u);
+x_9 = lean_nat_sub(x_2, x_8);
+lean_dec(x_2);
+x_10 = l_Lean_Elab_Command_StructFieldInfo_inhabited;
+x_11 = lean_array_get(x_10, x_1, x_9);
+x_12 = lean_ctor_get(x_11, 2);
+lean_inc(x_12);
+lean_inc(x_4);
+x_13 = l_Lean_Elab_Term_getFVarLocalDecl_x21(x_12, x_4, x_5);
+if (lean_obj_tag(x_13) == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = l_Lean_mkOptionalNode___closed__2;
+x_17 = lean_array_push(x_16, x_12);
+x_18 = lean_expr_abstract(x_3, x_17);
+lean_dec(x_17);
+lean_dec(x_3);
+x_19 = lean_ctor_get_uint8(x_11, sizeof(void*)*4);
+lean_dec(x_11);
+switch (x_19) {
+case 0:
+{
+lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = l_Lean_LocalDecl_userName(x_14);
+x_21 = l_Lean_LocalDecl_binderInfo(x_14);
+x_22 = l_Lean_LocalDecl_type(x_14);
+lean_dec(x_14);
+x_23 = l_Lean_mkForall(x_20, x_21, x_22, x_18);
+lean_dec(x_20);
+x_2 = x_9;
+x_3 = x_23;
+x_5 = x_15;
+goto _start;
+}
+case 1:
+{
+lean_object* x_25; lean_object* x_26; 
+x_25 = l_Lean_LocalDecl_value(x_14);
+lean_dec(x_14);
+x_26 = lean_expr_instantiate1(x_18, x_25);
+lean_dec(x_25);
+lean_dec(x_18);
+x_2 = x_9;
+x_3 = x_26;
+x_5 = x_15;
+goto _start;
+}
+default: 
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; 
+x_28 = l_Lean_LocalDecl_userName(x_14);
+x_29 = l_Lean_mkHole___closed__3;
+x_30 = l_Lean_Name_appendBefore(x_28, x_29);
+x_31 = l_Lean_LocalDecl_binderInfo(x_14);
+x_32 = l_Lean_LocalDecl_type(x_14);
+lean_dec(x_14);
+x_33 = l_Lean_mkForall(x_30, x_31, x_32, x_18);
+lean_dec(x_30);
+x_2 = x_9;
+x_3 = x_33;
+x_5 = x_15;
+goto _start;
+}
+}
+}
+else
+{
+uint8_t x_35; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_9);
+lean_dec(x_4);
+lean_dec(x_3);
+x_35 = !lean_is_exclusive(x_13);
+if (x_35 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_36 = lean_ctor_get(x_13, 0);
+x_37 = lean_ctor_get(x_13, 1);
+lean_inc(x_37);
+lean_inc(x_36);
+lean_dec(x_13);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
+}
+}
+}
+else
+{
+lean_object* x_39; 
+lean_dec(x_4);
+lean_dec(x_2);
+x_39 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_39, 0, x_3);
+lean_ctor_set(x_39, 1, x_5);
+return x_39;
+}
+}
+}
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l___private_Lean_Elab_Structure_23__addCtorFields___main(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l___private_Lean_Elab_Structure_23__addCtorFields___main(x_1, x_2, x_3, x_4, x_5);
+return x_6;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_23__addCtorFields___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l___private_Lean_Elab_Structure_23__addCtorFields___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_23__addCtorFields___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l___private_Lean_Elab_Structure_23__addCtorFields(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_24__mkCtor(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_7 = lean_ctor_get(x_1, 4);
+lean_inc(x_7);
+x_8 = l_List_map___main___at_Lean_Meta_addGlobalInstance___spec__1(x_2);
+x_9 = l_Lean_mkConst(x_7, x_8);
+x_10 = lean_unsigned_to_nat(0u);
+x_11 = l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1(x_3, x_3, x_10, x_9);
+x_12 = lean_ctor_get(x_1, 0);
+lean_inc(x_12);
+x_13 = lean_array_get_size(x_4);
+lean_inc(x_5);
+x_14 = l___private_Lean_Elab_Structure_23__addCtorFields___main(x_4, x_13, x_11, x_5, x_6);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+lean_inc(x_5);
+lean_inc(x_3);
+x_17 = l_Lean_Elab_Term_mkForall(x_12, x_3, x_15, x_5, x_16);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_18 = lean_ctor_get(x_17, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_17, 1);
+lean_inc(x_19);
+lean_dec(x_17);
+x_20 = l_Lean_Elab_Term_instantiateMVars(x_12, x_18, x_5, x_19);
+lean_dec(x_12);
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_22 = lean_ctor_get(x_20, 0);
+x_23 = lean_array_get_size(x_3);
+lean_dec(x_3);
+x_24 = lean_ctor_get(x_1, 9);
+lean_inc(x_24);
+lean_dec(x_1);
+x_25 = lean_ctor_get_uint8(x_24, sizeof(void*)*4);
+if (x_25 == 0)
+{
+lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; 
+x_26 = lean_ctor_get(x_24, 3);
+lean_inc(x_26);
+lean_dec(x_24);
+x_27 = 1;
+x_28 = l_Lean_Expr_inferImplicit___main(x_22, x_23, x_27);
+lean_dec(x_23);
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_26);
+lean_ctor_set(x_29, 1, x_28);
+lean_ctor_set(x_20, 0, x_29);
+return x_20;
+}
+else
+{
+lean_object* x_30; uint8_t x_31; lean_object* x_32; lean_object* x_33; 
+x_30 = lean_ctor_get(x_24, 3);
+lean_inc(x_30);
+lean_dec(x_24);
+x_31 = 0;
+x_32 = l_Lean_Expr_inferImplicit___main(x_22, x_23, x_31);
+lean_dec(x_23);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_30);
+lean_ctor_set(x_33, 1, x_32);
+lean_ctor_set(x_20, 0, x_33);
+return x_20;
+}
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_34 = lean_ctor_get(x_20, 0);
+x_35 = lean_ctor_get(x_20, 1);
+lean_inc(x_35);
+lean_inc(x_34);
+lean_dec(x_20);
+x_36 = lean_array_get_size(x_3);
+lean_dec(x_3);
+x_37 = lean_ctor_get(x_1, 9);
+lean_inc(x_37);
+lean_dec(x_1);
+x_38 = lean_ctor_get_uint8(x_37, sizeof(void*)*4);
+if (x_38 == 0)
+{
+lean_object* x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_39 = lean_ctor_get(x_37, 3);
+lean_inc(x_39);
+lean_dec(x_37);
+x_40 = 1;
+x_41 = l_Lean_Expr_inferImplicit___main(x_34, x_36, x_40);
+lean_dec(x_36);
+x_42 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_42, 0, x_39);
+lean_ctor_set(x_42, 1, x_41);
+x_43 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_43, 1, x_35);
+return x_43;
+}
+else
+{
+lean_object* x_44; uint8_t x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_44 = lean_ctor_get(x_37, 3);
+lean_inc(x_44);
+lean_dec(x_37);
+x_45 = 0;
+x_46 = l_Lean_Expr_inferImplicit___main(x_34, x_36, x_45);
+lean_dec(x_36);
+x_47 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_47, 0, x_44);
+lean_ctor_set(x_47, 1, x_46);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_35);
+return x_48;
+}
+}
+}
+else
+{
+uint8_t x_49; 
+lean_dec(x_12);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_1);
+x_49 = !lean_is_exclusive(x_17);
+if (x_49 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_17, 0);
+x_51 = lean_ctor_get(x_17, 1);
+lean_inc(x_51);
+lean_inc(x_50);
+lean_dec(x_17);
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_50);
+lean_ctor_set(x_52, 1, x_51);
+return x_52;
+}
+}
+}
+else
+{
+uint8_t x_53; 
+lean_dec(x_12);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_1);
+x_53 = !lean_is_exclusive(x_14);
+if (x_53 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_54 = lean_ctor_get(x_14, 0);
+x_55 = lean_ctor_get(x_14, 1);
+lean_inc(x_55);
+lean_inc(x_54);
+lean_dec(x_14);
+x_56 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_56, 1, x_55);
+return x_56;
+}
+}
+}
+}
+lean_object* l___private_Lean_Elab_Structure_24__mkCtor___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l___private_Lean_Elab_Structure_24__mkCtor(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+return x_7;
+}
+}
+lean_object* l_Array_filterAux___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_1);
+x_5 = lean_nat_dec_lt(x_2, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_2);
+x_6 = l_Array_shrink___main___rarg(x_1, x_3);
+lean_dec(x_3);
+return x_6;
+}
+else
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_array_fget(x_1, x_2);
+x_8 = l_Lean_Elab_Command_StructFieldInfo_isFromParent(x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+x_9 = lean_nat_dec_lt(x_3, x_2);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_2, x_10);
+lean_dec(x_2);
+x_12 = lean_nat_add(x_3, x_10);
+lean_dec(x_3);
+x_2 = x_11;
+x_3 = x_12;
+goto _start;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_array_fswap(x_1, x_2, x_3);
+x_15 = lean_unsigned_to_nat(1u);
+x_16 = lean_nat_add(x_2, x_15);
+lean_dec(x_2);
+x_17 = lean_nat_add(x_3, x_15);
+lean_dec(x_3);
+x_1 = x_14;
+x_2 = x_16;
+x_3 = x_17;
+goto _start;
+}
+}
+else
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_add(x_2, x_19);
+lean_dec(x_2);
+x_2 = x_20;
+goto _start;
+}
+}
+}
+}
+lean_object* l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_2; 
+x_2 = lean_box(0);
+return x_2;
+}
+else
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_1);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; 
+x_4 = lean_ctor_get(x_1, 0);
+x_5 = lean_ctor_get(x_1, 1);
+x_6 = lean_ctor_get(x_4, 1);
+lean_inc(x_6);
+x_7 = lean_ctor_get_uint8(x_4, sizeof(void*)*4 + 1);
+lean_dec(x_4);
+x_8 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_8, 0, x_6);
+lean_ctor_set_uint8(x_8, sizeof(void*)*1, x_7);
+x_9 = l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(x_5);
+lean_ctor_set(x_1, 1, x_9);
+lean_ctor_set(x_1, 0, x_8);
 return x_1;
 }
-}
-lean_object* _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2() {
-_start:
+else
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_10 = lean_ctor_get(x_1, 0);
+x_11 = lean_ctor_get(x_1, 1);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_dec(x_1);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+x_13 = lean_ctor_get_uint8(x_10, sizeof(void*)*4 + 1);
+lean_dec(x_10);
+x_14 = lean_alloc_ctor(0, 1, 1);
+lean_ctor_set(x_14, 0, x_12);
+lean_ctor_set_uint8(x_14, sizeof(void*)*1, x_13);
+x_15 = l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(x_11);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+return x_16;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
 }
 }
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
@@ -6852,60 +7767,59 @@ if (x_5 == 0)
 {
 x_13 = x_6;
 x_14 = x_12;
-goto block_54;
+goto block_85;
 }
 else
 {
-lean_object* x_55; 
+lean_object* x_86; 
 lean_inc(x_8);
-x_55 = l___private_Lean_Elab_Structure_19__updateResultingUniverse(x_1, x_11, x_6, x_8, x_12);
-if (lean_obj_tag(x_55) == 0)
+x_86 = l___private_Lean_Elab_Structure_19__updateResultingUniverse(x_1, x_11, x_6, x_8, x_12);
+if (lean_obj_tag(x_86) == 0)
 {
-lean_object* x_56; lean_object* x_57; 
-x_56 = lean_ctor_get(x_55, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 1);
-lean_inc(x_57);
-lean_dec(x_55);
-x_13 = x_56;
-x_14 = x_57;
-goto block_54;
+lean_object* x_87; lean_object* x_88; 
+x_87 = lean_ctor_get(x_86, 0);
+lean_inc(x_87);
+x_88 = lean_ctor_get(x_86, 1);
+lean_inc(x_88);
+lean_dec(x_86);
+x_13 = x_87;
+x_14 = x_88;
+goto block_85;
 }
 else
 {
-uint8_t x_58; 
+uint8_t x_89; 
 lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-x_58 = !lean_is_exclusive(x_55);
-if (x_58 == 0)
+x_89 = !lean_is_exclusive(x_86);
+if (x_89 == 0)
 {
-return x_55;
+return x_86;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_55, 0);
-x_60 = lean_ctor_get(x_55, 1);
-lean_inc(x_60);
-lean_inc(x_59);
-lean_dec(x_55);
-x_61 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_61, 0, x_59);
-lean_ctor_set(x_61, 1, x_60);
-return x_61;
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_86, 0);
+x_91 = lean_ctor_get(x_86, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_86);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
 }
 }
 }
-block_54:
+block_85:
 {
 lean_object* x_15; 
 lean_inc(x_8);
 x_15 = l___private_Lean_Elab_Structure_22__collectLevelParamsInStructure(x_1, x_7, x_2, x_11, x_8, x_14);
-lean_dec(x_11);
 if (lean_obj_tag(x_15) == 0)
 {
 lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
@@ -6918,13 +7832,14 @@ x_18 = lean_ctor_get(x_4, 2);
 lean_inc(x_18);
 x_19 = lean_ctor_get(x_4, 3);
 lean_inc(x_19);
-lean_dec(x_4);
 x_20 = l_Lean_Elab_Command_sortDeclLevelParams(x_18, x_19, x_16);
 if (lean_obj_tag(x_20) == 0)
 {
 lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
 lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_2);
 x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
@@ -6939,167 +7854,290 @@ return x_24;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; 
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
 x_25 = lean_ctor_get(x_20, 0);
 lean_inc(x_25);
 lean_dec(x_20);
+x_26 = lean_unsigned_to_nat(0u);
+lean_inc(x_7);
+x_27 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_2, x_2, x_26, x_7);
 lean_inc(x_8);
-x_26 = l_Lean_Elab_Term_mkForall(x_1, x_2, x_13, x_8, x_17);
-if (lean_obj_tag(x_26) == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
-x_28 = lean_ctor_get(x_26, 1);
-lean_inc(x_28);
-lean_dec(x_26);
-lean_inc(x_8);
-x_29 = l_Lean_Elab_Term_mkForall(x_1, x_7, x_27, x_8, x_28);
-if (lean_obj_tag(x_29) == 0)
+lean_inc(x_25);
+lean_inc(x_4);
+x_28 = l___private_Lean_Elab_Structure_24__mkCtor(x_4, x_25, x_27, x_11, x_8, x_17);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_30 = lean_ctor_get(x_29, 0);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_28, 0);
+lean_inc(x_29);
+x_30 = lean_ctor_get(x_28, 1);
 lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = l_List_toString___at_Lean_Elab_OpenDecl_HasToString___spec__2(x_25);
-x_33 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_33, 0, x_32);
-x_34 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_34, 0, x_33);
-x_35 = l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3;
-x_36 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-x_37 = l_Lean_Meta_Exception_toTraceMessageData___closed__4;
-x_38 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-x_39 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_39, 0, x_30);
-x_40 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-x_41 = l_Lean_Elab_Term_throwError___rarg(x_1, x_40, x_8, x_31);
+lean_dec(x_28);
+lean_inc(x_8);
+x_31 = l_Lean_Elab_Term_mkForall(x_1, x_2, x_13, x_8, x_30);
+if (lean_obj_tag(x_31) == 0)
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
+lean_inc(x_33);
+lean_dec(x_31);
+lean_inc(x_8);
+x_34 = l_Lean_Elab_Term_mkForall(x_1, x_7, x_32, x_8, x_33);
+if (lean_obj_tag(x_34) == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = l_Lean_Elab_Term_instantiateMVars(x_1, x_35, x_8, x_36);
 lean_dec(x_1);
-return x_41;
-}
-else
+x_38 = !lean_is_exclusive(x_37);
+if (x_38 == 0)
 {
-uint8_t x_42; 
-lean_dec(x_25);
-lean_dec(x_8);
-lean_dec(x_1);
-x_42 = !lean_is_exclusive(x_29);
-if (x_42 == 0)
-{
-return x_29;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_29, 0);
-x_44 = lean_ctor_get(x_29, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_29);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_39 = lean_ctor_get(x_37, 0);
+x_40 = lean_ctor_get(x_4, 4);
+lean_inc(x_40);
+x_41 = lean_box(0);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_29);
+lean_ctor_set(x_42, 1, x_41);
+x_43 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_43, 0, x_40);
+lean_ctor_set(x_43, 1, x_39);
+lean_ctor_set(x_43, 2, x_42);
+x_44 = lean_array_get_size(x_27);
+lean_dec(x_27);
 x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_43);
-lean_ctor_set(x_45, 1, x_44);
-return x_45;
+lean_ctor_set(x_45, 1, x_41);
+x_46 = lean_ctor_get(x_4, 1);
+lean_inc(x_46);
+lean_dec(x_4);
+x_47 = lean_ctor_get_uint8(x_46, sizeof(void*)*2 + 3);
+lean_dec(x_46);
+x_48 = lean_alloc_ctor(6, 3, 1);
+lean_ctor_set(x_48, 0, x_25);
+lean_ctor_set(x_48, 1, x_44);
+lean_ctor_set(x_48, 2, x_45);
+lean_ctor_set_uint8(x_48, sizeof(void*)*3, x_47);
+x_49 = l_Array_filterAux___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__1(x_11, x_26, x_26);
+x_50 = l_Array_toList___rarg(x_49);
+lean_dec(x_49);
+x_51 = l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(x_50);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_48);
+lean_ctor_set(x_52, 1, x_51);
+lean_ctor_set(x_37, 0, x_52);
+return x_37;
+}
+else
+{
+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; uint8_t 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_53 = lean_ctor_get(x_37, 0);
+x_54 = lean_ctor_get(x_37, 1);
+lean_inc(x_54);
+lean_inc(x_53);
+lean_dec(x_37);
+x_55 = lean_ctor_get(x_4, 4);
+lean_inc(x_55);
+x_56 = lean_box(0);
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_29);
+lean_ctor_set(x_57, 1, x_56);
+x_58 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_58, 0, x_55);
+lean_ctor_set(x_58, 1, x_53);
+lean_ctor_set(x_58, 2, x_57);
+x_59 = lean_array_get_size(x_27);
+lean_dec(x_27);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_56);
+x_61 = lean_ctor_get(x_4, 1);
+lean_inc(x_61);
+lean_dec(x_4);
+x_62 = lean_ctor_get_uint8(x_61, sizeof(void*)*2 + 3);
+lean_dec(x_61);
+x_63 = lean_alloc_ctor(6, 3, 1);
+lean_ctor_set(x_63, 0, x_25);
+lean_ctor_set(x_63, 1, x_59);
+lean_ctor_set(x_63, 2, x_60);
+lean_ctor_set_uint8(x_63, sizeof(void*)*3, x_62);
+x_64 = l_Array_filterAux___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__1(x_11, x_26, x_26);
+x_65 = l_Array_toList___rarg(x_64);
+lean_dec(x_64);
+x_66 = l_List_map___main___at___private_Lean_Elab_Structure_25__elabStructureView___spec__2(x_65);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_63);
+lean_ctor_set(x_67, 1, x_66);
+x_68 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_54);
+return x_68;
+}
+}
+else
+{
+uint8_t x_69; 
+lean_dec(x_29);
+lean_dec(x_27);
+lean_dec(x_25);
+lean_dec(x_11);
+lean_dec(x_8);
+lean_dec(x_4);
+lean_dec(x_1);
+x_69 = !lean_is_exclusive(x_34);
+if (x_69 == 0)
+{
+return x_34;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_34, 0);
+x_71 = lean_ctor_get(x_34, 1);
+lean_inc(x_71);
+lean_inc(x_70);
+lean_dec(x_34);
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
 }
 }
 }
 else
 {
-uint8_t x_46; 
+uint8_t x_73; 
+lean_dec(x_29);
+lean_dec(x_27);
 lean_dec(x_25);
+lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
+lean_dec(x_4);
 lean_dec(x_1);
-x_46 = !lean_is_exclusive(x_26);
-if (x_46 == 0)
+x_73 = !lean_is_exclusive(x_31);
+if (x_73 == 0)
 {
-return x_26;
+return x_31;
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_47 = lean_ctor_get(x_26, 0);
-x_48 = lean_ctor_get(x_26, 1);
-lean_inc(x_48);
-lean_inc(x_47);
-lean_dec(x_26);
-x_49 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_49, 0, x_47);
-lean_ctor_set(x_49, 1, x_48);
-return x_49;
-}
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_31, 0);
+x_75 = lean_ctor_get(x_31, 1);
+lean_inc(x_75);
+lean_inc(x_74);
+lean_dec(x_31);
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_74);
+lean_ctor_set(x_76, 1, x_75);
+return x_76;
 }
 }
 }
 else
 {
-uint8_t x_50; 
+uint8_t x_77; 
+lean_dec(x_27);
+lean_dec(x_25);
 lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-x_50 = !lean_is_exclusive(x_15);
-if (x_50 == 0)
+x_77 = !lean_is_exclusive(x_28);
+if (x_77 == 0)
+{
+return x_28;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_28, 0);
+x_79 = lean_ctor_get(x_28, 1);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_dec(x_28);
+x_80 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_80, 0, x_78);
+lean_ctor_set(x_80, 1, x_79);
+return x_80;
+}
+}
+}
+}
+else
+{
+uint8_t x_81; 
+lean_dec(x_13);
+lean_dec(x_11);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_81 = !lean_is_exclusive(x_15);
+if (x_81 == 0)
 {
 return x_15;
 }
 else
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_15, 0);
-x_52 = lean_ctor_get(x_15, 1);
-lean_inc(x_52);
-lean_inc(x_51);
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_82 = lean_ctor_get(x_15, 0);
+x_83 = lean_ctor_get(x_15, 1);
+lean_inc(x_83);
+lean_inc(x_82);
 lean_dec(x_15);
-x_53 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_53, 0, x_51);
-lean_ctor_set(x_53, 1, x_52);
-return x_53;
+x_84 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_84, 0, x_82);
+lean_ctor_set(x_84, 1, x_83);
+return x_84;
 }
 }
 }
 }
 else
 {
-uint8_t x_62; 
+uint8_t x_93; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-x_62 = !lean_is_exclusive(x_10);
-if (x_62 == 0)
+x_93 = !lean_is_exclusive(x_10);
+if (x_93 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_63 = lean_ctor_get(x_10, 0);
-x_64 = lean_ctor_get(x_10, 1);
-lean_inc(x_64);
-lean_inc(x_63);
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_10, 0);
+x_95 = lean_ctor_get(x_10, 1);
+lean_inc(x_95);
+lean_inc(x_94);
 lean_dec(x_10);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_64);
-return x_65;
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+return x_96;
 }
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 uint8_t x_8; lean_object* x_9; lean_object* x_10; 
@@ -7139,7 +8177,7 @@ lean_inc(x_18);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_1);
-x_19 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___boxed), 9, 6);
+x_19 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1___boxed), 9, 6);
 lean_closure_set(x_19, 0, x_1);
 lean_closure_set(x_19, 1, x_4);
 lean_closure_set(x_19, 2, x_5);
@@ -7241,13 +8279,13 @@ return x_32;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_8 = lean_ctor_get(x_1, 10);
 lean_inc(x_8);
-x_9 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__2), 7, 4);
+x_9 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_25__elabStructureView___lambda__2), 7, 4);
 lean_closure_set(x_9, 0, x_2);
 lean_closure_set(x_9, 1, x_3);
 lean_closure_set(x_9, 2, x_1);
@@ -7257,7 +8295,7 @@ x_11 = l___private_Lean_Elab_Structure_10__withFields___main___rarg(x_8, x_10, x
 return x_11;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Structure_23__elabStructureView___closed__1() {
+lean_object* _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -7265,27 +8303,27 @@ x_1 = lean_mk_string("expected Type");
 return x_1;
 }
 }
-lean_object* _init_l___private_Lean_Elab_Structure_23__elabStructureView___closed__2() {
+lean_object* _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Structure_23__elabStructureView___closed__1;
+x_1 = l___private_Lean_Elab_Structure_25__elabStructureView___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___private_Lean_Elab_Structure_23__elabStructureView___closed__3() {
+lean_object* _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Structure_23__elabStructureView___closed__2;
+x_1 = l___private_Lean_Elab_Structure_25__elabStructureView___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; 
@@ -7308,7 +8346,7 @@ x_9 = l___private_Lean_Elab_Structure_4__validStructType(x_7);
 x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
 lean_inc(x_1);
-x_11 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__3), 7, 4);
+x_11 = lean_alloc_closure((void*)(l___private_Lean_Elab_Structure_25__elabStructureView___lambda__3), 7, 4);
 lean_closure_set(x_11, 0, x_1);
 lean_closure_set(x_11, 1, x_10);
 lean_closure_set(x_11, 2, x_7);
@@ -7318,7 +8356,7 @@ if (x_9 == 0)
 lean_object* x_12; lean_object* x_13; uint8_t x_14; 
 lean_dec(x_11);
 lean_dec(x_1);
-x_12 = l___private_Lean_Elab_Structure_23__elabStructureView___closed__3;
+x_12 = l___private_Lean_Elab_Structure_25__elabStructureView___closed__3;
 x_13 = l_Lean_Elab_Term_throwError___rarg(x_5, x_12, x_2, x_8);
 lean_dec(x_5);
 x_14 = !lean_is_exclusive(x_13);
@@ -7378,16 +8416,104 @@ return x_24;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_5);
 lean_dec(x_5);
-x_11 = l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
+x_11 = l___private_Lean_Elab_Structure_25__elabStructureView___lambda__1(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
+lean_object* l___private_Lean_Elab_Structure_26__mkProjections___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_4);
+lean_dec(x_4);
+x_6 = lean_mk_projections(x_1, x_2, x_3, x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_6;
+}
+}
+lean_object* l___private_Lean_Elab_Structure_27__addProjections(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+lean_inc(x_5);
+x_7 = l_Lean_Elab_Command_getEnv(x_5, x_6);
+if (lean_obj_tag(x_7) == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_mk_projections(x_8, x_2, x_3, x_4);
+if (lean_obj_tag(x_10) == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_12, 0, x_11);
+x_13 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+x_14 = l_Lean_Elab_Command_throwError___rarg(x_1, x_13, x_5, x_9);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_10, 0);
+lean_inc(x_15);
+lean_dec(x_10);
+x_16 = l_Lean_Elab_Command_setEnv(x_15, x_5, x_9);
+return x_16;
+}
+}
+else
+{
+uint8_t x_17; 
+lean_dec(x_5);
+x_17 = !lean_is_exclusive(x_7);
+if (x_17 == 0)
+{
+return x_7;
+}
+else
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_7, 0);
+x_19 = lean_ctor_get(x_7, 1);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_dec(x_7);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+return x_20;
+}
+}
+}
+}
+lean_object* l___private_Lean_Elab_Structure_27__addProjections___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; lean_object* x_8; 
+x_7 = lean_unbox(x_4);
+lean_dec(x_4);
+x_8 = l___private_Lean_Elab_Structure_27__addProjections(x_1, x_2, x_3, x_7, x_5, x_6);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_8;
+}
+}
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
@@ -7405,7 +8531,7 @@ lean_ctor_set(x_15, 8, x_9);
 lean_ctor_set(x_15, 9, x_10);
 lean_ctor_set(x_15, 10, x_11);
 lean_ctor_set_uint8(x_15, sizeof(void*)*11, x_5);
-x_16 = l___private_Lean_Elab_Structure_23__elabStructureView(x_15, x_13, x_14);
+x_16 = l___private_Lean_Elab_Structure_25__elabStructureView(x_15, x_13, x_14);
 return x_16;
 }
 }
@@ -7430,7 +8556,7 @@ x_17 = l_Lean_Elab_Term_elabBinders___rarg(x_11, x_16, x_13, x_14);
 return x_17;
 }
 }
-lean_object* l_Lean_Elab_Command_elabStructure___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l_Lean_Elab_Command_elabStructure___lambda__3(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
@@ -7438,680 +8564,751 @@ lean_inc(x_10);
 x_12 = l_Lean_Elab_Command_mkDeclName(x_1, x_2, x_9, x_10, x_11);
 if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_37; 
 x_13 = lean_ctor_get(x_12, 0);
 lean_inc(x_13);
 x_14 = lean_ctor_get(x_12, 1);
 lean_inc(x_14);
 lean_dec(x_12);
 lean_inc(x_10);
-x_15 = l_Lean_Elab_Command_getLevelNames(x_10, x_14);
-if (lean_obj_tag(x_15) == 0)
+x_37 = l_Lean_Elab_Command_getLevelNames(x_10, x_14);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_15, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_15, 1);
-lean_inc(x_17);
-lean_dec(x_15);
-lean_inc(x_10);
-lean_inc(x_3);
-x_18 = l___private_Lean_Elab_Structure_2__expandCtor(x_3, x_13, x_10, x_17);
-if (lean_obj_tag(x_18) == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
-lean_inc(x_20);
-lean_dec(x_18);
-lean_inc(x_10);
-x_21 = l___private_Lean_Elab_Structure_3__expandFields(x_3, x_13, x_10, x_20);
-if (lean_obj_tag(x_21) == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-lean_inc(x_13);
-x_24 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_24, 0, x_13);
-x_25 = lean_box(x_5);
-x_26 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabStructure___lambda__2___boxed), 14, 11);
-lean_closure_set(x_26, 0, x_3);
-lean_closure_set(x_26, 1, x_2);
-lean_closure_set(x_26, 2, x_4);
-lean_closure_set(x_26, 3, x_16);
-lean_closure_set(x_26, 4, x_25);
-lean_closure_set(x_26, 5, x_13);
-lean_closure_set(x_26, 6, x_6);
-lean_closure_set(x_26, 7, x_7);
-lean_closure_set(x_26, 8, x_19);
-lean_closure_set(x_26, 9, x_22);
-lean_closure_set(x_26, 10, x_8);
-lean_inc(x_10);
-x_27 = l___private_Lean_Elab_Command_2__getState(x_10, x_23);
-if (lean_obj_tag(x_27) == 0)
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_27, 1);
-lean_inc(x_29);
-lean_dec(x_27);
-x_30 = l___private_Lean_Elab_Command_9__getVarDecls(x_28);
-lean_dec(x_28);
-lean_inc(x_10);
-x_31 = l___private_Lean_Elab_Command_2__getState(x_10, x_29);
-if (lean_obj_tag(x_31) == 0)
-{
-lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
-lean_inc(x_33);
-lean_dec(x_31);
-x_34 = l___private_Lean_Elab_Command_6__mkTermContext(x_10, x_32, x_24);
-x_35 = l___private_Lean_Elab_Command_7__mkTermState(x_32);
-lean_dec(x_32);
-x_36 = l_Lean_Elab_Term_elabBinders___rarg(x_30, x_26, x_34, x_35);
-lean_dec(x_30);
-if (lean_obj_tag(x_36) == 0)
-{
-lean_object* x_37; lean_object* x_38; 
-x_37 = lean_ctor_get(x_36, 1);
-lean_inc(x_37);
-lean_dec(x_36);
-lean_inc(x_10);
-x_38 = l___private_Lean_Elab_Command_2__getState(x_10, x_33);
-if (lean_obj_tag(x_38) == 0)
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_39 = lean_ctor_get(x_37, 0);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_37, 1);
 lean_inc(x_39);
-x_40 = lean_ctor_get(x_38, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_38, 1);
-lean_inc(x_41);
-lean_dec(x_38);
-x_42 = lean_ctor_get(x_39, 0);
-lean_inc(x_42);
-lean_dec(x_39);
-x_43 = lean_ctor_get(x_37, 2);
-lean_inc(x_43);
 lean_dec(x_37);
-x_44 = !lean_is_exclusive(x_40);
-if (x_44 == 0)
+lean_inc(x_10);
+lean_inc(x_4);
+x_40 = l___private_Lean_Elab_Structure_2__expandCtor(x_4, x_2, x_13, x_10, x_39);
+if (lean_obj_tag(x_40) == 0)
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_40, 1);
-lean_dec(x_45);
-x_46 = lean_ctor_get(x_40, 0);
-lean_dec(x_46);
-lean_ctor_set(x_40, 1, x_43);
-lean_ctor_set(x_40, 0, x_42);
-x_47 = l___private_Lean_Elab_Command_3__setState(x_40, x_10, x_41);
-if (lean_obj_tag(x_47) == 0)
-{
-uint8_t x_48; 
-x_48 = !lean_is_exclusive(x_47);
-if (x_48 == 0)
-{
-lean_object* x_49; lean_object* x_50; 
-x_49 = lean_ctor_get(x_47, 0);
-lean_dec(x_49);
-x_50 = lean_box(0);
-lean_ctor_set(x_47, 0, x_50);
-return x_47;
-}
-else
-{
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_47, 1);
-lean_inc(x_51);
-lean_dec(x_47);
-x_52 = lean_box(0);
-x_53 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_53, 1, x_51);
-return x_53;
-}
-}
-else
-{
-uint8_t x_54; 
-x_54 = !lean_is_exclusive(x_47);
-if (x_54 == 0)
-{
-return x_47;
-}
-else
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_47, 0);
-x_56 = lean_ctor_get(x_47, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_47);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
-}
-}
-}
-else
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_58 = lean_ctor_get(x_40, 2);
-x_59 = lean_ctor_get(x_40, 3);
-x_60 = lean_ctor_get(x_40, 4);
-lean_inc(x_60);
-lean_inc(x_59);
-lean_inc(x_58);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_40, 0);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
 lean_dec(x_40);
-x_61 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_61, 0, x_42);
-lean_ctor_set(x_61, 1, x_43);
-lean_ctor_set(x_61, 2, x_58);
-lean_ctor_set(x_61, 3, x_59);
-lean_ctor_set(x_61, 4, x_60);
-x_62 = l___private_Lean_Elab_Command_3__setState(x_61, x_10, x_41);
-if (lean_obj_tag(x_62) == 0)
+lean_inc(x_10);
+x_43 = l___private_Lean_Elab_Structure_3__expandFields(x_4, x_2, x_13, x_10, x_42);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_63 = lean_ctor_get(x_62, 1);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
+lean_inc(x_13);
+x_46 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_46, 0, x_13);
+x_47 = lean_box(x_3);
+lean_inc(x_13);
+x_48 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabStructure___lambda__2___boxed), 14, 11);
+lean_closure_set(x_48, 0, x_4);
+lean_closure_set(x_48, 1, x_2);
+lean_closure_set(x_48, 2, x_5);
+lean_closure_set(x_48, 3, x_38);
+lean_closure_set(x_48, 4, x_47);
+lean_closure_set(x_48, 5, x_13);
+lean_closure_set(x_48, 6, x_6);
+lean_closure_set(x_48, 7, x_7);
+lean_closure_set(x_48, 8, x_41);
+lean_closure_set(x_48, 9, x_44);
+lean_closure_set(x_48, 10, x_8);
+lean_inc(x_10);
+x_49 = l___private_Lean_Elab_Command_2__getState(x_10, x_45);
+if (lean_obj_tag(x_49) == 0)
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_50 = lean_ctor_get(x_49, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_49, 1);
+lean_inc(x_51);
+lean_dec(x_49);
+x_52 = l___private_Lean_Elab_Command_9__getVarDecls(x_50);
+lean_dec(x_50);
+lean_inc(x_10);
+x_53 = l___private_Lean_Elab_Command_2__getState(x_10, x_51);
+if (lean_obj_tag(x_53) == 0)
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_54 = lean_ctor_get(x_53, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+lean_dec(x_53);
+x_56 = l___private_Lean_Elab_Command_6__mkTermContext(x_10, x_54, x_46);
+x_57 = l___private_Lean_Elab_Command_7__mkTermState(x_54);
+lean_dec(x_54);
+x_58 = l_Lean_Elab_Term_elabBinders___rarg(x_52, x_48, x_56, x_57);
+lean_dec(x_52);
+if (lean_obj_tag(x_58) == 0)
+{
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_59 = lean_ctor_get(x_58, 0);
+lean_inc(x_59);
+x_60 = lean_ctor_get(x_58, 1);
+lean_inc(x_60);
+lean_dec(x_58);
+lean_inc(x_10);
+x_61 = l___private_Lean_Elab_Command_2__getState(x_10, x_55);
+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; uint8_t x_67; 
+x_62 = lean_ctor_get(x_60, 0);
+lean_inc(x_62);
+x_63 = lean_ctor_get(x_61, 0);
 lean_inc(x_63);
-if (lean_is_exclusive(x_62)) {
- lean_ctor_release(x_62, 0);
- lean_ctor_release(x_62, 1);
- x_64 = x_62;
-} else {
- lean_dec_ref(x_62);
- x_64 = lean_box(0);
-}
-x_65 = lean_box(0);
-if (lean_is_scalar(x_64)) {
- x_66 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_66 = x_64;
-}
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_63);
-return x_66;
+x_64 = lean_ctor_get(x_61, 1);
+lean_inc(x_64);
+lean_dec(x_61);
+x_65 = lean_ctor_get(x_62, 0);
+lean_inc(x_65);
+lean_dec(x_62);
+x_66 = lean_ctor_get(x_60, 2);
+lean_inc(x_66);
+lean_dec(x_60);
+x_67 = !lean_is_exclusive(x_63);
+if (x_67 == 0)
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_63, 1);
+lean_dec(x_68);
+x_69 = lean_ctor_get(x_63, 0);
+lean_dec(x_69);
+lean_ctor_set(x_63, 1, x_66);
+lean_ctor_set(x_63, 0, x_65);
+lean_inc(x_10);
+x_70 = l___private_Lean_Elab_Command_3__setState(x_63, x_10, x_64);
+if (lean_obj_tag(x_70) == 0)
+{
+lean_object* x_71; 
+x_71 = lean_ctor_get(x_70, 1);
+lean_inc(x_71);
+lean_dec(x_70);
+x_15 = x_59;
+x_16 = x_71;
+goto block_36;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_67 = lean_ctor_get(x_62, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_62, 1);
-lean_inc(x_68);
-if (lean_is_exclusive(x_62)) {
- lean_ctor_release(x_62, 0);
- lean_ctor_release(x_62, 1);
- x_69 = x_62;
-} else {
- lean_dec_ref(x_62);
- x_69 = lean_box(0);
-}
-if (lean_is_scalar(x_69)) {
- x_70 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_70 = x_69;
-}
-lean_ctor_set(x_70, 0, x_67);
-lean_ctor_set(x_70, 1, x_68);
+uint8_t x_72; 
+lean_dec(x_59);
+lean_dec(x_13);
+lean_dec(x_10);
+x_72 = !lean_is_exclusive(x_70);
+if (x_72 == 0)
+{
 return x_70;
 }
-}
-}
 else
 {
-uint8_t x_71; 
-lean_dec(x_37);
-lean_dec(x_10);
-x_71 = !lean_is_exclusive(x_38);
-if (x_71 == 0)
-{
-return x_38;
-}
-else
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_38, 0);
-x_73 = lean_ctor_get(x_38, 1);
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_70, 0);
+x_74 = lean_ctor_get(x_70, 1);
+lean_inc(x_74);
 lean_inc(x_73);
-lean_inc(x_72);
-lean_dec(x_38);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
+lean_dec(x_70);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
 }
 }
 else
 {
-lean_object* x_75; 
-x_75 = lean_ctor_get(x_36, 0);
-lean_inc(x_75);
-if (lean_obj_tag(x_75) == 0)
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_36, 1);
-lean_inc(x_76);
-lean_dec(x_36);
-x_77 = lean_ctor_get(x_75, 0);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_76 = lean_ctor_get(x_63, 2);
+x_77 = lean_ctor_get(x_63, 3);
+x_78 = lean_ctor_get(x_63, 4);
+lean_inc(x_78);
 lean_inc(x_77);
-lean_dec(x_75);
+lean_inc(x_76);
+lean_dec(x_63);
+x_79 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_79, 0, x_65);
+lean_ctor_set(x_79, 1, x_66);
+lean_ctor_set(x_79, 2, x_76);
+lean_ctor_set(x_79, 3, x_77);
+lean_ctor_set(x_79, 4, x_78);
 lean_inc(x_10);
-x_78 = l___private_Lean_Elab_Command_2__getState(x_10, x_33);
-if (lean_obj_tag(x_78) == 0)
+x_80 = l___private_Lean_Elab_Command_3__setState(x_79, x_10, x_64);
+if (lean_obj_tag(x_80) == 0)
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; uint8_t x_84; 
-x_79 = lean_ctor_get(x_76, 0);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_78, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_78, 1);
+lean_object* x_81; 
+x_81 = lean_ctor_get(x_80, 1);
 lean_inc(x_81);
-lean_dec(x_78);
-x_82 = lean_ctor_get(x_79, 0);
-lean_inc(x_82);
-lean_dec(x_79);
-x_83 = lean_ctor_get(x_76, 2);
-lean_inc(x_83);
-lean_dec(x_76);
-x_84 = !lean_is_exclusive(x_80);
-if (x_84 == 0)
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_80, 1);
-lean_dec(x_85);
-x_86 = lean_ctor_get(x_80, 0);
-lean_dec(x_86);
-lean_ctor_set(x_80, 1, x_83);
-lean_ctor_set(x_80, 0, x_82);
-x_87 = l___private_Lean_Elab_Command_3__setState(x_80, x_10, x_81);
-if (lean_obj_tag(x_87) == 0)
-{
-uint8_t x_88; 
-x_88 = !lean_is_exclusive(x_87);
-if (x_88 == 0)
-{
-lean_object* x_89; 
-x_89 = lean_ctor_get(x_87, 0);
-lean_dec(x_89);
-lean_ctor_set_tag(x_87, 1);
-lean_ctor_set(x_87, 0, x_77);
-return x_87;
-}
-else
-{
-lean_object* x_90; lean_object* x_91; 
-x_90 = lean_ctor_get(x_87, 1);
-lean_inc(x_90);
-lean_dec(x_87);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_77);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
-}
-}
-else
-{
-uint8_t x_92; 
-lean_dec(x_77);
-x_92 = !lean_is_exclusive(x_87);
-if (x_92 == 0)
-{
-return x_87;
-}
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_87, 0);
-x_94 = lean_ctor_get(x_87, 1);
-lean_inc(x_94);
-lean_inc(x_93);
-lean_dec(x_87);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_93);
-lean_ctor_set(x_95, 1, x_94);
-return x_95;
-}
-}
-}
-else
-{
-lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_96 = lean_ctor_get(x_80, 2);
-x_97 = lean_ctor_get(x_80, 3);
-x_98 = lean_ctor_get(x_80, 4);
-lean_inc(x_98);
-lean_inc(x_97);
-lean_inc(x_96);
 lean_dec(x_80);
-x_99 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_99, 0, x_82);
-lean_ctor_set(x_99, 1, x_83);
-lean_ctor_set(x_99, 2, x_96);
-lean_ctor_set(x_99, 3, x_97);
-lean_ctor_set(x_99, 4, x_98);
-x_100 = l___private_Lean_Elab_Command_3__setState(x_99, x_10, x_81);
-if (lean_obj_tag(x_100) == 0)
-{
-lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-x_101 = lean_ctor_get(x_100, 1);
-lean_inc(x_101);
-if (lean_is_exclusive(x_100)) {
- lean_ctor_release(x_100, 0);
- lean_ctor_release(x_100, 1);
- x_102 = x_100;
-} else {
- lean_dec_ref(x_100);
- x_102 = lean_box(0);
-}
-if (lean_is_scalar(x_102)) {
- x_103 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_103 = x_102;
- lean_ctor_set_tag(x_103, 1);
-}
-lean_ctor_set(x_103, 0, x_77);
-lean_ctor_set(x_103, 1, x_101);
-return x_103;
+x_15 = x_59;
+x_16 = x_81;
+goto block_36;
 }
 else
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-lean_dec(x_77);
-x_104 = lean_ctor_get(x_100, 0);
-lean_inc(x_104);
-x_105 = lean_ctor_get(x_100, 1);
+lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+lean_dec(x_59);
+lean_dec(x_13);
+lean_dec(x_10);
+x_82 = lean_ctor_get(x_80, 0);
+lean_inc(x_82);
+x_83 = lean_ctor_get(x_80, 1);
+lean_inc(x_83);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_84 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_84 = lean_box(0);
+}
+if (lean_is_scalar(x_84)) {
+ x_85 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_85 = x_84;
+}
+lean_ctor_set(x_85, 0, x_82);
+lean_ctor_set(x_85, 1, x_83);
+return x_85;
+}
+}
+}
+else
+{
+uint8_t x_86; 
+lean_dec(x_60);
+lean_dec(x_59);
+lean_dec(x_13);
+lean_dec(x_10);
+x_86 = !lean_is_exclusive(x_61);
+if (x_86 == 0)
+{
+return x_61;
+}
+else
+{
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_61, 0);
+x_88 = lean_ctor_get(x_61, 1);
+lean_inc(x_88);
+lean_inc(x_87);
+lean_dec(x_61);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_87);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
+}
+}
+}
+else
+{
+lean_object* x_90; 
+x_90 = lean_ctor_get(x_58, 0);
+lean_inc(x_90);
+if (lean_obj_tag(x_90) == 0)
+{
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_dec(x_13);
+x_91 = lean_ctor_get(x_58, 1);
+lean_inc(x_91);
+lean_dec(x_58);
+x_92 = lean_ctor_get(x_90, 0);
+lean_inc(x_92);
+lean_dec(x_90);
+lean_inc(x_10);
+x_93 = l___private_Lean_Elab_Command_2__getState(x_10, x_55);
+if (lean_obj_tag(x_93) == 0)
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; uint8_t x_99; 
+x_94 = lean_ctor_get(x_91, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_93, 0);
+lean_inc(x_95);
+x_96 = lean_ctor_get(x_93, 1);
+lean_inc(x_96);
+lean_dec(x_93);
+x_97 = lean_ctor_get(x_94, 0);
+lean_inc(x_97);
+lean_dec(x_94);
+x_98 = lean_ctor_get(x_91, 2);
+lean_inc(x_98);
+lean_dec(x_91);
+x_99 = !lean_is_exclusive(x_95);
+if (x_99 == 0)
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_100 = lean_ctor_get(x_95, 1);
+lean_dec(x_100);
+x_101 = lean_ctor_get(x_95, 0);
+lean_dec(x_101);
+lean_ctor_set(x_95, 1, x_98);
+lean_ctor_set(x_95, 0, x_97);
+x_102 = l___private_Lean_Elab_Command_3__setState(x_95, x_10, x_96);
+if (lean_obj_tag(x_102) == 0)
+{
+uint8_t x_103; 
+x_103 = !lean_is_exclusive(x_102);
+if (x_103 == 0)
+{
+lean_object* x_104; 
+x_104 = lean_ctor_get(x_102, 0);
+lean_dec(x_104);
+lean_ctor_set_tag(x_102, 1);
+lean_ctor_set(x_102, 0, x_92);
+return x_102;
+}
+else
+{
+lean_object* x_105; lean_object* x_106; 
+x_105 = lean_ctor_get(x_102, 1);
 lean_inc(x_105);
-if (lean_is_exclusive(x_100)) {
- lean_ctor_release(x_100, 0);
- lean_ctor_release(x_100, 1);
- x_106 = x_100;
-} else {
- lean_dec_ref(x_100);
- x_106 = lean_box(0);
-}
-if (lean_is_scalar(x_106)) {
- x_107 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_107 = x_106;
-}
-lean_ctor_set(x_107, 0, x_104);
-lean_ctor_set(x_107, 1, x_105);
-return x_107;
-}
+lean_dec(x_102);
+x_106 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_106, 0, x_92);
+lean_ctor_set(x_106, 1, x_105);
+return x_106;
 }
 }
 else
 {
-uint8_t x_108; 
-lean_dec(x_77);
-lean_dec(x_76);
-lean_dec(x_10);
-x_108 = !lean_is_exclusive(x_78);
-if (x_108 == 0)
+uint8_t x_107; 
+lean_dec(x_92);
+x_107 = !lean_is_exclusive(x_102);
+if (x_107 == 0)
 {
-return x_78;
+return x_102;
 }
 else
 {
-lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_109 = lean_ctor_get(x_78, 0);
-x_110 = lean_ctor_get(x_78, 1);
-lean_inc(x_110);
+lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_108 = lean_ctor_get(x_102, 0);
+x_109 = lean_ctor_get(x_102, 1);
 lean_inc(x_109);
-lean_dec(x_78);
-x_111 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_111, 0, x_109);
-lean_ctor_set(x_111, 1, x_110);
-return x_111;
+lean_inc(x_108);
+lean_dec(x_102);
+x_110 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_110, 0, x_108);
+lean_ctor_set(x_110, 1, x_109);
+return x_110;
 }
 }
 }
 else
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-lean_dec(x_36);
-x_112 = l_Lean_Elab_Command_liftTermElabM___rarg___closed__1;
-x_113 = l_unreachable_x21___rarg(x_112);
-x_114 = lean_apply_2(x_113, x_10, x_33);
-if (lean_obj_tag(x_114) == 0)
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_111 = lean_ctor_get(x_95, 2);
+x_112 = lean_ctor_get(x_95, 3);
+x_113 = lean_ctor_get(x_95, 4);
+lean_inc(x_113);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_dec(x_95);
+x_114 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_114, 0, x_97);
+lean_ctor_set(x_114, 1, x_98);
+lean_ctor_set(x_114, 2, x_111);
+lean_ctor_set(x_114, 3, x_112);
+lean_ctor_set(x_114, 4, x_113);
+x_115 = l___private_Lean_Elab_Command_3__setState(x_114, x_10, x_96);
+if (lean_obj_tag(x_115) == 0)
 {
-uint8_t x_115; 
-x_115 = !lean_is_exclusive(x_114);
-if (x_115 == 0)
-{
-lean_object* x_116; lean_object* x_117; 
-x_116 = lean_ctor_get(x_114, 0);
-lean_dec(x_116);
-x_117 = lean_box(0);
-lean_ctor_set(x_114, 0, x_117);
-return x_114;
+lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+x_116 = lean_ctor_get(x_115, 1);
+lean_inc(x_116);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_117 = x_115;
+} else {
+ lean_dec_ref(x_115);
+ x_117 = lean_box(0);
+}
+if (lean_is_scalar(x_117)) {
+ x_118 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_118 = x_117;
+ lean_ctor_set_tag(x_118, 1);
+}
+lean_ctor_set(x_118, 0, x_92);
+lean_ctor_set(x_118, 1, x_116);
+return x_118;
 }
 else
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; 
-x_118 = lean_ctor_get(x_114, 1);
-lean_inc(x_118);
-lean_dec(x_114);
-x_119 = lean_box(0);
-x_120 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set(x_120, 1, x_118);
-return x_120;
-}
-}
-else
-{
-uint8_t x_121; 
-x_121 = !lean_is_exclusive(x_114);
-if (x_121 == 0)
-{
-return x_114;
-}
-else
-{
-lean_object* x_122; lean_object* x_123; lean_object* x_124; 
-x_122 = lean_ctor_get(x_114, 0);
-x_123 = lean_ctor_get(x_114, 1);
-lean_inc(x_123);
-lean_inc(x_122);
-lean_dec(x_114);
-x_124 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_124, 0, x_122);
-lean_ctor_set(x_124, 1, x_123);
-return x_124;
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
+lean_dec(x_92);
+x_119 = lean_ctor_get(x_115, 0);
+lean_inc(x_119);
+x_120 = lean_ctor_get(x_115, 1);
+lean_inc(x_120);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_121 = x_115;
+} else {
+ lean_dec_ref(x_115);
+ x_121 = lean_box(0);
 }
+if (lean_is_scalar(x_121)) {
+ x_122 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_122 = x_121;
 }
+lean_ctor_set(x_122, 0, x_119);
+lean_ctor_set(x_122, 1, x_120);
+return x_122;
 }
 }
 }
 else
 {
-uint8_t x_125; 
-lean_dec(x_30);
-lean_dec(x_26);
-lean_dec(x_24);
+uint8_t x_123; 
+lean_dec(x_92);
+lean_dec(x_91);
 lean_dec(x_10);
-x_125 = !lean_is_exclusive(x_31);
-if (x_125 == 0)
+x_123 = !lean_is_exclusive(x_93);
+if (x_123 == 0)
 {
-return x_31;
+return x_93;
 }
 else
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-x_126 = lean_ctor_get(x_31, 0);
-x_127 = lean_ctor_get(x_31, 1);
-lean_inc(x_127);
-lean_inc(x_126);
-lean_dec(x_31);
-x_128 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_128, 0, x_126);
-lean_ctor_set(x_128, 1, x_127);
-return x_128;
+lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+x_124 = lean_ctor_get(x_93, 0);
+x_125 = lean_ctor_get(x_93, 1);
+lean_inc(x_125);
+lean_inc(x_124);
+lean_dec(x_93);
+x_126 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_126, 0, x_124);
+lean_ctor_set(x_126, 1, x_125);
+return x_126;
 }
 }
 }
 else
 {
-uint8_t x_129; 
-lean_dec(x_26);
-lean_dec(x_24);
-lean_dec(x_10);
-x_129 = !lean_is_exclusive(x_27);
-if (x_129 == 0)
+lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+lean_dec(x_58);
+x_127 = l_Lean_Elab_Command_liftTermElabM___rarg___closed__1;
+x_128 = l_unreachable_x21___rarg(x_127);
+lean_inc(x_10);
+x_129 = lean_apply_2(x_128, x_10, x_55);
+if (lean_obj_tag(x_129) == 0)
 {
-return x_27;
-}
-else
-{
-lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-x_130 = lean_ctor_get(x_27, 0);
-x_131 = lean_ctor_get(x_27, 1);
-lean_inc(x_131);
+lean_object* x_130; lean_object* x_131; 
+x_130 = lean_ctor_get(x_129, 0);
 lean_inc(x_130);
-lean_dec(x_27);
-x_132 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_132, 0, x_130);
-lean_ctor_set(x_132, 1, x_131);
-return x_132;
+x_131 = lean_ctor_get(x_129, 1);
+lean_inc(x_131);
+lean_dec(x_129);
+x_15 = x_130;
+x_16 = x_131;
+goto block_36;
+}
+else
+{
+uint8_t x_132; 
+lean_dec(x_13);
+lean_dec(x_10);
+x_132 = !lean_is_exclusive(x_129);
+if (x_132 == 0)
+{
+return x_129;
+}
+else
+{
+lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+x_133 = lean_ctor_get(x_129, 0);
+x_134 = lean_ctor_get(x_129, 1);
+lean_inc(x_134);
+lean_inc(x_133);
+lean_dec(x_129);
+x_135 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_135, 0, x_133);
+lean_ctor_set(x_135, 1, x_134);
+return x_135;
+}
+}
 }
 }
 }
 else
 {
-uint8_t x_133; 
-lean_dec(x_19);
-lean_dec(x_16);
+uint8_t x_136; 
+lean_dec(x_52);
+lean_dec(x_48);
+lean_dec(x_46);
+lean_dec(x_13);
+lean_dec(x_10);
+x_136 = !lean_is_exclusive(x_53);
+if (x_136 == 0)
+{
+return x_53;
+}
+else
+{
+lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+x_137 = lean_ctor_get(x_53, 0);
+x_138 = lean_ctor_get(x_53, 1);
+lean_inc(x_138);
+lean_inc(x_137);
+lean_dec(x_53);
+x_139 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_139, 0, x_137);
+lean_ctor_set(x_139, 1, x_138);
+return x_139;
+}
+}
+}
+else
+{
+uint8_t x_140; 
+lean_dec(x_48);
+lean_dec(x_46);
+lean_dec(x_13);
+lean_dec(x_10);
+x_140 = !lean_is_exclusive(x_49);
+if (x_140 == 0)
+{
+return x_49;
+}
+else
+{
+lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+x_141 = lean_ctor_get(x_49, 0);
+x_142 = lean_ctor_get(x_49, 1);
+lean_inc(x_142);
+lean_inc(x_141);
+lean_dec(x_49);
+x_143 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_143, 0, x_141);
+lean_ctor_set(x_143, 1, x_142);
+return x_143;
+}
+}
+}
+else
+{
+uint8_t x_144; 
+lean_dec(x_41);
+lean_dec(x_38);
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
 lean_dec(x_2);
-x_133 = !lean_is_exclusive(x_21);
-if (x_133 == 0)
+x_144 = !lean_is_exclusive(x_43);
+if (x_144 == 0)
+{
+return x_43;
+}
+else
+{
+lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+x_145 = lean_ctor_get(x_43, 0);
+x_146 = lean_ctor_get(x_43, 1);
+lean_inc(x_146);
+lean_inc(x_145);
+lean_dec(x_43);
+x_147 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_147, 0, x_145);
+lean_ctor_set(x_147, 1, x_146);
+return x_147;
+}
+}
+}
+else
+{
+uint8_t x_148; 
+lean_dec(x_38);
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_148 = !lean_is_exclusive(x_40);
+if (x_148 == 0)
+{
+return x_40;
+}
+else
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_149 = lean_ctor_get(x_40, 0);
+x_150 = lean_ctor_get(x_40, 1);
+lean_inc(x_150);
+lean_inc(x_149);
+lean_dec(x_40);
+x_151 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_151, 0, x_149);
+lean_ctor_set(x_151, 1, x_150);
+return x_151;
+}
+}
+}
+else
+{
+uint8_t x_152; 
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_152 = !lean_is_exclusive(x_37);
+if (x_152 == 0)
+{
+return x_37;
+}
+else
+{
+lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_153 = lean_ctor_get(x_37, 0);
+x_154 = lean_ctor_get(x_37, 1);
+lean_inc(x_154);
+lean_inc(x_153);
+lean_dec(x_37);
+x_155 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_155, 0, x_153);
+lean_ctor_set(x_155, 1, x_154);
+return x_155;
+}
+}
+block_36:
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
+lean_dec(x_15);
+lean_inc(x_10);
+x_19 = l_Lean_Elab_Command_addDecl(x_1, x_17, x_10, x_16);
+lean_dec(x_17);
+if (lean_obj_tag(x_19) == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = l___private_Lean_Elab_Structure_27__addProjections(x_1, x_13, x_18, x_3, x_10, x_20);
+lean_dec(x_18);
+lean_dec(x_13);
+if (lean_obj_tag(x_21) == 0)
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_21);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_ctor_get(x_21, 0);
+lean_dec(x_23);
+x_24 = lean_box(0);
+lean_ctor_set(x_21, 0, x_24);
+return x_21;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_21, 1);
+lean_inc(x_25);
+lean_dec(x_21);
+x_26 = lean_box(0);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_25);
+return x_27;
+}
+}
+else
+{
+uint8_t x_28; 
+x_28 = !lean_is_exclusive(x_21);
+if (x_28 == 0)
 {
 return x_21;
 }
 else
 {
-lean_object* x_134; lean_object* x_135; lean_object* x_136; 
-x_134 = lean_ctor_get(x_21, 0);
-x_135 = lean_ctor_get(x_21, 1);
-lean_inc(x_135);
-lean_inc(x_134);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_21, 0);
+x_30 = lean_ctor_get(x_21, 1);
+lean_inc(x_30);
+lean_inc(x_29);
 lean_dec(x_21);
-x_136 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_136, 0, x_134);
-lean_ctor_set(x_136, 1, x_135);
-return x_136;
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_30);
+return x_31;
 }
 }
 }
 else
 {
-uint8_t x_137; 
-lean_dec(x_16);
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_137 = !lean_is_exclusive(x_18);
-if (x_137 == 0)
-{
-return x_18;
-}
-else
-{
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_18, 0);
-x_139 = lean_ctor_get(x_18, 1);
-lean_inc(x_139);
-lean_inc(x_138);
+uint8_t x_32; 
 lean_dec(x_18);
-x_140 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_140, 0, x_138);
-lean_ctor_set(x_140, 1, x_139);
-return x_140;
-}
-}
-}
-else
-{
-uint8_t x_141; 
 lean_dec(x_13);
 lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_141 = !lean_is_exclusive(x_15);
-if (x_141 == 0)
+x_32 = !lean_is_exclusive(x_19);
+if (x_32 == 0)
 {
-return x_15;
+return x_19;
 }
 else
 {
-lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_142 = lean_ctor_get(x_15, 0);
-x_143 = lean_ctor_get(x_15, 1);
-lean_inc(x_143);
-lean_inc(x_142);
-lean_dec(x_15);
-x_144 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_144, 0, x_142);
-lean_ctor_set(x_144, 1, x_143);
-return x_144;
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_19, 0);
+x_34 = lean_ctor_get(x_19, 1);
+lean_inc(x_34);
+lean_inc(x_33);
+lean_dec(x_19);
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_33);
+lean_ctor_set(x_35, 1, x_34);
+return x_35;
+}
 }
 }
 }
 else
 {
-uint8_t x_145; 
+uint8_t x_156; 
 lean_dec(x_10);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
 lean_dec(x_2);
-x_145 = !lean_is_exclusive(x_12);
-if (x_145 == 0)
+x_156 = !lean_is_exclusive(x_12);
+if (x_156 == 0)
 {
 return x_12;
 }
 else
 {
-lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-x_146 = lean_ctor_get(x_12, 0);
-x_147 = lean_ctor_get(x_12, 1);
-lean_inc(x_147);
-lean_inc(x_146);
+lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+x_157 = lean_ctor_get(x_12, 0);
+x_158 = lean_ctor_get(x_12, 1);
+lean_inc(x_158);
+lean_inc(x_157);
 lean_dec(x_12);
-x_148 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_148, 0, x_146);
-lean_ctor_set(x_148, 1, x_147);
-return x_148;
+x_159 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_159, 0, x_157);
+lean_ctor_set(x_159, 1, x_158);
+return x_159;
 }
 }
 }
@@ -8376,9 +9573,9 @@ lean_inc(x_11);
 x_30 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabStructure___lambda__3___boxed), 11, 8);
 lean_closure_set(x_30, 0, x_11);
 lean_closure_set(x_30, 1, x_22);
-lean_closure_set(x_30, 2, x_2);
-lean_closure_set(x_30, 3, x_27);
-lean_closure_set(x_30, 4, x_29);
+lean_closure_set(x_30, 2, x_29);
+lean_closure_set(x_30, 3, x_2);
+lean_closure_set(x_30, 4, x_27);
 lean_closure_set(x_30, 5, x_23);
 lean_closure_set(x_30, 6, x_24);
 lean_closure_set(x_30, 7, x_14);
@@ -8509,9 +9706,9 @@ lean_object* l_Lean_Elab_Command_elabStructure___lambda__3___boxed(lean_object*
 _start:
 {
 uint8_t x_12; lean_object* x_13; 
-x_12 = lean_unbox(x_5);
-lean_dec(x_5);
-x_13 = l_Lean_Elab_Command_elabStructure___lambda__3(x_1, x_2, x_3, x_4, x_12, x_6, x_7, x_8, x_9, x_10, x_11);
+x_12 = lean_unbox(x_3);
+lean_dec(x_3);
+x_13 = l_Lean_Elab_Command_elabStructure___lambda__3(x_1, x_2, x_12, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_1);
 return x_13;
 }
@@ -8541,10 +9738,26 @@ lean_dec_ref(res);
 res = initialize_Lean_Elab_Inductive(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1 = _init_l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_StructFieldInfo_inhabited___closed__1);
+l_Lean_Elab_Command_StructFieldInfo_inhabited = _init_l_Lean_Elab_Command_StructFieldInfo_inhabited();
+lean_mark_persistent(l_Lean_Elab_Command_StructFieldInfo_inhabited);
 l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1 = _init_l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_Structure_1__defaultCtorName___closed__1);
 l___private_Lean_Elab_Structure_1__defaultCtorName = _init_l___private_Lean_Elab_Structure_1__defaultCtorName();
 lean_mark_persistent(l___private_Lean_Elab_Structure_1__defaultCtorName);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__1 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__1();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__1);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__2 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__2();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__2);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__3 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__3();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__3);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__4 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__4();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__4);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__5 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__5();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__5);
+l___private_Lean_Elab_Structure_2__expandCtor___closed__6 = _init_l___private_Lean_Elab_Structure_2__expandCtor___closed__6();
+lean_mark_persistent(l___private_Lean_Elab_Structure_2__expandCtor___closed__6);
 l_Lean_Elab_Command_checkValidFieldModifier___closed__1 = _init_l_Lean_Elab_Command_checkValidFieldModifier___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_checkValidFieldModifier___closed__1);
 l_Lean_Elab_Command_checkValidFieldModifier___closed__2 = _init_l_Lean_Elab_Command_checkValidFieldModifier___closed__2();
@@ -8591,6 +9804,18 @@ l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___
 lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__2);
 l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3();
 lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__3);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__4);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__5);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__6);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__7 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__7();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__7);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__8);
+l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9 = _init_l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9();
+lean_mark_persistent(l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_3__expandFields___spec__2___closed__9);
 l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__1 = _init_l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__1);
 l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__2 = _init_l___private_Lean_Elab_Structure_5__checkParentIsStructure___closed__2();
@@ -8653,18 +9878,12 @@ l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__2 = _init_
 lean_mark_persistent(l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__2);
 l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__3 = _init_l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__3();
 lean_mark_persistent(l___private_Lean_Elab_Structure_19__updateResultingUniverse___closed__3);
-l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__1);
-l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__2);
-l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___lambda__1___closed__3);
-l___private_Lean_Elab_Structure_23__elabStructureView___closed__1 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___closed__1);
-l___private_Lean_Elab_Structure_23__elabStructureView___closed__2 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___closed__2();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___closed__2);
-l___private_Lean_Elab_Structure_23__elabStructureView___closed__3 = _init_l___private_Lean_Elab_Structure_23__elabStructureView___closed__3();
-lean_mark_persistent(l___private_Lean_Elab_Structure_23__elabStructureView___closed__3);
+l___private_Lean_Elab_Structure_25__elabStructureView___closed__1 = _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__1();
+lean_mark_persistent(l___private_Lean_Elab_Structure_25__elabStructureView___closed__1);
+l___private_Lean_Elab_Structure_25__elabStructureView___closed__2 = _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__2();
+lean_mark_persistent(l___private_Lean_Elab_Structure_25__elabStructureView___closed__2);
+l___private_Lean_Elab_Structure_25__elabStructureView___closed__3 = _init_l___private_Lean_Elab_Structure_25__elabStructureView___closed__3();
+lean_mark_persistent(l___private_Lean_Elab_Structure_25__elabStructureView___closed__3);
 l_Lean_Elab_Command_elabStructure___closed__1 = _init_l_Lean_Elab_Command_elabStructure___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_elabStructure___closed__1);
 l_Lean_Elab_Command_elabStructure___closed__2 = _init_l_Lean_Elab_Command_elabStructure___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/Syntax.c b/stage0/stdlib/Lean/Elab/Syntax.c
index 813acf5514..1ff71bdd50 100644
--- a/stage0/stdlib/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Lean/Elab/Syntax.c
@@ -212,6 +212,7 @@ uint8_t l_Lean_Parser_leadingIdentAsSymbol(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkTermIdFromIdent___closed__2;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__16;
 extern lean_object* l_Array_forMAux___main___at_Lean_Meta_clear___spec__5___closed__8;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 extern lean_object* l_Lean_Parser_Command_macro__rules___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__49;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__105;
@@ -379,7 +380,6 @@ lean_object* l___private_Lean_Elab_Syntax_6__declareSyntaxCatQuotParser___closed
 extern lean_object* l_Lean_Parser_Term_match__syntax___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_mkKindName___closed__1;
 lean_object* l___private_Lean_Elab_Syntax_6__declareSyntaxCatQuotParser___closed__26;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__89;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__47;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
@@ -538,7 +538,6 @@ lean_object* l_Lean_Elab_Command_elabSyntax___closed__1;
 lean_object* l___private_Lean_Elab_Syntax_9__expandNotationAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_checkLeftRec(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__111;
-extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
 lean_object* l___private_Lean_Elab_Syntax_6__declareSyntaxCatQuotParser___closed__32;
 lean_object* l___private_Lean_Elab_Syntax_6__declareSyntaxCatQuotParser___closed__10;
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__97;
@@ -723,6 +722,7 @@ extern lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_expandNotationItemIntoSyntaxItem(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__35;
 extern lean_object* l_Lean_Parser_mkAntiquot___closed__2;
+extern lean_object* l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 extern lean_object* l_Lean_Elab_Command_liftTermElabM___rarg___closed__1;
 extern lean_object* l_Lean_Parser_Term_orelse___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__12;
@@ -9470,9 +9470,9 @@ x_114 = lean_array_push(x_113, x_23);
 x_115 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_115, 0, x_28);
 lean_ctor_set(x_115, 1, x_114);
-x_116 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__28;
+x_116 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__27;
 x_117 = lean_array_push(x_116, x_115);
-x_118 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_118 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_119 = lean_array_push(x_117, x_118);
 x_120 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_121 = lean_alloc_ctor(1, 2, 0);
@@ -12737,7 +12737,7 @@ x_36 = lean_ctor_get(x_34, 0);
 lean_dec(x_36);
 x_37 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_38 = lean_array_push(x_37, x_31);
-x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_39 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_40 = lean_array_push(x_38, x_39);
 x_41 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_42 = lean_alloc_ctor(1, 2, 0);
@@ -12756,7 +12756,7 @@ lean_inc(x_45);
 lean_dec(x_34);
 x_46 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_47 = lean_array_push(x_46, x_31);
-x_48 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_48 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_49 = lean_array_push(x_47, x_48);
 x_50 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_51 = lean_alloc_ctor(1, 2, 0);
@@ -16142,7 +16142,7 @@ lean_ctor_set(x_47, 1, x_45);
 x_48 = lean_array_push(x_39, x_47);
 x_49 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_50 = lean_array_push(x_49, x_29);
-x_51 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_51 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_52 = lean_array_push(x_50, x_51);
 x_53 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_54 = lean_alloc_ctor(1, 2, 0);
@@ -16227,7 +16227,7 @@ lean_ctor_set(x_99, 1, x_97);
 x_100 = lean_array_push(x_79, x_99);
 x_101 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_102 = lean_array_push(x_101, x_29);
-x_103 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_103 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_104 = lean_array_push(x_102, x_103);
 x_105 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_106 = lean_alloc_ctor(1, 2, 0);
@@ -16311,7 +16311,7 @@ lean_ctor_set(x_146, 1, x_144);
 x_147 = lean_array_push(x_138, x_146);
 x_148 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_149 = lean_array_push(x_148, x_128);
-x_150 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_150 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_151 = lean_array_push(x_149, x_150);
 x_152 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_153 = lean_alloc_ctor(1, 2, 0);
@@ -16398,7 +16398,7 @@ lean_ctor_set(x_199, 1, x_197);
 x_200 = lean_array_push(x_179, x_199);
 x_201 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_202 = lean_array_push(x_201, x_128);
-x_203 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_203 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_204 = lean_array_push(x_202, x_203);
 x_205 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_206 = lean_alloc_ctor(1, 2, 0);
@@ -17225,7 +17225,7 @@ lean_ctor_set(x_68, 1, x_66);
 x_69 = lean_array_push(x_48, x_68);
 x_70 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_71 = lean_array_push(x_70, x_42);
-x_72 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_72 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_73 = lean_array_push(x_71, x_72);
 x_74 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_75 = lean_alloc_ctor(1, 2, 0);
@@ -17304,7 +17304,7 @@ lean_ctor_set(x_117, 1, x_115);
 x_118 = lean_array_push(x_97, x_117);
 x_119 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_120 = lean_array_push(x_119, x_42);
-x_121 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_121 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_122 = lean_array_push(x_120, x_121);
 x_123 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_124 = lean_alloc_ctor(1, 2, 0);
@@ -17399,7 +17399,7 @@ lean_ctor_set(x_171, 1, x_169);
 x_172 = lean_array_push(x_151, x_171);
 x_173 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_174 = lean_array_push(x_173, x_145);
-x_175 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_175 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_176 = lean_array_push(x_174, x_175);
 x_177 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_178 = lean_alloc_ctor(1, 2, 0);
@@ -17480,7 +17480,7 @@ lean_ctor_set(x_221, 1, x_219);
 x_222 = lean_array_push(x_201, x_221);
 x_223 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_224 = lean_array_push(x_223, x_145);
-x_225 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_225 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_226 = lean_array_push(x_224, x_225);
 x_227 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_228 = lean_alloc_ctor(1, 2, 0);
@@ -18814,7 +18814,7 @@ x_162 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_163 = lean_array_push(x_161, x_162);
 x_164 = l_Lean_Elab_Command_expandElab___closed__17;
 x_165 = lean_array_push(x_164, x_47);
-x_166 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_166 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_167 = lean_array_push(x_165, x_166);
 x_168 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_169 = lean_alloc_ctor(1, 2, 0);
@@ -19065,7 +19065,7 @@ x_311 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_312 = lean_array_push(x_310, x_311);
 x_313 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_314 = lean_array_push(x_313, x_47);
-x_315 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_315 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_316 = lean_array_push(x_314, x_315);
 x_317 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_318 = lean_alloc_ctor(1, 2, 0);
@@ -19318,7 +19318,7 @@ x_462 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_463 = lean_array_push(x_461, x_462);
 x_464 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_465 = lean_array_push(x_464, x_47);
-x_466 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_466 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_467 = lean_array_push(x_465, x_466);
 x_468 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_469 = lean_alloc_ctor(1, 2, 0);
@@ -19614,7 +19614,7 @@ x_629 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_630 = lean_array_push(x_628, x_629);
 x_631 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_632 = lean_array_push(x_631, x_47);
-x_633 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_633 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_634 = lean_array_push(x_632, x_633);
 x_635 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_636 = lean_alloc_ctor(1, 2, 0);
@@ -19954,7 +19954,7 @@ x_817 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_818 = lean_array_push(x_816, x_817);
 x_819 = l_Lean_Elab_Command_expandElab___closed__17;
 x_820 = lean_array_push(x_819, x_702);
-x_821 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_821 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_822 = lean_array_push(x_820, x_821);
 x_823 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_824 = lean_alloc_ctor(1, 2, 0);
@@ -20207,7 +20207,7 @@ x_967 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__6
 x_968 = lean_array_push(x_966, x_967);
 x_969 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_970 = lean_array_push(x_969, x_702);
-x_971 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_971 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_972 = lean_array_push(x_970, x_971);
 x_973 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_974 = lean_alloc_ctor(1, 2, 0);
@@ -20462,7 +20462,7 @@ x_1119 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__
 x_1120 = lean_array_push(x_1118, x_1119);
 x_1121 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_1122 = lean_array_push(x_1121, x_702);
-x_1123 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_1123 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_1124 = lean_array_push(x_1122, x_1123);
 x_1125 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_1126 = lean_alloc_ctor(1, 2, 0);
@@ -20759,7 +20759,7 @@ x_1287 = l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__
 x_1288 = lean_array_push(x_1286, x_1287);
 x_1289 = l_Lean_Elab_Command_elabMacroRulesAux___lambda__1___closed__8;
 x_1290 = lean_array_push(x_1289, x_702);
-x_1291 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__44;
+x_1291 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__43;
 x_1292 = lean_array_push(x_1290, x_1291);
 x_1293 = l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__2;
 x_1294 = lean_alloc_ctor(1, 2, 0);
diff --git a/stage0/stdlib/Lean/Elab/SyntheticMVars.c b/stage0/stdlib/Lean/Elab/SyntheticMVars.c
index c543fb1765..806463fd1c 100644
--- a/stage0/stdlib/Lean/Elab/SyntheticMVars.c
+++ b/stage0/stdlib/Lean/Elab/SyntheticMVars.c
@@ -35,7 +35,6 @@ lean_object* l_Lean_Elab_Term_liftTacticElabM___rarg(lean_object*, lean_object*,
 lean_object* l___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___closed__10;
 lean_object* l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermAndSynthesize(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l_Lean_fmt___at___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___spec__1(lean_object*);
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
@@ -95,7 +94,7 @@ extern lean_object* l___private_Lean_Elab_Util_4__regTraceClasses___closed__1;
 lean_object* l_Lean_Elab_Term_liftTacticElabM(lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_monadLog___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMVarContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_TermElabM_inhabited___boxed(lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l_Lean_Elab_Term_runTactic(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forM___main___at___private_Lean_Elab_SyntheticMVars_9__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_isDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1550,15 +1549,6 @@ x_7 = l___private_Lean_Elab_SyntheticMVars_1__resumeElabTerm(x_1, x_2, x_6, x_4,
 return x_7;
 }
 }
-lean_object* _init_l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_TermElabM_inhabited___boxed), 2, 1);
-lean_closure_set(x_1, 0, lean_box(0));
-return x_1;
-}
-}
 lean_object* l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
@@ -1869,7 +1859,7 @@ else
 {
 lean_object* x_32; lean_object* x_33; lean_object* x_34; 
 lean_dec(x_5);
-x_32 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_32 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_33 = l_unreachable_x21___rarg(x_32);
 x_34 = lean_apply_2(x_33, x_6, x_9);
 return x_34;
@@ -2080,7 +2070,7 @@ lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44;
 x_41 = lean_ctor_get(x_5, 1);
 lean_inc(x_41);
 lean_dec(x_5);
-x_42 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_42 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_43 = l_unreachable_x21___rarg(x_42);
 x_44 = lean_apply_2(x_43, x_3, x_41);
 return x_44;
@@ -2092,7 +2082,7 @@ lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48;
 x_45 = lean_ctor_get(x_5, 1);
 lean_inc(x_45);
 lean_dec(x_5);
-x_46 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_46 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_47 = l_unreachable_x21___rarg(x_46);
 x_48 = lean_apply_2(x_47, x_3, x_45);
 return x_48;
@@ -2176,7 +2166,7 @@ lean_dec(x_3);
 x_17 = lean_ctor_get(x_9, 1);
 lean_inc(x_17);
 lean_dec(x_9);
-x_18 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_18 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_19 = l_unreachable_x21___rarg(x_18);
 x_20 = lean_apply_2(x_19, x_7, x_17);
 return x_20;
@@ -2192,7 +2182,7 @@ lean_dec(x_3);
 x_21 = lean_ctor_get(x_9, 1);
 lean_inc(x_21);
 lean_dec(x_9);
-x_22 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_22 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_23 = l_unreachable_x21___rarg(x_22);
 x_24 = lean_apply_2(x_23, x_7, x_21);
 return x_24;
@@ -4113,7 +4103,7 @@ lean_dec(x_6);
 x_36 = lean_ctor_get(x_1, 1);
 lean_inc(x_36);
 lean_dec(x_1);
-x_37 = l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1;
+x_37 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 x_38 = l_unreachable_x21___rarg(x_37);
 lean_inc(x_2);
 x_39 = lean_apply_2(x_38, x_2, x_3);
@@ -5870,8 +5860,6 @@ l_Lean_Elab_Term_ensureAssignmentHasNoMVars___closed__2 = _init_l_Lean_Elab_Term
 lean_mark_persistent(l_Lean_Elab_Term_ensureAssignmentHasNoMVars___closed__2);
 l_Lean_Elab_Term_ensureAssignmentHasNoMVars___closed__3 = _init_l_Lean_Elab_Term_ensureAssignmentHasNoMVars___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_ensureAssignmentHasNoMVars___closed__3);
-l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1 = _init_l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1();
-lean_mark_persistent(l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___lambda__1___closed__1);
 l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___closed__1 = _init_l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_SyntheticMVars_2__resumePostponed___closed__1);
 l_List_filterAuxM___main___at___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___spec__2___closed__1 = _init_l_List_filterAuxM___main___at___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___spec__2___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/Term.c b/stage0/stdlib/Lean/Elab/Term.c
index b26345f8f8..01ae8e0d34 100644
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
@@ -60,6 +60,7 @@ lean_object* l___private_Lean_Elab_Term_20__resolveLocalNameAux___main(lean_obje
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__9;
 lean_object* l_Lean_Elab_Term_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Nat_HasQuote___closed__2;
+lean_object* l_unreachable_x21___rarg(lean_object*);
 extern lean_object* l_Lean_nullKind;
 lean_object* l_Lean_Meta_whnfForall(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_monadLog___lambda__3___boxed(lean_object*, lean_object*, lean_object*);
@@ -72,6 +73,7 @@ lean_object* l_Lean_Elab_Term_inferType(lean_object*, lean_object*, lean_object*
 lean_object* l_Lean_Elab_Term_mkTermElabAttribute___closed__7;
 lean_object* l_Lean_Elab_Term_assignExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ppGoal___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_hasSorry___main___closed__1;
 lean_object* l_Lean_Elab_Term_elabUsingElabFns___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkTermElabAttribute___closed__3;
@@ -375,6 +377,7 @@ lean_object* l_Lean_Elab_Term_tryLiftAndCoe___closed__1;
 lean_object* l_Lean_Elab_Term_TermElabM_inhabited(lean_object*, lean_object*);
 lean_object* l_Std_PersistentArray_foldlM___at___private_Lean_Elab_Term_3__fromMetaState___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkInstMVar(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_Term_termElabAttribute___spec__1___closed__1;
@@ -526,6 +529,7 @@ lean_object* l_Lean_Elab_Term_elabArrayLit___closed__4;
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
 lean_object* l_Lean_Elab_Term_TermElabM_inhabited___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkPure(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousIdent___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabRawNumLit(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabUsingElabFns___spec__1(lean_object*, lean_object*);
@@ -818,6 +822,7 @@ lean_object* l_Lean_Elab_Term_mkTermElabAttribute___closed__2;
 lean_object* l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMCtx___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_applyResult(lean_object*, lean_object*, lean_object*);
+lean_object* lean_local_ctx_find(lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_18__mkPairsAux___main___closed__2;
 lean_object* l_Lean_Meta_isTypeFormer(lean_object*, lean_object*, lean_object*);
@@ -1399,6 +1404,90 @@ lean_dec(x_1);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_TermElabM_inhabited___boxed), 2, 1);
+lean_closure_set(x_1, 0, lean_box(0));
+return x_1;
+}
+}
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = l_Lean_Elab_Term_getLCtx(x_2, x_3);
+x_5 = !lean_is_exclusive(x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_6 = lean_ctor_get(x_4, 0);
+x_7 = lean_ctor_get(x_4, 1);
+x_8 = l_Lean_Expr_fvarId_x21(x_1);
+x_9 = lean_local_ctx_find(x_6, x_8);
+if (lean_obj_tag(x_9) == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_free_object(x_4);
+x_10 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
+x_11 = l_unreachable_x21___rarg(x_10);
+x_12 = lean_apply_2(x_11, x_2, x_7);
+return x_12;
+}
+else
+{
+lean_object* x_13; 
+lean_dec(x_2);
+x_13 = lean_ctor_get(x_9, 0);
+lean_inc(x_13);
+lean_dec(x_9);
+lean_ctor_set(x_4, 0, x_13);
+return x_4;
+}
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_4, 0);
+x_15 = lean_ctor_get(x_4, 1);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_dec(x_4);
+x_16 = l_Lean_Expr_fvarId_x21(x_1);
+x_17 = lean_local_ctx_find(x_14, x_16);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1;
+x_19 = l_unreachable_x21___rarg(x_18);
+x_20 = lean_apply_2(x_19, x_2, x_15);
+return x_20;
+}
+else
+{
+lean_object* x_21; lean_object* x_22; 
+lean_dec(x_2);
+x_21 = lean_ctor_get(x_17, 0);
+lean_inc(x_21);
+lean_dec(x_17);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_15);
+return x_22;
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Term_getFVarLocalDecl_x21___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_getFVarLocalDecl_x21(x_1, x_2, x_3);
+lean_dec(x_1);
+return x_4;
+}
+}
 lean_object* l_Lean_Elab_Term_setEnv(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -30885,6 +30974,8 @@ l_Lean_Elab_Term_TermElabResult_inhabited___closed__1 = _init_l_Lean_Elab_Term_T
 lean_mark_persistent(l_Lean_Elab_Term_TermElabResult_inhabited___closed__1);
 l_Lean_Elab_Term_TermElabResult_inhabited = _init_l_Lean_Elab_Term_TermElabResult_inhabited();
 lean_mark_persistent(l_Lean_Elab_Term_TermElabResult_inhabited);
+l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1 = _init_l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__1);
 l_Lean_Elab_Term_monadLog___closed__1 = _init_l_Lean_Elab_Term_monadLog___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_monadLog___closed__1);
 l_Lean_Elab_Term_monadLog___closed__2 = _init_l_Lean_Elab_Term_monadLog___closed__2();