diff --git a/stage0/src/Lean/Compiler/LCNF/Basic.lean b/stage0/src/Lean/Compiler/LCNF/Basic.lean
index 5a80b2ab28..a62d1a3bf4 100644
--- a/stage0/src/Lean/Compiler/LCNF/Basic.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Basic.lean
@@ -365,6 +365,30 @@ structure Decl where
   We use this information to control inlining.
   -/
   recursive : Bool := false
+  /--
+  We set this flag to false during LCNF conversion if the Lean function
+  associated with this function was tagged as partial or unsafe. This
+  information affects how static analyzers treat function applications
+  of this kind. See `DefinitionSafety`.
+  `partial` and `unsafe` functions may not be terminating, but Lean
+  functions terminate, and some static analyzers exploit this
+  fact. So, we use the following semantics. Suppose whe hav a (large) natural
+  number `C`. We consider a nondeterministic model for computation of Lean expressions as
+  follows:
+  Each call to a partial/unsafe function uses up one "recursion token".
+  Prior to consuming `C` recursion tokens all partial functions must be called
+  as normal. Once the model has used up `C` recursion tokens, a subsequent call to
+  a partial function has the following nondeterministic options: it can either call
+  the function again, or return any value of the target type (even a noncomputable one).
+  Larger values of `C` yield less nondeterminism in the model, but even the intersection of
+  all choices of `C` yields nondeterminism where `def loop : A := loop` returns any value of type `A`.
+  The compiler fixes a choice for `C`. This is a fixed constant greater than 2^2^64,
+  which is allowed to be compiler and architecture dependent, and promises that it will
+  produce an execution consistent with every possible nondeterministic outcome of the `C`-model.
+  In the event that different nondeterministic executions disagree, the compiler is required to
+  exhaust resources or output a looping computation.
+  -/
+  safe : Bool := true
   deriving Inhabited, BEq
 
 def Decl.size (decl : Decl) : Nat :=
diff --git a/stage0/src/Lean/Compiler/LCNF/Passes.lean b/stage0/src/Lean/Compiler/LCNF/Passes.lean
index 674f734b59..5ce2ec4e29 100644
--- a/stage0/src/Lean/Compiler/LCNF/Passes.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Passes.lean
@@ -80,4 +80,7 @@ builtin_initialize
     applicationTime := .afterCompilation
   }
 
+builtin_initialize
+  registerTraceClass `Compiler.saveBase (inherited := true)
+
 end Lean.Compiler.LCNF
diff --git a/stage0/src/Lean/Compiler/LCNF/Simp/InlineCandidate.lean b/stage0/src/Lean/Compiler/LCNF/Simp/InlineCandidate.lean
index 581c123979..ef3388ce7e 100644
--- a/stage0/src/Lean/Compiler/LCNF/Simp/InlineCandidate.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Simp/InlineCandidate.lean
@@ -40,12 +40,13 @@ def inlineCandidate? (e : Expr) : SimpM (Option InlineCandidateInfo) := do
   let numArgs := e.getAppNumArgs
   let f := e.getAppFn
   if let .const declName us ← findExpr f then
-    if declName == (← read).declName then return none -- TODO: remove after we start storing phase1 code in .olean files
-    let inlineIfReduce := hasInlineIfReduceAttribute (← getEnv) declName
-    unless mustInline || hasInlineAttribute (← getEnv) declName || inlineIfReduce do return none
-    -- TODO: check whether function is recursive or not.
-    -- We can skip the test and store function inline so far.
     let some decl ← getDecl? declName | return none
+    let inlineIfReduce := hasInlineIfReduceAttribute (← getEnv) declName
+    if !inlineIfReduce && decl.recursive then return none
+    let small ← isSmall decl.value
+    let env ← getEnv
+    unless mustInline || hasInlineAttribute env declName || inlineIfReduce || (small && !hasNoInlineAttribute env declName) do
+      return none
     let arity := decl.getArity
     let inlinePartial := (← read).config.inlinePartial
     if !mustInline && !inlinePartial && numArgs < arity then return none
@@ -81,3 +82,6 @@ def inlineCandidate? (e : Expr) : SimpM (Option InlineCandidateInfo) := do
     }
   else
     return none
+
+builtin_initialize
+  registerTraceClass `Compiler.simp.inline
diff --git a/stage0/src/Lean/Compiler/LCNF/Simp/SimpM.lean b/stage0/src/Lean/Compiler/LCNF/Simp/SimpM.lean
index 0d304ef12f..57324d00bf 100644
--- a/stage0/src/Lean/Compiler/LCNF/Simp/SimpM.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Simp/SimpM.lean
@@ -167,17 +167,13 @@ Execute `x` with an updated `inlineStack`. If `value` is of the form `const ...`
 Otherwise, do not change the `inlineStack`.
 -/
 def withInlining (value : Expr) (recursive : Bool) (x : SimpM α) : SimpM α := do
-  trace[Compiler.simp.inline] "inlining {value}"
   let f := value.getAppFn
   if let .const declName _ := f then
+    trace[Compiler.simp.inline] "{declName}"
     let numOccs := (← read).inlineStackOccs.find? declName |>.getD 0
     let numOccs := numOccs + 1
-    if recursive then
-      if hasInlineIfReduceAttribute (← getEnv) declName then
-        if numOccs > (← getConfig).maxRecInlineIfReduce then
-          throwError "function `{declName}` has been recursively inlined more than #{(← getConfig).maxRecInlineIfReduce}, consider removing the attribute `[inlineIfReduce]` from this declaration or increasing the limit using `set_option compiler.maxRecInlineIfReduce <num>`"
-      else if numOccs > (← getConfig).maxRecInline then
-        throwError "function `{declName}` has been recursively inlined more than #{(← getConfig).maxRecInline}, consider removing the attribute `[inline]` from this declaration or increasing the limit using `set_option compiler.maxRecInline <num>`"
+    if recursive && hasInlineIfReduceAttribute (← getEnv) declName && numOccs > (← getConfig).maxRecInlineIfReduce then
+      throwError "function `{declName}` has been recursively inlined more than #{(← getConfig).maxRecInlineIfReduce}, consider removing the attribute `[inlineIfReduce]` from this declaration or increasing the limit using `set_option compiler.maxRecInlineIfReduce <num>`"
     withReader (fun ctx => { ctx with inlineStack := declName :: ctx.inlineStack, inlineStackOccs := ctx.inlineStackOccs.insert declName numOccs }) x
   else
     x
@@ -233,10 +229,10 @@ def isOnceOrMustInline (fvarId : FVarId) : SimpM Bool := do
     | _ => return false
 
 /--
-Return `true` if the given local function declaration is considered "small".
+Return `true` if the given code is considered "small".
 -/
-def isSmall (decl : FunDecl) : SimpM Bool :=
-  return decl.value.sizeLe (← getConfig).smallThreshold
+def isSmall (code : Code) : SimpM Bool :=
+  return code.sizeLe (← getConfig).smallThreshold
 
 /--
 Return `true` if the given local function declaration should be inlined.
@@ -245,7 +241,7 @@ def shouldInlineLocal (decl : FunDecl) : SimpM Bool := do
   if (← isOnceOrMustInline decl.fvarId) then
     return true
   else
-    isSmall decl
+    isSmall decl.value
 
 /--
 LCNF "Beta-reduce". The equivalent of `(fun params => code) args`.
diff --git a/stage0/src/Lean/Compiler/LCNF/Specialize.lean b/stage0/src/Lean/Compiler/LCNF/Specialize.lean
index 86523fb2dd..0973ff9099 100644
--- a/stage0/src/Lean/Compiler/LCNF/Specialize.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Specialize.lean
@@ -326,7 +326,9 @@ where
     let value := attachCodeDecls decls value
     let type ← value.inferType
     let type ← mkForallParams params type
-    let decl := { name := nameNew, levelParams := levelParamsNew, params, type, value : Decl }
+    let safe := decl.safe
+    let recursive := decl.recursive
+    let decl := { name := nameNew, levelParams := levelParamsNew, params, type, value, safe, recursive : Decl }
     return decl.setLevelParams
 
 /--
@@ -373,7 +375,7 @@ mutual
       specDecl.saveBase
       let specDecl ← specDecl.etaExpand
       specDecl.saveBase
-      let specDecl ← specDecl.simp {} -- TODO: `simp` config
+      let specDecl ← specDecl.simp {}
       let specDecl ← specDecl.simp { etaPoly := true, inlinePartial := true, implementedBy := true }
       let value ← withReader (fun _ => { declName := specDecl.name }) do
          withParams specDecl.params <| visitCode specDecl.value
diff --git a/stage0/src/Lean/Compiler/LCNF/ToDecl.lean b/stage0/src/Lean/Compiler/LCNF/ToDecl.lean
index 914366a647..f1df3e4aa5 100644
--- a/stage0/src/Lean/Compiler/LCNF/ToDecl.lean
+++ b/stage0/src/Lean/Compiler/LCNF/ToDecl.lean
@@ -112,11 +112,12 @@ def toDecl (declName : Name) : CompilerM Decl := do
     -- let value ← applyCasesOnImplementedBy value
     return (type, value)
   let value ← toLCNF value
+  let safe := !info.isPartial && !info.isUnsafe
   let decl ← if let .fun decl (.return _) := value then
     eraseFunDecl decl (recursive := false)
-    pure { name := declName, params := decl.params, type, value := decl.value, levelParams := info.levelParams : Decl }
+    pure { name := declName, params := decl.params, type, value := decl.value, levelParams := info.levelParams, safe : Decl }
   else
-    pure { name := declName, params := #[], type, value, levelParams := info.levelParams }
+    pure { name := declName, params := #[], type, value, levelParams := info.levelParams, safe }
   /- `toLCNF` may eta-reduce simple declarations. -/
   decl.etaExpand
 
diff --git a/stage0/src/Lean/Declaration.lean b/stage0/src/Lean/Declaration.lean
index 4ac13a136b..6c85611d54 100644
--- a/stage0/src/Lean/Declaration.lean
+++ b/stage0/src/Lean/Declaration.lean
@@ -389,7 +389,7 @@ def toConstantVal : ConstantInfo → ConstantVal
   | recInfo      {toConstantVal := d, ..} => d
 
 def isUnsafe : ConstantInfo → Bool
-  | defnInfo   v => v.safety == DefinitionSafety.unsafe
+  | defnInfo   v => v.safety == .unsafe
   | axiomInfo  v => v.isUnsafe
   | thmInfo    _ => false
   | opaqueInfo v => v.isUnsafe
@@ -398,6 +398,10 @@ def isUnsafe : ConstantInfo → Bool
   | ctorInfo   v => v.isUnsafe
   | recInfo    v => v.isUnsafe
 
+def isPartial : ConstantInfo → Bool
+  | defnInfo v => v.safety == .partial
+  | _ => false
+
 def name (d : ConstantInfo) : Name :=
   d.toConstantVal.name
 
diff --git a/stage0/src/Lean/Elab/App.lean b/stage0/src/Lean/Elab/App.lean
index b4834dddab..6b2bf774c9 100644
--- a/stage0/src/Lean/Elab/App.lean
+++ b/stage0/src/Lean/Elab/App.lean
@@ -1295,8 +1295,9 @@ private partial def elabAppFn (f : Syntax) (lvals : List LVal) (namedArgs : Arra
     | `(.$id:ident) =>
         addCompletionInfo <| CompletionInfo.dotId f id.getId (← getLCtx) expectedType?
         let fConst ← mkConst (← resolveDotName id expectedType?)
-        let fConst ← addTermInfo f fConst
         let s ← observing do
+          -- Use (force := true) because we want to record the result of .ident resolution even in patterns
+          let fConst ← addTermInfo f fConst expectedType? (force := true)
           let e ← elabAppLVals fConst lvals namedArgs args expectedType? explicit ellipsis
           if overloaded then ensureHasType expectedType? e else return e
         return acc.push s
diff --git a/stage0/src/Lean/Elab/Term.lean b/stage0/src/Lean/Elab/Term.lean
index 49c4c4d28b..8d44b773bd 100644
--- a/stage0/src/Lean/Elab/Term.lean
+++ b/stage0/src/Lean/Elab/Term.lean
@@ -1092,8 +1092,25 @@ def mkTermInfo (elaborator : Name) (stx : Syntax) (e : Expr) (expectedType? : Op
     let e := removeSaveInfoAnnotation e
     return Sum.inl <| Info.ofTermInfo { elaborator, lctx := lctx?.getD (← getLCtx), expr := e, stx, expectedType?, isBinder }
 
-def addTermInfo (stx : Syntax) (e : Expr) (expectedType? : Option Expr := none) (lctx? : Option LocalContext := none) (elaborator := Name.anonymous) (isBinder := false) : TermElabM Expr := do
-  if (← read).inPattern then
+/--
+Pushes a new leaf node to the info tree associating the expression `e` to the syntax `stx`.
+As a result, when the user hovers over `stx` they will see the type of `e`, and if `e`
+is a constant they will see the constant's doc string.
+
+* `expectedType?`: the expected type of `e` at the point of elaboration, if available
+* `lctx?`: the local context in which to interpret `e` (otherwise it will use `← getLCtx`)
+* `elaborator`: a declaration name used as an alternative target for go-to-definition
+* `isBinder`: if true, this will be treated as defining `e` (which should be a local constant)
+  for the purpose of go-to-definition on local variables
+* `force`: In patterns, the effect of `addTermInfo` is usually suppressed and replaced
+  by a `patternWithRef?` annotation which will be turned into a term info on the
+  post-match-elaboration expression. This flag overrides that behavior and adds the term
+  info immediately. (See https://github.com/leanprover/lean4/pull/1664.)
+-/
+def addTermInfo (stx : Syntax) (e : Expr) (expectedType? : Option Expr := none)
+    (lctx? : Option LocalContext := none) (elaborator := Name.anonymous)
+    (isBinder := false) (force := false) : TermElabM Expr := do
+  if (← read).inPattern && !force then
     return mkPatternWithRef e stx
   else
     withInfoContext' (pure ()) (fun _ => mkTermInfo elaborator stx e expectedType? lctx? isBinder) |> discard
@@ -1552,7 +1569,7 @@ def resolveLocalName (n : Name) : TermElabM (Option (Expr × List String)) := do
   let currNamespace ← getCurrNamespace
   let view := extractMacroScopes n
   /- Simple case. "Match" function for regular local declarations. -/
-  let matchLocaDecl? (localDecl : LocalDecl) (givenName : Name) : Option LocalDecl := do
+  let matchLocalDecl? (localDecl : LocalDecl) (givenName : Name) : Option LocalDecl := do
     guard (localDecl.userName == givenName)
     return localDecl
   /-
@@ -1648,9 +1665,9 @@ def resolveLocalName (n : Name) : TermElabM (Option (Expr × List String)) := do
         if let some fullDeclName := auxDeclToFullName.find? localDecl.fvarId then
           matchAuxRecDecl? localDecl fullDeclName givenNameView
         else
-          matchLocaDecl? localDecl givenName
+          matchLocalDecl? localDecl givenName
       else
-        matchLocaDecl? localDecl givenName
+        matchLocalDecl? localDecl givenName
     if localDecl?.isSome || skipAuxDecl then
       localDecl?
     else
@@ -1658,7 +1675,7 @@ def resolveLocalName (n : Name) : TermElabM (Option (Expr × List String)) := do
       lctx.decls.findSomeRev? fun localDecl? => do
         let localDecl ← localDecl?
         guard (localDecl.binderInfo == .auxDecl)
-        matchLocaDecl? localDecl givenName
+        matchLocalDecl? localDecl givenName
   let rec loop (n : Name) (projs : List String) :=
     let givenNameView := { view with name := n }
     /- We do not consider dot notation for local decls corresponding to recursive functions being defined.
@@ -1701,10 +1718,10 @@ def mkConst (constName : Name) (explicitLevels : List Level := []) : TermElabM E
 
 private def mkConsts (candidates : List (Name × List String)) (explicitLevels : List Level) : TermElabM (List (Expr × List String)) := do
   candidates.foldlM (init := []) fun result (declName, projs) => do
-   -- TODO: better suppor for `mkConst` failure. We may want to cache the failures, and report them if all candidates fail.
-   checkDeprecated declName -- TODO: check is occurring too early if there are multiple alternatives. Fix if it is not ok in practice
-   let const ← mkConst declName explicitLevels
-   return (const, projs) :: result
+    -- TODO: better support for `mkConst` failure. We may want to cache the failures, and report them if all candidates fail.
+    checkDeprecated declName -- TODO: check is occurring too early if there are multiple alternatives. Fix if it is not ok in practice
+    let const ← mkConst declName explicitLevels
+    return (const, projs) :: result
 
 def resolveName (stx : Syntax) (n : Name) (preresolved : List Syntax.Preresolved) (explicitLevels : List Level) (expectedType? : Option Expr := none) : TermElabM (List (Expr × List String)) := do
   addCompletionInfo <| CompletionInfo.id stx stx.getId (danglingDot := false) (← getLCtx) expectedType?
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Basic.c b/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
index d2f116408f..cf58cf2e26 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Basic.c
@@ -22,6 +22,7 @@ size_t lean_usize_add(size_t, size_t);
 static lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExpr___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_instInhabitedParam___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateReturnImp(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Code_forM_go___spec__1___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_attachCodeDecls_go___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
@@ -29,6 +30,7 @@ static lean_object* l_Lean_Compiler_LCNF_attachCodeDecls_go___closed__1;
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqAlt___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateContImp___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Code_size_go___spec__1(lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Decl_safe___default;
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqFunDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__2;
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
@@ -65,7 +67,7 @@ lean_object* lean_array_get_size(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Code_collectUsed___spec__1(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqLetDecl____x40_Lean_Compiler_LCNF_Basic___hyg_282_(lean_object*, lean_object*);
 static lean_object* l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExpr___spec__3___closed__1;
-LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636_(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646_(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_size(lean_object*);
 LEAN_EXPORT uint8_t l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqAlt___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(lean_object*, lean_object*);
@@ -116,21 +118,22 @@ extern lean_object* l_Lean_instFVarIdSetInhabited;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_getArity(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instInhabitedCodeDecl___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_collectUsedAtExpr(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams_instAlt(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_AltCore_forCodeM(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_attachCodeDecls___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectParams(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____boxed(lean_object*, lean_object*);
 lean_object* l_instInhabitedForAll__1___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_isFun___boxed(lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateJmpImp___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_instBEqLetDecl___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_attachCodeDecls_go___closed__3;
-LEAN_EXPORT uint8_t l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instInhabitedLetDecl;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Code_sizeLe_go___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_markRecDecls(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams_instExpr(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1(lean_object*, lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_collectUsed(lean_object*, lean_object*);
@@ -139,7 +142,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___lambda_
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExprs___spec__1(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqImp___boxed(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqImp(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_getArity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams_instLetDecl___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instBEqCode___closed__1;
@@ -165,7 +167,6 @@ lean_object* l_Array_mapMono(lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Compiler_LCNF_markRecDecls_visit___spec__1(lean_object*, lean_object*, size_t, size_t);
-LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_AltCore_getCode___boxed(lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___closed__4;
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltsImp___spec__1(lean_object*);
@@ -228,13 +229,13 @@ LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_L
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateFunDeclCoreImp(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateJmpImp(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_getArity___rarg___boxed(lean_object*);
-LEAN_EXPORT uint8_t l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams_instLetDecl(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams_instParams(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_forM(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExpr___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
+LEAN_EXPORT uint8_t l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateUnreachImp(lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___spec__1(lean_object*);
@@ -4863,6 +4864,14 @@ x_1 = 0;
 return x_1;
 }
 }
+static uint8_t _init_l_Lean_Compiler_LCNF_Decl_safe___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
 static lean_object* _init_l_Lean_Compiler_LCNF_instInhabitedDecl___closed__1() {
 _start:
 {
@@ -4873,13 +4882,14 @@ x_3 = l_Lean_Compiler_LCNF_instInhabitedParam___closed__1;
 x_4 = l_Lean_Compiler_LCNF_instInhabitedAltCore___rarg___closed__1;
 x_5 = l_Lean_Compiler_LCNF_instInhabitedCode___closed__1;
 x_6 = 0;
-x_7 = lean_alloc_ctor(0, 5, 1);
+x_7 = lean_alloc_ctor(0, 5, 2);
 lean_ctor_set(x_7, 0, x_2);
 lean_ctor_set(x_7, 1, x_1);
 lean_ctor_set(x_7, 2, x_3);
 lean_ctor_set(x_7, 3, x_4);
 lean_ctor_set(x_7, 4, x_5);
 lean_ctor_set_uint8(x_7, sizeof(void*)*5, x_6);
+lean_ctor_set_uint8(x_7, sizeof(void*)*5 + 1, x_6);
 return x_7;
 }
 }
@@ -4891,7 +4901,7 @@ x_1 = l_Lean_Compiler_LCNF_instInhabitedDecl___closed__1;
 return x_1;
 }
 }
-LEAN_EXPORT uint8_t l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -4941,7 +4951,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT uint8_t l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____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_EXPORT uint8_t l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____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) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -4983,10 +4993,10 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636_(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646_(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; uint8_t x_15; 
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; uint8_t x_16; lean_object* x_17; uint8_t x_21; 
 x_3 = lean_ctor_get(x_1, 0);
 lean_inc(x_3);
 x_4 = lean_ctor_get(x_1, 1);
@@ -4998,111 +5008,125 @@ lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 4);
 lean_inc(x_7);
 x_8 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_9 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_dec(x_1);
-x_9 = lean_ctor_get(x_2, 0);
-x_10 = lean_ctor_get(x_2, 1);
-x_11 = lean_ctor_get(x_2, 2);
-x_12 = lean_ctor_get(x_2, 3);
-x_13 = lean_ctor_get(x_2, 4);
-x_14 = lean_ctor_get_uint8(x_2, sizeof(void*)*5);
-x_15 = lean_name_eq(x_3, x_9);
+x_10 = lean_ctor_get(x_2, 0);
+x_11 = lean_ctor_get(x_2, 1);
+x_12 = lean_ctor_get(x_2, 2);
+x_13 = lean_ctor_get(x_2, 3);
+x_14 = lean_ctor_get(x_2, 4);
+x_15 = lean_ctor_get_uint8(x_2, sizeof(void*)*5);
+x_16 = lean_ctor_get_uint8(x_2, sizeof(void*)*5 + 1);
+x_21 = lean_name_eq(x_3, x_10);
 lean_dec(x_3);
-if (x_15 == 0)
+if (x_21 == 0)
 {
-uint8_t x_16; 
+uint8_t x_22; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_16 = 0;
-return x_16;
+x_22 = 0;
+return x_22;
 }
 else
 {
-uint8_t x_17; 
-x_17 = l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1(x_4, x_10);
+uint8_t x_23; 
+x_23 = l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1(x_4, x_11);
 lean_dec(x_4);
-if (x_17 == 0)
-{
-uint8_t x_18; 
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-x_18 = 0;
-return x_18;
-}
-else
-{
-uint8_t x_19; 
-x_19 = lean_expr_eqv(x_5, x_11);
-lean_dec(x_5);
-if (x_19 == 0)
-{
-uint8_t x_20; 
-lean_dec(x_7);
-lean_dec(x_6);
-x_20 = 0;
-return x_20;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_21 = lean_array_get_size(x_6);
-x_22 = lean_array_get_size(x_12);
-x_23 = lean_nat_dec_eq(x_21, x_22);
-lean_dec(x_22);
-lean_dec(x_21);
 if (x_23 == 0)
 {
 uint8_t x_24; 
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 x_24 = 0;
 return x_24;
 }
 else
 {
-lean_object* x_25; uint8_t x_26; 
-x_25 = lean_unsigned_to_nat(0u);
-x_26 = l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__2(x_6, x_12, lean_box(0), x_6, x_12, x_25);
-lean_dec(x_6);
-if (x_26 == 0)
+uint8_t x_25; 
+x_25 = lean_expr_eqv(x_5, x_12);
+lean_dec(x_5);
+if (x_25 == 0)
 {
-uint8_t x_27; 
+uint8_t x_26; 
 lean_dec(x_7);
-x_27 = 0;
-return x_27;
+lean_dec(x_6);
+x_26 = 0;
+return x_26;
 }
 else
 {
-uint8_t x_28; 
-x_28 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqImp(x_7, x_13);
-if (x_28 == 0)
+lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_27 = lean_array_get_size(x_6);
+x_28 = lean_array_get_size(x_13);
+x_29 = lean_nat_dec_eq(x_27, x_28);
+lean_dec(x_28);
+lean_dec(x_27);
+if (x_29 == 0)
 {
-uint8_t x_29; 
-x_29 = 0;
-return x_29;
+uint8_t x_30; 
+lean_dec(x_7);
+lean_dec(x_6);
+x_30 = 0;
+return x_30;
+}
+else
+{
+lean_object* x_31; uint8_t x_32; 
+x_31 = lean_unsigned_to_nat(0u);
+x_32 = l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__2(x_6, x_13, lean_box(0), x_6, x_13, x_31);
+lean_dec(x_6);
+if (x_32 == 0)
+{
+uint8_t x_33; 
+lean_dec(x_7);
+x_33 = 0;
+return x_33;
+}
+else
+{
+uint8_t x_34; 
+x_34 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_eqImp(x_7, x_14);
+if (x_34 == 0)
+{
+uint8_t x_35; 
+x_35 = 0;
+return x_35;
 }
 else
 {
 if (x_8 == 0)
 {
-if (x_14 == 0)
+if (x_15 == 0)
 {
-uint8_t x_30; 
-x_30 = 1;
-return x_30;
+lean_object* x_36; 
+x_36 = lean_box(0);
+x_17 = x_36;
+goto block_20;
 }
 else
 {
-uint8_t x_31; 
-x_31 = 0;
-return x_31;
+uint8_t x_37; 
+x_37 = 0;
+return x_37;
 }
 }
 else
 {
-return x_14;
+if (x_15 == 0)
+{
+uint8_t x_38; 
+x_38 = 0;
+return x_38;
+}
+else
+{
+lean_object* x_39; 
+x_39 = lean_box(0);
+x_17 = x_39;
+goto block_20;
 }
 }
 }
@@ -5111,23 +5135,47 @@ return x_14;
 }
 }
 }
+block_20:
+{
+lean_dec(x_17);
+if (x_9 == 0)
+{
+if (x_16 == 0)
+{
+uint8_t x_18; 
+x_18 = 1;
+return x_18;
 }
-LEAN_EXPORT lean_object* l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+else
+{
+uint8_t x_19; 
+x_19 = 0;
+return x_19;
+}
+}
+else
+{
+return x_16;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__1(x_1, x_2);
+x_3 = l_List_beq___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__1(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____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_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____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) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
-x_7 = l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Array_isEqvAux___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
@@ -5136,11 +5184,11 @@ x_8 = lean_box(x_7);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____boxed(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636_(x_1, x_2);
+x_3 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646_(x_1, x_2);
 lean_dec(x_2);
 x_4 = lean_box(x_3);
 return x_4;
@@ -5150,7 +5198,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_instBEqDecl___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646____boxed), 2, 0);
 return x_1;
 }
 }
@@ -8540,7 +8588,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___closed__1;
 x_2 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExpr___closed__1;
-x_3 = lean_unsigned_to_nat(448u);
+x_3 = lean_unsigned_to_nat(472u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9422,7 +9470,7 @@ return x_4;
 }
 else
 {
-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; uint8_t x_14; size_t x_15; size_t x_16; 
+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; uint8_t x_14; uint8_t x_15; size_t x_16; size_t x_17; 
 x_6 = lean_array_uget(x_4, x_3);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = lean_array_uset(x_4, x_3, x_7);
@@ -9436,61 +9484,63 @@ x_12 = lean_ctor_get(x_6, 3);
 lean_inc(x_12);
 x_13 = lean_ctor_get(x_6, 4);
 lean_inc(x_13);
-x_14 = l_Lean_NameSet_contains(x_1, x_9);
-x_15 = 1;
-x_16 = lean_usize_add(x_3, x_15);
-if (x_14 == 0)
+x_14 = lean_ctor_get_uint8(x_6, sizeof(void*)*5 + 1);
+x_15 = l_Lean_NameSet_contains(x_1, x_9);
+x_16 = 1;
+x_17 = lean_usize_add(x_3, x_16);
+if (x_15 == 0)
 {
-lean_object* x_17; 
+lean_object* x_18; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
-x_17 = lean_array_uset(x_8, x_3, x_6);
-x_3 = x_16;
-x_4 = x_17;
+x_18 = lean_array_uset(x_8, x_3, x_6);
+x_3 = x_17;
+x_4 = x_18;
 goto _start;
 }
 else
 {
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_6);
-if (x_19 == 0)
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_6);
+if (x_20 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; 
-x_20 = lean_ctor_get(x_6, 4);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_6, 3);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; 
+x_21 = lean_ctor_get(x_6, 4);
 lean_dec(x_21);
-x_22 = lean_ctor_get(x_6, 2);
+x_22 = lean_ctor_get(x_6, 3);
 lean_dec(x_22);
-x_23 = lean_ctor_get(x_6, 1);
+x_23 = lean_ctor_get(x_6, 2);
 lean_dec(x_23);
-x_24 = lean_ctor_get(x_6, 0);
+x_24 = lean_ctor_get(x_6, 1);
 lean_dec(x_24);
-x_25 = 1;
-lean_ctor_set_uint8(x_6, sizeof(void*)*5, x_25);
-x_26 = lean_array_uset(x_8, x_3, x_6);
-x_3 = x_16;
-x_4 = x_26;
+x_25 = lean_ctor_get(x_6, 0);
+lean_dec(x_25);
+x_26 = 1;
+lean_ctor_set_uint8(x_6, sizeof(void*)*5, x_26);
+x_27 = lean_array_uset(x_8, x_3, x_6);
+x_3 = x_17;
+x_4 = x_27;
 goto _start;
 }
 else
 {
-uint8_t x_28; lean_object* x_29; lean_object* x_30; 
+uint8_t x_29; lean_object* x_30; lean_object* x_31; 
 lean_dec(x_6);
-x_28 = 1;
-x_29 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_29, 0, x_9);
-lean_ctor_set(x_29, 1, x_10);
-lean_ctor_set(x_29, 2, x_11);
-lean_ctor_set(x_29, 3, x_12);
-lean_ctor_set(x_29, 4, x_13);
-lean_ctor_set_uint8(x_29, sizeof(void*)*5, x_28);
-x_30 = lean_array_uset(x_8, x_3, x_29);
-x_3 = x_16;
-x_4 = x_30;
+x_29 = 1;
+x_30 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_30, 0, x_9);
+lean_ctor_set(x_30, 1, x_10);
+lean_ctor_set(x_30, 2, x_11);
+lean_ctor_set(x_30, 3, x_12);
+lean_ctor_set(x_30, 4, x_13);
+lean_ctor_set_uint8(x_30, sizeof(void*)*5, x_29);
+lean_ctor_set_uint8(x_30, sizeof(void*)*5 + 1, x_14);
+x_31 = lean_array_uset(x_8, x_3, x_30);
+x_3 = x_17;
+x_4 = x_31;
 goto _start;
 }
 }
@@ -9640,6 +9690,7 @@ lean_mark_persistent(l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__2);
 l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__3 = _init_l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__3();
 lean_mark_persistent(l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___closed__3);
 l_Lean_Compiler_LCNF_Decl_recursive___default = _init_l_Lean_Compiler_LCNF_Decl_recursive___default();
+l_Lean_Compiler_LCNF_Decl_safe___default = _init_l_Lean_Compiler_LCNF_Decl_safe___default();
 l_Lean_Compiler_LCNF_instInhabitedDecl___closed__1 = _init_l_Lean_Compiler_LCNF_instInhabitedDecl___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_instInhabitedDecl___closed__1);
 l_Lean_Compiler_LCNF_instInhabitedDecl = _init_l_Lean_Compiler_LCNF_instInhabitedDecl();
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Bind.c b/stage0/stdlib/Lean/Compiler/LCNF/Bind.c
index 10f1413fef..f4fc0d2851 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Bind.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Bind.c
@@ -2438,7 +2438,7 @@ return x_24;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_etaExpand(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; uint8_t x_12; lean_object* x_13; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; uint8_t x_13; lean_object* x_14; 
 x_7 = lean_ctor_get(x_1, 0);
 lean_inc(x_7);
 x_8 = lean_ctor_get(x_1, 1);
@@ -2450,159 +2450,161 @@ lean_inc(x_10);
 x_11 = lean_ctor_get(x_1, 4);
 lean_inc(x_11);
 x_12 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_13 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_9);
-x_13 = l_Lean_Compiler_LCNF_etaExpandCore_x3f(x_9, x_10, x_11, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
+x_14 = l_Lean_Compiler_LCNF_etaExpandCore_x3f(x_9, x_10, x_11, x_2, x_3, x_4, x_5, x_6);
 if (lean_obj_tag(x_14) == 0)
 {
-uint8_t x_15; 
+lean_object* x_15; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+if (lean_obj_tag(x_15) == 0)
+{
+uint8_t x_16; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_15 = !lean_is_exclusive(x_13);
-if (x_15 == 0)
+x_16 = !lean_is_exclusive(x_14);
+if (x_16 == 0)
 {
-lean_object* x_16; 
-x_16 = lean_ctor_get(x_13, 0);
-lean_dec(x_16);
-lean_ctor_set(x_13, 0, x_1);
-return x_13;
+lean_object* x_17; 
+x_17 = lean_ctor_get(x_14, 0);
+lean_dec(x_17);
+lean_ctor_set(x_14, 0, x_1);
+return x_14;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; 
-x_17 = lean_ctor_get(x_13, 1);
-lean_inc(x_17);
-lean_dec(x_13);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_1);
-lean_ctor_set(x_18, 1, x_17);
-return x_18;
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_14, 1);
+lean_inc(x_18);
+lean_dec(x_14);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_1);
+lean_ctor_set(x_19, 1, x_18);
+return x_19;
 }
 }
 else
 {
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_1);
-if (x_19 == 0)
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_1);
+if (x_20 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_1, 4);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_1, 3);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
+x_21 = lean_ctor_get(x_1, 4);
 lean_dec(x_21);
-x_22 = lean_ctor_get(x_1, 2);
+x_22 = lean_ctor_get(x_1, 3);
 lean_dec(x_22);
-x_23 = lean_ctor_get(x_1, 1);
+x_23 = lean_ctor_get(x_1, 2);
 lean_dec(x_23);
-x_24 = lean_ctor_get(x_1, 0);
+x_24 = lean_ctor_get(x_1, 1);
 lean_dec(x_24);
-x_25 = lean_ctor_get(x_14, 0);
-lean_inc(x_25);
-lean_dec(x_14);
-x_26 = !lean_is_exclusive(x_13);
-if (x_26 == 0)
+x_25 = lean_ctor_get(x_1, 0);
+lean_dec(x_25);
+x_26 = lean_ctor_get(x_15, 0);
+lean_inc(x_26);
+lean_dec(x_15);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_13, 0);
-lean_dec(x_27);
-x_28 = lean_ctor_get(x_25, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_25, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+lean_dec(x_28);
+x_29 = lean_ctor_get(x_26, 0);
 lean_inc(x_29);
-lean_dec(x_25);
-lean_ctor_set(x_1, 4, x_29);
-lean_ctor_set(x_1, 3, x_28);
-lean_ctor_set(x_13, 0, x_1);
-return x_13;
-}
-else
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_30 = lean_ctor_get(x_13, 1);
+x_30 = lean_ctor_get(x_26, 1);
 lean_inc(x_30);
-lean_dec(x_13);
-x_31 = lean_ctor_get(x_25, 0);
+lean_dec(x_26);
+lean_ctor_set(x_1, 4, x_30);
+lean_ctor_set(x_1, 3, x_29);
+lean_ctor_set(x_14, 0, x_1);
+return x_14;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_31 = lean_ctor_get(x_14, 1);
 lean_inc(x_31);
-x_32 = lean_ctor_get(x_25, 1);
-lean_inc(x_32);
-lean_dec(x_25);
-lean_ctor_set(x_1, 4, x_32);
-lean_ctor_set(x_1, 3, x_31);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_1);
-lean_ctor_set(x_33, 1, x_30);
-return x_33;
-}
-}
-else
-{
-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_dec(x_1);
-x_34 = lean_ctor_get(x_14, 0);
-lean_inc(x_34);
 lean_dec(x_14);
-x_35 = lean_ctor_get(x_13, 1);
+x_32 = lean_ctor_get(x_26, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_26, 1);
+lean_inc(x_33);
+lean_dec(x_26);
+lean_ctor_set(x_1, 4, x_33);
+lean_ctor_set(x_1, 3, x_32);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_1);
+lean_ctor_set(x_34, 1, x_31);
+return x_34;
+}
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+lean_dec(x_1);
+x_35 = lean_ctor_get(x_15, 0);
 lean_inc(x_35);
-if (lean_is_exclusive(x_13)) {
- lean_ctor_release(x_13, 0);
- lean_ctor_release(x_13, 1);
- x_36 = x_13;
+lean_dec(x_15);
+x_36 = lean_ctor_get(x_14, 1);
+lean_inc(x_36);
+if (lean_is_exclusive(x_14)) {
+ lean_ctor_release(x_14, 0);
+ lean_ctor_release(x_14, 1);
+ x_37 = x_14;
 } else {
- lean_dec_ref(x_13);
- x_36 = lean_box(0);
+ lean_dec_ref(x_14);
+ x_37 = lean_box(0);
 }
-x_37 = lean_ctor_get(x_34, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_34, 1);
+x_38 = lean_ctor_get(x_35, 0);
 lean_inc(x_38);
-lean_dec(x_34);
-x_39 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_39, 0, x_7);
-lean_ctor_set(x_39, 1, x_8);
-lean_ctor_set(x_39, 2, x_9);
-lean_ctor_set(x_39, 3, x_37);
-lean_ctor_set(x_39, 4, x_38);
-lean_ctor_set_uint8(x_39, sizeof(void*)*5, x_12);
-if (lean_is_scalar(x_36)) {
- x_40 = lean_alloc_ctor(0, 2, 0);
+x_39 = lean_ctor_get(x_35, 1);
+lean_inc(x_39);
+lean_dec(x_35);
+x_40 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_40, 0, x_7);
+lean_ctor_set(x_40, 1, x_8);
+lean_ctor_set(x_40, 2, x_9);
+lean_ctor_set(x_40, 3, x_38);
+lean_ctor_set(x_40, 4, x_39);
+lean_ctor_set_uint8(x_40, sizeof(void*)*5, x_12);
+lean_ctor_set_uint8(x_40, sizeof(void*)*5 + 1, x_13);
+if (lean_is_scalar(x_37)) {
+ x_41 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_40 = x_36;
+ x_41 = x_37;
 }
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_35);
-return x_40;
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_36);
+return x_41;
 }
 }
 }
 else
 {
-uint8_t x_41; 
+uint8_t x_42; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_41 = !lean_is_exclusive(x_13);
-if (x_41 == 0)
+x_42 = !lean_is_exclusive(x_14);
+if (x_42 == 0)
 {
-return x_13;
+return x_14;
 }
 else
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_13, 0);
-x_43 = lean_ctor_get(x_13, 1);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_14, 0);
+x_44 = lean_ctor_get(x_14, 1);
+lean_inc(x_44);
 lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_13);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_dec(x_14);
+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;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/CSE.c b/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
index 804a2b7748..650264d26f 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
@@ -25,6 +25,7 @@ lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_upda
 LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_CSE_State_map___default___closed__3;
 uint8_t lean_usize_dec_eq(size_t, size_t);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2;
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_withNewScope(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -41,8 +42,8 @@ lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_cse___closed__4;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1;
 static lean_object* l_Lean_Compiler_LCNF_cse___closed__2;
 size_t lean_usize_shift_right(size_t, size_t);
 lean_object* l_Lean_Compiler_LCNF_eraseLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -108,7 +109,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM(lean_
 uint8_t lean_usize_dec_le(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_replaceFun(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_getSubst___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_addEntry___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_CSE_addEntry___spec__3(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -122,7 +123,6 @@ lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_norm
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_State_subst___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_cse_go___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_usize_to_nat(size_t);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_withNewScope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -5136,78 +5136,80 @@ return x_22;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; 
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; uint8_t x_29; lean_object* x_30; 
 x_23 = lean_ctor_get(x_1, 0);
 x_24 = lean_ctor_get(x_1, 1);
 x_25 = lean_ctor_get(x_1, 2);
 x_26 = lean_ctor_get(x_1, 3);
 x_27 = lean_ctor_get(x_1, 4);
 x_28 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_29 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_dec(x_1);
-x_29 = l_Lean_Compiler_LCNF_Code_cse(x_27, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_29) == 0)
+x_30 = l_Lean_Compiler_LCNF_Code_cse(x_27, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_30) == 0)
 {
-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_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-if (lean_is_exclusive(x_29)) {
- lean_ctor_release(x_29, 0);
- lean_ctor_release(x_29, 1);
- x_32 = x_29;
+x_32 = lean_ctor_get(x_30, 1);
+lean_inc(x_32);
+if (lean_is_exclusive(x_30)) {
+ lean_ctor_release(x_30, 0);
+ lean_ctor_release(x_30, 1);
+ x_33 = x_30;
 } else {
- lean_dec_ref(x_29);
- x_32 = lean_box(0);
+ lean_dec_ref(x_30);
+ x_33 = lean_box(0);
 }
-x_33 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_33, 0, x_23);
-lean_ctor_set(x_33, 1, x_24);
-lean_ctor_set(x_33, 2, x_25);
-lean_ctor_set(x_33, 3, x_26);
-lean_ctor_set(x_33, 4, x_30);
-lean_ctor_set_uint8(x_33, sizeof(void*)*5, x_28);
-if (lean_is_scalar(x_32)) {
- x_34 = lean_alloc_ctor(0, 2, 0);
+x_34 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_34, 0, x_23);
+lean_ctor_set(x_34, 1, x_24);
+lean_ctor_set(x_34, 2, x_25);
+lean_ctor_set(x_34, 3, x_26);
+lean_ctor_set(x_34, 4, x_31);
+lean_ctor_set_uint8(x_34, sizeof(void*)*5, x_28);
+lean_ctor_set_uint8(x_34, sizeof(void*)*5 + 1, x_29);
+if (lean_is_scalar(x_33)) {
+ x_35 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_34 = x_32;
+ x_35 = x_33;
 }
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_31);
-return x_34;
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 lean_dec(x_26);
 lean_dec(x_25);
 lean_dec(x_24);
 lean_dec(x_23);
-x_35 = lean_ctor_get(x_29, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_29, 1);
+x_36 = lean_ctor_get(x_30, 0);
 lean_inc(x_36);
-if (lean_is_exclusive(x_29)) {
- lean_ctor_release(x_29, 0);
- lean_ctor_release(x_29, 1);
- x_37 = x_29;
+x_37 = lean_ctor_get(x_30, 1);
+lean_inc(x_37);
+if (lean_is_exclusive(x_30)) {
+ lean_ctor_release(x_30, 0);
+ lean_ctor_release(x_30, 1);
+ x_38 = x_30;
 } else {
- lean_dec_ref(x_29);
- x_37 = lean_box(0);
+ lean_dec_ref(x_30);
+ x_38 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_38)) {
+ x_39 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_39 = x_38;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_39, 0, x_36);
+lean_ctor_set(x_39, 1, x_37);
+return x_39;
 }
 }
 }
@@ -5258,7 +5260,7 @@ x_1 = l_Lean_Compiler_LCNF_cse___closed__4;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -5266,21 +5268,21 @@ x_1 = lean_mk_string_from_bytes("Compiler", 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1;
 x_2 = l_Lean_Compiler_LCNF_cse___closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -5345,11 +5347,11 @@ l_Lean_Compiler_LCNF_cse___closed__4 = _init_l_Lean_Compiler_LCNF_cse___closed__
 lean_mark_persistent(l_Lean_Compiler_LCNF_cse___closed__4);
 l_Lean_Compiler_LCNF_cse = _init_l_Lean_Compiler_LCNF_cse();
 lean_mark_persistent(l_Lean_Compiler_LCNF_cse);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993____closed__2);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_993_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994____closed__2);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_994_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c b/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c
index ec7149758f..8c4c86bcd7 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c
@@ -6601,65 +6601,67 @@ return x_28;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; size_t x_42; size_t 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; 
 x_29 = lean_ctor_get(x_1, 0);
 x_30 = lean_ctor_get(x_1, 1);
 x_31 = lean_ctor_get(x_1, 2);
 x_32 = lean_ctor_get(x_1, 3);
 x_33 = lean_ctor_get(x_1, 4);
 x_34 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_35 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_dec(x_1);
-x_35 = lean_st_ref_get(x_2, x_7);
-x_36 = lean_ctor_get(x_35, 0);
-lean_inc(x_36);
-x_37 = lean_ctor_get(x_35, 1);
+x_36 = lean_st_ref_get(x_2, x_7);
+x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
-lean_dec(x_35);
-x_38 = 1;
-x_39 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_36, x_38, x_31);
-x_40 = lean_array_get_size(x_32);
-x_41 = lean_usize_of_nat(x_40);
-lean_dec(x_40);
-x_42 = 0;
-x_43 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_41, x_42, x_32, x_2, x_3, x_4, x_5, x_6, x_37);
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_43, 1);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+lean_dec(x_36);
+x_39 = 1;
+x_40 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_37, x_39, x_31);
+x_41 = lean_array_get_size(x_32);
+x_42 = lean_usize_of_nat(x_41);
+lean_dec(x_41);
+x_43 = 0;
+x_44 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_42, x_43, x_32, x_2, x_3, x_4, x_5, x_6, x_38);
+x_45 = lean_ctor_get(x_44, 0);
 lean_inc(x_45);
-lean_dec(x_43);
-x_46 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_33, x_2, x_3, x_4, x_5, x_6, x_45);
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_46, 1);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_33, x_2, x_3, x_4, x_5, x_6, x_46);
+x_48 = lean_ctor_get(x_47, 0);
 lean_inc(x_48);
-if (lean_is_exclusive(x_46)) {
- lean_ctor_release(x_46, 0);
- lean_ctor_release(x_46, 1);
- x_49 = x_46;
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+if (lean_is_exclusive(x_47)) {
+ lean_ctor_release(x_47, 0);
+ lean_ctor_release(x_47, 1);
+ x_50 = x_47;
 } else {
- lean_dec_ref(x_46);
- x_49 = lean_box(0);
+ lean_dec_ref(x_47);
+ x_50 = lean_box(0);
 }
-x_50 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_50, 0, x_29);
-lean_ctor_set(x_50, 1, x_30);
-lean_ctor_set(x_50, 2, x_39);
-lean_ctor_set(x_50, 3, x_44);
-lean_ctor_set(x_50, 4, x_47);
-lean_ctor_set_uint8(x_50, sizeof(void*)*5, x_34);
-if (lean_is_scalar(x_49)) {
- x_51 = lean_alloc_ctor(0, 2, 0);
+x_51 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_51, 0, x_29);
+lean_ctor_set(x_51, 1, x_30);
+lean_ctor_set(x_51, 2, x_40);
+lean_ctor_set(x_51, 3, x_45);
+lean_ctor_set(x_51, 4, x_48);
+lean_ctor_set_uint8(x_51, sizeof(void*)*5, x_34);
+lean_ctor_set_uint8(x_51, sizeof(void*)*5 + 1, x_35);
+if (lean_is_scalar(x_50)) {
+ x_52 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_51 = x_49;
+ x_52 = x_50;
 }
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_48);
-return x_51;
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_49);
+return x_52;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/ElimDead.c b/stage0/stdlib/Lean/Compiler/LCNF/ElimDead.c
index 6b27e14892..08a107964e 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/ElimDead.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/ElimDead.c
@@ -2397,78 +2397,80 @@ return x_22;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; 
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; uint8_t x_29; lean_object* x_30; 
 x_23 = lean_ctor_get(x_1, 0);
 x_24 = lean_ctor_get(x_1, 1);
 x_25 = lean_ctor_get(x_1, 2);
 x_26 = lean_ctor_get(x_1, 3);
 x_27 = lean_ctor_get(x_1, 4);
 x_28 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_29 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_dec(x_1);
-x_29 = l_Lean_Compiler_LCNF_Code_elimDead(x_27, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_29) == 0)
+x_30 = l_Lean_Compiler_LCNF_Code_elimDead(x_27, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_30) == 0)
 {
-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_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-if (lean_is_exclusive(x_29)) {
- lean_ctor_release(x_29, 0);
- lean_ctor_release(x_29, 1);
- x_32 = x_29;
+x_32 = lean_ctor_get(x_30, 1);
+lean_inc(x_32);
+if (lean_is_exclusive(x_30)) {
+ lean_ctor_release(x_30, 0);
+ lean_ctor_release(x_30, 1);
+ x_33 = x_30;
 } else {
- lean_dec_ref(x_29);
- x_32 = lean_box(0);
+ lean_dec_ref(x_30);
+ x_33 = lean_box(0);
 }
-x_33 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_33, 0, x_23);
-lean_ctor_set(x_33, 1, x_24);
-lean_ctor_set(x_33, 2, x_25);
-lean_ctor_set(x_33, 3, x_26);
-lean_ctor_set(x_33, 4, x_30);
-lean_ctor_set_uint8(x_33, sizeof(void*)*5, x_28);
-if (lean_is_scalar(x_32)) {
- x_34 = lean_alloc_ctor(0, 2, 0);
+x_34 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_34, 0, x_23);
+lean_ctor_set(x_34, 1, x_24);
+lean_ctor_set(x_34, 2, x_25);
+lean_ctor_set(x_34, 3, x_26);
+lean_ctor_set(x_34, 4, x_31);
+lean_ctor_set_uint8(x_34, sizeof(void*)*5, x_28);
+lean_ctor_set_uint8(x_34, sizeof(void*)*5 + 1, x_29);
+if (lean_is_scalar(x_33)) {
+ x_35 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_34 = x_32;
+ x_35 = x_33;
 }
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_31);
-return x_34;
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
 lean_dec(x_26);
 lean_dec(x_25);
 lean_dec(x_24);
 lean_dec(x_23);
-x_35 = lean_ctor_get(x_29, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_29, 1);
+x_36 = lean_ctor_get(x_30, 0);
 lean_inc(x_36);
-if (lean_is_exclusive(x_29)) {
- lean_ctor_release(x_29, 0);
- lean_ctor_release(x_29, 1);
- x_37 = x_29;
+x_37 = lean_ctor_get(x_30, 1);
+lean_inc(x_37);
+if (lean_is_exclusive(x_30)) {
+ lean_ctor_release(x_30, 0);
+ lean_ctor_release(x_30, 1);
+ x_38 = x_30;
 } else {
- lean_dec_ref(x_29);
- x_37 = lean_box(0);
+ lean_dec_ref(x_30);
+ x_38 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_38)) {
+ x_39 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_39 = x_38;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_39, 0, x_36);
+lean_ctor_set(x_39, 1, x_37);
+return x_39;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/JoinPoints.c b/stage0/stdlib/Lean/Compiler/LCNF/JoinPoints.c
index 92c2b503dc..75adb1f478 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/JoinPoints.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/JoinPoints.c
@@ -135,7 +135,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_JoinPoints_0__Lean_Compi
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_JoinPointFinder_FindState_scope___default;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_AltCore_getCode(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2048_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2049_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkHashSet___at_Lean_Compiler_LCNF_JoinPointFinder_instInhabitedCandidateInfo___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_HashMapImp_moveEntries___at_Lean_Compiler_LCNF_JoinPointFinder_replace___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_instInhabitedReaderT___rarg___boxed(lean_object*, lean_object*);
@@ -7680,49 +7680,49 @@ return x_18;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_JoinPointFinder_replace(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; lean_object* x_12; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
 x_8 = lean_unsigned_to_nat(0u);
 x_9 = l_Lean_mkHashMapImp___rarg(x_8);
 x_10 = lean_ctor_get(x_2, 0);
-x_46 = lean_ctor_get(x_10, 1);
-x_47 = lean_array_get_size(x_46);
-x_48 = lean_nat_dec_lt(x_8, x_47);
-if (x_48 == 0)
-{
-lean_dec(x_47);
-x_11 = x_9;
-x_12 = x_7;
-goto block_45;
-}
-else
-{
-uint8_t x_49; 
-x_49 = lean_nat_dec_le(x_47, x_47);
+x_47 = lean_ctor_get(x_10, 1);
+x_48 = lean_array_get_size(x_47);
+x_49 = lean_nat_dec_lt(x_8, x_48);
 if (x_49 == 0)
 {
-lean_dec(x_47);
+lean_dec(x_48);
 x_11 = x_9;
 x_12 = x_7;
-goto block_45;
+goto block_46;
 }
 else
 {
-size_t x_50; size_t x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_50 = 0;
-x_51 = lean_usize_of_nat(x_47);
-lean_dec(x_47);
-x_52 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_JoinPointFinder_replace___spec__8(x_46, x_50, x_51, x_9, x_3, x_4, x_5, x_6, x_7);
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
+uint8_t x_50; 
+x_50 = lean_nat_dec_le(x_48, x_48);
+if (x_50 == 0)
+{
+lean_dec(x_48);
+x_11 = x_9;
+x_12 = x_7;
+goto block_46;
+}
+else
+{
+size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_51 = 0;
+x_52 = lean_usize_of_nat(x_48);
+lean_dec(x_48);
+x_53 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_JoinPointFinder_replace___spec__8(x_47, x_51, x_52, x_9, x_3, x_4, x_5, x_6, x_7);
+x_54 = lean_ctor_get(x_53, 0);
 lean_inc(x_54);
-lean_dec(x_52);
-x_11 = x_53;
-x_12 = x_54;
-goto block_45;
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+lean_dec(x_53);
+x_11 = x_54;
+x_12 = x_55;
+goto block_46;
 }
 }
-block_45:
+block_46:
 {
 uint8_t x_13; 
 x_13 = !lean_is_exclusive(x_1);
@@ -7792,78 +7792,80 @@ return x_28;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; 
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; uint8_t x_35; lean_object* x_36; 
 x_29 = lean_ctor_get(x_1, 0);
 x_30 = lean_ctor_get(x_1, 1);
 x_31 = lean_ctor_get(x_1, 2);
 x_32 = lean_ctor_get(x_1, 3);
 x_33 = lean_ctor_get(x_1, 4);
 x_34 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_35 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_dec(x_1);
-x_35 = l_Lean_Compiler_LCNF_JoinPointFinder_replace_go(x_33, x_11, x_3, x_4, x_5, x_6, x_12);
-if (lean_obj_tag(x_35) == 0)
+x_36 = l_Lean_Compiler_LCNF_JoinPointFinder_replace_go(x_33, x_11, x_3, x_4, x_5, x_6, x_12);
+if (lean_obj_tag(x_36) == 0)
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_36 = lean_ctor_get(x_35, 0);
-lean_inc(x_36);
-x_37 = lean_ctor_get(x_35, 1);
+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_36, 0);
 lean_inc(x_37);
-if (lean_is_exclusive(x_35)) {
- lean_ctor_release(x_35, 0);
- lean_ctor_release(x_35, 1);
- x_38 = x_35;
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ lean_ctor_release(x_36, 1);
+ x_39 = x_36;
 } else {
- lean_dec_ref(x_35);
- x_38 = lean_box(0);
+ lean_dec_ref(x_36);
+ x_39 = lean_box(0);
 }
-x_39 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_39, 0, x_29);
-lean_ctor_set(x_39, 1, x_30);
-lean_ctor_set(x_39, 2, x_31);
-lean_ctor_set(x_39, 3, x_32);
-lean_ctor_set(x_39, 4, x_36);
-lean_ctor_set_uint8(x_39, sizeof(void*)*5, x_34);
-if (lean_is_scalar(x_38)) {
- x_40 = lean_alloc_ctor(0, 2, 0);
+x_40 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_40, 0, x_29);
+lean_ctor_set(x_40, 1, x_30);
+lean_ctor_set(x_40, 2, x_31);
+lean_ctor_set(x_40, 3, x_32);
+lean_ctor_set(x_40, 4, x_37);
+lean_ctor_set_uint8(x_40, sizeof(void*)*5, x_34);
+lean_ctor_set_uint8(x_40, sizeof(void*)*5 + 1, x_35);
+if (lean_is_scalar(x_39)) {
+ x_41 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_40 = x_38;
+ x_41 = x_39;
 }
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_38);
+return x_41;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
 lean_dec(x_32);
 lean_dec(x_31);
 lean_dec(x_30);
 lean_dec(x_29);
-x_41 = lean_ctor_get(x_35, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_35, 1);
+x_42 = lean_ctor_get(x_36, 0);
 lean_inc(x_42);
-if (lean_is_exclusive(x_35)) {
- lean_ctor_release(x_35, 0);
- lean_ctor_release(x_35, 1);
- x_43 = x_35;
+x_43 = lean_ctor_get(x_36, 1);
+lean_inc(x_43);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ lean_ctor_release(x_36, 1);
+ x_44 = x_36;
 } else {
- lean_dec_ref(x_35);
- x_43 = lean_box(0);
+ lean_dec_ref(x_36);
+ x_44 = lean_box(0);
 }
-if (lean_is_scalar(x_43)) {
- x_44 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_44)) {
+ x_45 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_44 = x_43;
+ x_45 = x_44;
 }
-lean_ctor_set(x_44, 0, x_41);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
+lean_ctor_set(x_45, 0, x_42);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
 }
 }
 }
@@ -8407,7 +8409,7 @@ x_1 = l_Lean_Compiler_LCNF_findJoinPoints___closed__3;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2048_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2049_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
@@ -8504,7 +8506,7 @@ l_Lean_Compiler_LCNF_findJoinPoints___closed__3 = _init_l_Lean_Compiler_LCNF_fin
 lean_mark_persistent(l_Lean_Compiler_LCNF_findJoinPoints___closed__3);
 l_Lean_Compiler_LCNF_findJoinPoints = _init_l_Lean_Compiler_LCNF_findJoinPoints();
 lean_mark_persistent(l_Lean_Compiler_LCNF_findJoinPoints);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2048_(lean_io_mk_world());
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_JoinPoints___hyg_2049_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Level.c b/stage0/stdlib/Lean/Compiler/LCNF/Level.c
index 85088a2420..f97fb62cb8 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Level.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Level.c
@@ -2498,35 +2498,37 @@ return x_1;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
 x_13 = lean_ctor_get(x_1, 0);
 x_14 = lean_ctor_get(x_1, 2);
 x_15 = lean_ctor_get(x_1, 3);
 x_16 = lean_ctor_get(x_1, 4);
 x_17 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_18 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_dec(x_1);
-x_18 = l_Lean_Compiler_LCNF_Decl_setLevelParams___closed__2;
+x_19 = l_Lean_Compiler_LCNF_Decl_setLevelParams___closed__2;
 lean_inc(x_14);
-x_19 = l_Lean_CollectLevelParams_visitExpr(x_14, x_18);
-x_20 = l_Lean_Compiler_LCNF_CollectLevelParams_visitParams(x_15, x_19);
+x_20 = l_Lean_CollectLevelParams_visitExpr(x_14, x_19);
+x_21 = l_Lean_Compiler_LCNF_CollectLevelParams_visitParams(x_15, x_20);
 lean_inc(x_16);
-x_21 = l_Lean_Compiler_LCNF_CollectLevelParams_visitCode(x_16, x_20);
-x_22 = lean_ctor_get(x_21, 2);
-lean_inc(x_22);
-lean_dec(x_21);
-x_23 = lean_array_to_list(lean_box(0), x_22);
-x_24 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_24, 0, x_13);
-lean_ctor_set(x_24, 1, x_23);
-lean_ctor_set(x_24, 2, x_14);
-lean_ctor_set(x_24, 3, x_15);
-lean_ctor_set(x_24, 4, x_16);
-lean_ctor_set_uint8(x_24, sizeof(void*)*5, x_17);
-return x_24;
+x_22 = l_Lean_Compiler_LCNF_CollectLevelParams_visitCode(x_16, x_21);
+x_23 = lean_ctor_get(x_22, 2);
+lean_inc(x_23);
+lean_dec(x_22);
+x_24 = lean_array_to_list(lean_box(0), x_23);
+x_25 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_25, 0, x_13);
+lean_ctor_set(x_25, 1, x_24);
+lean_ctor_set(x_25, 2, x_14);
+lean_ctor_set(x_25, 3, x_15);
+lean_ctor_set(x_25, 4, x_16);
+lean_ctor_set_uint8(x_25, sizeof(void*)*5, x_17);
+lean_ctor_set_uint8(x_25, sizeof(void*)*5 + 1, x_18);
+return x_25;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Passes.c b/stage0/stdlib/Lean/Compiler/LCNF/Passes.c
index 4fb914838a..2b214d5cf0 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Passes.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Passes.c
@@ -17,6 +17,7 @@ lean_object* l_List_reverse___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_236____lambda__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_236____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
+lean_object* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_builtinPassManager;
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__19;
 lean_object* l_Lean_stringToMessageData(lean_object*);
@@ -34,6 +35,7 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__7;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_runImportedDecls___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_236____closed__7;
+lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_getConstInfo___at___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isValidMacroInline___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -77,6 +79,7 @@ static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__2;
 static lean_object* l_Lean_Compiler_LCNF_builtinPassManager___closed__16;
 static lean_object* l_Lean_Compiler_LCNF_addPass___closed__9;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_init;
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__1;
 static lean_object* l_Lean_Compiler_LCNF_builtinPassManager___closed__7;
@@ -132,6 +135,7 @@ static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_addPass___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_236_(lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
@@ -148,6 +152,7 @@ lean_object* l_EStateM_pure___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__16;
 static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588____closed__12;
 static lean_object* l_Lean_Compiler_LCNF_init___closed__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2;
 static lean_object* l_Lean_Compiler_LCNF_builtinPassManager___closed__8;
 static lean_object* l_Lean_Compiler_LCNF_init___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_builtinPassManager___closed__4;
@@ -2023,6 +2028,34 @@ lean_dec(x_1);
 return x_5;
 }
 }
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("saveBase", 8);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Compiler_LCNF_addPass___closed__6;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1;
+x_3 = l_Lean_Name_mkStr2(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737_(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; uint8_t x_3; lean_object* x_4; 
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2;
+x_3 = 1;
+x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
+return x_4;
+}
+}
 lean_object* initialize_Init(uint8_t builtin, lean_object*);
 lean_object* initialize_Lean_Compiler_LCNF_PassManager(uint8_t builtin, lean_object*);
 lean_object* initialize_Lean_Compiler_LCNF_PullLetDecls(uint8_t builtin, lean_object*);
@@ -2214,6 +2247,13 @@ lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passe
 res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_588_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737____closed__2);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Passes___hyg_737_(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c b/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
index 84666b6b76..094cf16692 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PhaseExt.c
@@ -13,9 +13,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3___boxed(lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_baseExt;
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
@@ -25,7 +24,7 @@ lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___rarg(lean_object*,
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_forM___at_Lean_Compiler_LCNF_forEachDecl___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5;
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getBaseDeclCore_x3f(lean_object*, lean_object*);
@@ -34,9 +33,8 @@ static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__2;
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at_Lean_Compiler_LCNF_forEachDecl___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_sub(size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_sortDecls___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7;
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_forEachDecl___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlMAux_traverse___at_Lean_Compiler_LCNF_forEachDecl___spec__7___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -45,9 +43,10 @@ extern lean_object* l_Lean_instHashableName;
 uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_forM___at_Lean_Compiler_LCNF_forEachDecl___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7;
 static lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getDeclAt_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3;
 static lean_object* l_Array_qsort_sort___at___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_sortDecls___spec__1___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl___closed__1;
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -55,6 +54,7 @@ lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Array_qpartition_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_shift_right(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachDecl___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static size_t l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_saveBase___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachDecl___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlMAux_traverse___at_Lean_Compiler_LCNF_forEachDecl___spec__7(lean_object*, lean_object*, lean_object*);
@@ -63,43 +63,42 @@ LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_forM___at_Lean_Compiler_LCNF_f
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_sortDecls(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at_Lean_Compiler_LCNF_forEachDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__5(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__5(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_declLt___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8;
 size_t lean_uint64_to_usize(uint64_t);
 static lean_object* l_Lean_Compiler_LCNF_Decl_saveBase___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_forEachDecl___spec__6(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__3;
 lean_object* l_Lean_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 uint64_t l_Lean_Name_hash___override(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_forEachModuleDecl___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_mkHashMapImp___rarg(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__1(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachMainModuleDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_forEachDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_declLt(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_swap(lean_object*, lean_object*, lean_object*);
-static size_t l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50_(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5___boxed(lean_object*);
 lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_getBaseDeclCore_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_getBaseDeclCore_x3f___spec__2(lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_sortDecls___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4;
 static lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl___closed__4;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4;
 size_t lean_usize_shift_left(size_t, size_t);
 lean_object* l_Lean_Compiler_LCNF_Pass_mkPerDeclaration(lean_object*, lean_object*, uint8_t, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getDecl_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_saveBase(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3___rarg(lean_object*, lean_object*, lean_object*);
@@ -108,24 +107,24 @@ LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlMAux___at_Lean_Compiler_L
 size_t lean_usize_mul(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_getBaseDeclCore_x3f___closed__2;
 lean_object* l_Lean_Expr_bvar___override(lean_object*);
-static lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_saveBase___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_addDecl___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
+static lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachDecl(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5___boxed(lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_land(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_forEachDecl___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_forEachDecl___spec__6___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
+static size_t l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_getBaseDeclCore_x3f___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__2(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__2(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__2;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_getBaseDeclCore_x3f___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_forEachModuleDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -133,15 +132,16 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_saveBase___boxed(lean_object*
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_forEachDecl___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t lean_usize_dec_le(size_t, size_t);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9;
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlMAux_traverse___at_Lean_Compiler_LCNF_forEachDecl___spec__7___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9;
 lean_object* l_Lean_Compiler_LCNF_CompilerM_run___rarg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3___boxed(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_saveBase___closed__1;
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4(lean_object*);
 lean_object* l_Lean_Environment_getModuleIdxFor_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_saveBase;
@@ -152,13 +152,14 @@ lean_object* l_Lean_Environment_allImportedModuleNames(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_saveBaseDeclCore(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getDeclAt_x3f(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl___closed__3;
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_getBaseDeclCore_x3f___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__5;
 static lean_object* l_Lean_Compiler_LCNF_normalizeFVarIds___closed__6;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6;
 static lean_object* l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getBaseDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Environment_getModuleIdx_x3f(lean_object*, lean_object*);
@@ -168,11 +169,10 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_forEachModuleDecl(lean_object*, le
 lean_object* l_EStateM_pure___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Decl_internalize___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_saveBase___closed__4;
 lean_object* l_Lean_PersistentHashMap_instInhabitedPersistentHashMap___rarg(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1;
-static size_t l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4(lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 extern lean_object* l_Lean_Name_instBEqName;
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_declLt(lean_object* x_1, lean_object* x_2) {
@@ -524,13 +524,14 @@ x_4 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted
 x_5 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__2;
 x_6 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3;
 x_7 = 0;
-x_8 = lean_alloc_ctor(0, 5, 1);
+x_8 = lean_alloc_ctor(0, 5, 2);
 lean_ctor_set(x_8, 0, x_2);
 lean_ctor_set(x_8, 1, x_3);
 lean_ctor_set(x_8, 2, x_4);
 lean_ctor_set(x_8, 3, x_5);
 lean_ctor_set(x_8, 4, x_6);
 lean_ctor_set_uint8(x_8, sizeof(void*)*5, x_7);
+lean_ctor_set_uint8(x_8, sizeof(void*)*5 + 1, x_7);
 x_9 = lean_array_get_size(x_1);
 x_10 = lean_unsigned_to_nat(1u);
 x_11 = lean_nat_sub(x_9, x_10);
@@ -569,7 +570,7 @@ lean_dec(x_2);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3(size_t 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; uint8_t x_8; 
@@ -596,7 +597,7 @@ x_17 = lean_usize_shift_right(x_12, x_16);
 x_18 = lean_unsigned_to_nat(1u);
 x_19 = lean_nat_add(x_5, x_18);
 lean_dec(x_5);
-x_20 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_6, x_17, x_1, x_9, x_10);
+x_20 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_6, x_17, x_1, x_9, x_10);
 x_4 = lean_box(0);
 x_5 = x_19;
 x_6 = x_20;
@@ -604,7 +605,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
@@ -696,7 +697,7 @@ return x_29;
 }
 }
 }
-static size_t _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__1() {
+static size_t _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__1() {
 _start:
 {
 size_t x_1; size_t x_2; size_t x_3; 
@@ -706,17 +707,17 @@ x_3 = lean_usize_shift_left(x_1, x_2);
 return x_3;
 }
 }
-static size_t _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2() {
+static size_t _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2() {
 _start:
 {
 size_t x_1; size_t x_2; size_t x_3; 
 x_1 = 1;
-x_2 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__1;
+x_2 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__1;
 x_3 = lean_usize_sub(x_2, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3() {
+static lean_object* _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -724,7 +725,7 @@ x_1 = l_Lean_PersistentHashMap_mkEmptyEntries(lean_box(0), lean_box(0));
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -737,7 +738,7 @@ lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object*
 x_7 = lean_ctor_get(x_1, 0);
 x_8 = 1;
 x_9 = 5;
-x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2;
+x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2;
 x_11 = lean_usize_land(x_2, x_10);
 x_12 = lean_usize_to_nat(x_11);
 x_13 = lean_array_get_size(x_7);
@@ -837,7 +838,7 @@ lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_3
 x_35 = lean_ctor_get(x_15, 0);
 x_36 = lean_usize_shift_right(x_2, x_9);
 x_37 = lean_usize_add(x_3, x_8);
-x_38 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_35, x_36, x_37, x_4, x_5);
+x_38 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_35, x_36, x_37, x_4, x_5);
 lean_ctor_set(x_15, 0, x_38);
 x_39 = lean_array_fset(x_17, x_12, x_15);
 lean_dec(x_12);
@@ -852,7 +853,7 @@ lean_inc(x_40);
 lean_dec(x_15);
 x_41 = lean_usize_shift_right(x_2, x_9);
 x_42 = lean_usize_add(x_3, x_8);
-x_43 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_40, x_41, x_42, x_4, x_5);
+x_43 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_40, x_41, x_42, x_4, x_5);
 x_44 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_44, 0, x_43);
 x_45 = lean_array_fset(x_17, x_12, x_44);
@@ -883,7 +884,7 @@ lean_inc(x_48);
 lean_dec(x_1);
 x_49 = 1;
 x_50 = 5;
-x_51 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2;
+x_51 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2;
 x_52 = lean_usize_land(x_2, x_51);
 x_53 = lean_usize_to_nat(x_52);
 x_54 = lean_array_get_size(x_48);
@@ -968,7 +969,7 @@ if (lean_is_exclusive(x_57)) {
 }
 x_73 = lean_usize_shift_right(x_2, x_50);
 x_74 = lean_usize_add(x_3, x_49);
-x_75 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_71, x_73, x_74, x_4, x_5);
+x_75 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_71, x_73, x_74, x_4, x_5);
 if (lean_is_scalar(x_72)) {
  x_76 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -1005,7 +1006,7 @@ if (x_82 == 0)
 {
 lean_object* x_83; lean_object* x_84; size_t x_85; uint8_t x_86; 
 x_83 = lean_unsigned_to_nat(0u);
-x_84 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__4(x_1, x_83, x_4, x_5);
+x_84 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__4(x_1, x_83, x_4, x_5);
 x_85 = 7;
 x_86 = lean_usize_dec_le(x_85, x_3);
 if (x_86 == 0)
@@ -1023,8 +1024,8 @@ lean_inc(x_90);
 x_91 = lean_ctor_get(x_84, 1);
 lean_inc(x_91);
 lean_dec(x_84);
-x_92 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3;
-x_93 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3(x_3, x_90, x_91, lean_box(0), x_83, x_92);
+x_92 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3;
+x_93 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3(x_3, x_90, x_91, lean_box(0), x_83, x_92);
 lean_dec(x_91);
 lean_dec(x_90);
 return x_93;
@@ -1051,7 +1052,7 @@ x_96 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_96, 0, x_94);
 lean_ctor_set(x_96, 1, x_95);
 x_97 = lean_unsigned_to_nat(0u);
-x_98 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__4(x_96, x_97, x_4, x_5);
+x_98 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__4(x_96, x_97, x_4, x_5);
 x_99 = 7;
 x_100 = lean_usize_dec_le(x_99, x_3);
 if (x_100 == 0)
@@ -1069,8 +1070,8 @@ lean_inc(x_104);
 x_105 = lean_ctor_get(x_98, 1);
 lean_inc(x_105);
 lean_dec(x_98);
-x_106 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3;
-x_107 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3(x_3, x_104, x_105, lean_box(0), x_97, x_106);
+x_106 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3;
+x_107 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3(x_3, x_104, x_105, lean_box(0), x_97, x_106);
 lean_dec(x_105);
 lean_dec(x_104);
 return x_107;
@@ -1088,7 +1089,7 @@ return x_98;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; 
@@ -1101,7 +1102,7 @@ x_6 = lean_ctor_get(x_1, 1);
 x_7 = l_Lean_Name_hash___override(x_2);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = 1;
-x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_5, x_8, x_9, x_2, x_3);
+x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_5, x_8, x_9, x_2, x_3);
 x_11 = lean_unsigned_to_nat(1u);
 x_12 = lean_nat_add(x_6, x_11);
 lean_dec(x_6);
@@ -1120,7 +1121,7 @@ lean_dec(x_1);
 x_15 = l_Lean_Name_hash___override(x_2);
 x_16 = lean_uint64_to_usize(x_15);
 x_17 = 1;
-x_18 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_13, x_16, x_17, x_2, x_3);
+x_18 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_13, x_16, x_17, x_2, x_3);
 x_19 = lean_unsigned_to_nat(1u);
 x_20 = lean_nat_add(x_14, x_19);
 lean_dec(x_14);
@@ -1131,7 +1132,7 @@ return x_21;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; 
@@ -1142,7 +1143,7 @@ x_5 = l_Lean_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3___rarg
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
@@ -1152,17 +1153,17 @@ lean_ctor_set(x_5, 1, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__2(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 0);
 lean_inc(x_3);
-x_4 = l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__1(x_1, x_3, x_2);
+x_4 = l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__1(x_1, x_3, x_2);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
@@ -1170,21 +1171,21 @@ x_4 = lean_array_push(x_1, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3___boxed), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3___boxed), 3, 0);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4(lean_object* x_1) {
 _start:
 {
 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; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1;
 x_3 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__2;
-x_4 = l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__5(x_1, x_2, x_3);
+x_4 = l_Lean_PersistentHashMap_foldlM___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__5(x_1, x_2, x_3);
 x_5 = lean_array_get_size(x_4);
 x_6 = lean_unsigned_to_nat(1u);
 x_7 = lean_nat_sub(x_5, x_6);
@@ -1196,7 +1197,7 @@ lean_dec(x_7);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -1204,7 +1205,7 @@ x_2 = lean_box(0);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1212,17 +1213,17 @@ x_1 = lean_mk_string_from_bytes("compBaseDecls", 13);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -1230,21 +1231,21 @@ x_1 = l_Lean_PersistentHashMap_mkEmptyEntriesArray(lean_box(0), lean_box(0));
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4;
 x_2 = lean_unsigned_to_nat(0u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -1252,52 +1253,52 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5;
 x_2 = lean_alloc_closure((void*)(l_EStateM_pure___rarg), 2, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__2), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__2), 2, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5___boxed), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5___boxed), 1, 0);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50_(lean_object* x_1) {
 _start:
 {
 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; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5;
-x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1___boxed), 4, 1);
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5;
+x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1___boxed), 4, 1);
 lean_closure_set(x_3, 0, x_2);
-x_4 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2;
-x_5 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6;
-x_6 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7;
-x_7 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8;
-x_8 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9;
+x_4 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2;
+x_5 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6;
+x_6 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7;
+x_7 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8;
+x_8 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9;
 x_9 = lean_alloc_ctor(0, 6, 0);
 lean_ctor_set(x_9, 0, x_4);
 lean_ctor_set(x_9, 1, x_5);
@@ -1309,19 +1310,19 @@ x_10 = l_Lean_registerPersistentEnvExtensionUnsafe___rarg(x_9, x_1);
 return x_10;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3___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_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3___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:
 {
 size_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_usize(x_1);
 lean_dec(x_1);
-x_8 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__3(x_7, x_2, x_3, x_4, x_5, x_6);
+x_8 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__3(x_7, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 size_t x_6; size_t x_7; lean_object* x_8; 
@@ -1329,34 +1330,34 @@ x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_8 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2(x_1, x_6, x_7, x_4, x_5);
+x_8 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2(x_1, x_6, x_7, x_4, x_5);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__3(x_1, x_2, x_3);
+x_4 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__3(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5___boxed(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__5(x_1);
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__5(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -1413,7 +1414,7 @@ x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
 lean_dec(x_1);
 x_5 = 5;
-x_6 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2;
+x_6 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2;
 x_7 = lean_usize_land(x_2, x_6);
 x_8 = lean_usize_to_nat(x_7);
 x_9 = lean_box(2);
@@ -1546,13 +1547,14 @@ x_13 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorte
 x_14 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__2;
 x_15 = l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3;
 x_16 = 0;
-x_17 = lean_alloc_ctor(0, 5, 1);
+x_17 = lean_alloc_ctor(0, 5, 2);
 lean_ctor_set(x_17, 0, x_2);
 lean_ctor_set(x_17, 1, x_12);
 lean_ctor_set(x_17, 2, x_13);
 lean_ctor_set(x_17, 3, x_14);
 lean_ctor_set(x_17, 4, x_15);
 lean_ctor_set_uint8(x_17, sizeof(void*)*5, x_16);
+lean_ctor_set_uint8(x_17, sizeof(void*)*5 + 1, x_16);
 x_18 = lean_array_get_size(x_11);
 x_19 = lean_unsigned_to_nat(1u);
 x_20 = lean_nat_sub(x_18, x_19);
@@ -1665,7 +1667,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Decl_saveBase___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5;
 x_2 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_2, 0, x_1);
 lean_ctor_set(x_2, 1, x_1);
@@ -3338,31 +3340,31 @@ l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f__
 lean_mark_persistent(l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__2);
 l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3 = _init_l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3();
 lean_mark_persistent(l___private_Lean_Compiler_LCNF_PhaseExt_0__Lean_Compiler_LCNF_findAtSorted_x3f___closed__3);
-l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__1 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__1();
-l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__2();
-l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3();
-lean_mark_persistent(l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____spec__2___closed__3);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____lambda__4___closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__2);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__3);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__4);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__5);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__6);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__7);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__8);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49____closed__9);
-if (builtin) {res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_49_(lean_io_mk_world());
+l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__1 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__1();
+l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__2();
+l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3 = _init_l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3();
+lean_mark_persistent(l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____spec__2___closed__3);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____lambda__4___closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__2);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__3);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__4);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__5);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__6);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__7);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__8);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50____closed__9);
+if (builtin) {res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PhaseExt___hyg_50_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Compiler_LCNF_baseExt = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Compiler_LCNF_baseExt);
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/PullFunDecls.c b/stage0/stdlib/Lean/Compiler/LCNF/PullFunDecls.c
index d37085b7fa..bf46fc32a7 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PullFunDecls.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PullFunDecls.c
@@ -14,6 +14,7 @@
 extern "C" {
 #endif
 lean_object* l_List_reverse___rarg(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2;
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
 lean_object* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
@@ -57,15 +58,15 @@ LEAN_EXPORT lean_object* l_List_foldr___at_Lean_Compiler_LCNF_PullFunDecls_findF
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_findParamsDeps___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_attach_visit(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1;
 LEAN_EXPORT lean_object* l_panic___at_Lean_Compiler_LCNF_PullFunDecls_attach_visited___spec__1(lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_pull(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_FunDeclCore_collectUsed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_PullFunDecls_pull___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743_(lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_addToPull(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1;
 lean_object* l_Lean_Compiler_LCNF_Pass_mkPerDeclaration(lean_object*, lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_pullFunDecls;
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -78,7 +79,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_findFVarDirectDeps___
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_findFVarDepsFixpoint(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_attach_go___boxed(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_attach_visited(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_addToPull___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullFunDecls_pull___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2759,110 +2759,112 @@ return x_41;
 }
 else
 {
-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; lean_object* x_53; lean_object* x_54; 
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; uint8_t 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; 
 x_42 = lean_ctor_get(x_1, 0);
 x_43 = lean_ctor_get(x_1, 1);
 x_44 = lean_ctor_get(x_1, 2);
 x_45 = lean_ctor_get(x_1, 3);
 x_46 = lean_ctor_get(x_1, 4);
 x_47 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_48 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_46);
 lean_inc(x_45);
 lean_inc(x_44);
 lean_inc(x_43);
 lean_inc(x_42);
 lean_dec(x_1);
-x_48 = lean_box(0);
-x_49 = lean_st_ref_get(x_5, x_6);
-x_50 = lean_ctor_get(x_49, 1);
-lean_inc(x_50);
-lean_dec(x_49);
-x_51 = lean_st_mk_ref(x_48, x_50);
-x_52 = lean_ctor_get(x_51, 0);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_51, 1);
+x_49 = lean_box(0);
+x_50 = lean_st_ref_get(x_5, x_6);
+x_51 = lean_ctor_get(x_50, 1);
+lean_inc(x_51);
+lean_dec(x_50);
+x_52 = lean_st_mk_ref(x_49, x_51);
+x_53 = lean_ctor_get(x_52, 0);
 lean_inc(x_53);
-lean_dec(x_51);
-lean_inc(x_5);
-lean_inc(x_52);
-x_54 = l_Lean_Compiler_LCNF_PullFunDecls_pull(x_46, x_52, x_2, x_3, x_4, x_5, x_53);
-if (lean_obj_tag(x_54) == 0)
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_55 = lean_ctor_get(x_54, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_54, 1);
-lean_inc(x_56);
-lean_dec(x_54);
-x_57 = lean_st_ref_get(x_5, x_56);
-lean_dec(x_5);
-x_58 = lean_ctor_get(x_57, 1);
-lean_inc(x_58);
-lean_dec(x_57);
-x_59 = lean_st_ref_get(x_52, x_58);
+x_54 = lean_ctor_get(x_52, 1);
+lean_inc(x_54);
 lean_dec(x_52);
-x_60 = lean_ctor_get(x_59, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_59, 1);
+lean_inc(x_5);
+lean_inc(x_53);
+x_55 = l_Lean_Compiler_LCNF_PullFunDecls_pull(x_46, x_53, x_2, x_3, x_4, x_5, x_54);
+if (lean_obj_tag(x_55) == 0)
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+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_58 = lean_st_ref_get(x_5, x_57);
+lean_dec(x_5);
+x_59 = lean_ctor_get(x_58, 1);
+lean_inc(x_59);
+lean_dec(x_58);
+x_60 = lean_st_ref_get(x_53, x_59);
+lean_dec(x_53);
+x_61 = lean_ctor_get(x_60, 0);
 lean_inc(x_61);
-if (lean_is_exclusive(x_59)) {
- lean_ctor_release(x_59, 0);
- lean_ctor_release(x_59, 1);
- x_62 = x_59;
+x_62 = lean_ctor_get(x_60, 1);
+lean_inc(x_62);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ lean_ctor_release(x_60, 1);
+ x_63 = x_60;
 } else {
- lean_dec_ref(x_59);
- x_62 = lean_box(0);
+ lean_dec_ref(x_60);
+ x_63 = lean_box(0);
 }
-x_63 = l_List_redLength___rarg(x_60);
-x_64 = lean_mk_empty_array_with_capacity(x_63);
-lean_dec(x_63);
-x_65 = l_List_toArrayAux___rarg(x_60, x_64);
-x_66 = l_Lean_Compiler_LCNF_PullFunDecls_attach(x_65, x_55);
-x_67 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_67, 0, x_42);
-lean_ctor_set(x_67, 1, x_43);
-lean_ctor_set(x_67, 2, x_44);
-lean_ctor_set(x_67, 3, x_45);
-lean_ctor_set(x_67, 4, x_66);
-lean_ctor_set_uint8(x_67, sizeof(void*)*5, x_47);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(0, 2, 0);
+x_64 = l_List_redLength___rarg(x_61);
+x_65 = lean_mk_empty_array_with_capacity(x_64);
+lean_dec(x_64);
+x_66 = l_List_toArrayAux___rarg(x_61, x_65);
+x_67 = l_Lean_Compiler_LCNF_PullFunDecls_attach(x_66, x_56);
+x_68 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_68, 0, x_42);
+lean_ctor_set(x_68, 1, x_43);
+lean_ctor_set(x_68, 2, x_44);
+lean_ctor_set(x_68, 3, x_45);
+lean_ctor_set(x_68, 4, x_67);
+lean_ctor_set_uint8(x_68, sizeof(void*)*5, x_47);
+lean_ctor_set_uint8(x_68, sizeof(void*)*5 + 1, x_48);
+if (lean_is_scalar(x_63)) {
+ x_69 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_68 = x_62;
+ x_69 = x_63;
 }
-lean_ctor_set(x_68, 0, x_67);
-lean_ctor_set(x_68, 1, x_61);
-return x_68;
+lean_ctor_set(x_69, 0, x_68);
+lean_ctor_set(x_69, 1, x_62);
+return x_69;
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-lean_dec(x_52);
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+lean_dec(x_53);
 lean_dec(x_45);
 lean_dec(x_44);
 lean_dec(x_43);
 lean_dec(x_42);
 lean_dec(x_5);
-x_69 = lean_ctor_get(x_54, 0);
-lean_inc(x_69);
-x_70 = lean_ctor_get(x_54, 1);
+x_70 = lean_ctor_get(x_55, 0);
 lean_inc(x_70);
-if (lean_is_exclusive(x_54)) {
- lean_ctor_release(x_54, 0);
- lean_ctor_release(x_54, 1);
- x_71 = x_54;
+x_71 = lean_ctor_get(x_55, 1);
+lean_inc(x_71);
+if (lean_is_exclusive(x_55)) {
+ lean_ctor_release(x_55, 0);
+ lean_ctor_release(x_55, 1);
+ x_72 = x_55;
 } else {
- lean_dec_ref(x_54);
- x_71 = lean_box(0);
+ lean_dec_ref(x_55);
+ x_72 = lean_box(0);
 }
-if (lean_is_scalar(x_71)) {
- x_72 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_72)) {
+ x_73 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_72 = x_71;
+ x_73 = x_72;
 }
-lean_ctor_set(x_72, 0, x_69);
-lean_ctor_set(x_72, 1, x_70);
-return x_72;
+lean_ctor_set(x_73, 0, x_70);
+lean_ctor_set(x_73, 1, x_71);
+return x_73;
 }
 }
 }
@@ -2913,7 +2915,7 @@ x_1 = l_Lean_Compiler_LCNF_pullFunDecls___closed__4;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2921,21 +2923,21 @@ x_1 = lean_mk_string_from_bytes("Compiler", 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1;
 x_2 = l_Lean_Compiler_LCNF_pullFunDecls___closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -2994,11 +2996,11 @@ l_Lean_Compiler_LCNF_pullFunDecls___closed__4 = _init_l_Lean_Compiler_LCNF_pullF
 lean_mark_persistent(l_Lean_Compiler_LCNF_pullFunDecls___closed__4);
 l_Lean_Compiler_LCNF_pullFunDecls = _init_l_Lean_Compiler_LCNF_pullFunDecls();
 lean_mark_persistent(l_Lean_Compiler_LCNF_pullFunDecls);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742____closed__2);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1742_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743____closed__2);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullFunDecls___hyg_1743_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/PullLetDecls.c b/stage0/stdlib/Lean/Compiler/LCNF/PullLetDecls.c
index de64995609..cfc615f25f 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PullLetDecls.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PullLetDecls.c
@@ -29,16 +29,16 @@ static lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullDecls___lambda__1___cl
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_pullLetDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PullLetDecls_State_toPull___default___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullDecls___lambda__1___closed__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullAlt(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2;
 size_t lean_usize_sub(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullDecls___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullDecls___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_pullLetDecls___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_st_ref_get(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1;
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_PullLetDecls_pullDecls___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PullLetDecls_pullDecls___lambda__2___closed__2;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1;
 lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullLetDecls_shouldPull(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -74,7 +74,7 @@ size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullLetDecls_withCheckpoint_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PullLetDecls_pullAlt___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltsImp___spec__1(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358_(lean_object*);
 size_t lean_ptr_addr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_pullInstances___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PullLetDecls_withNewScope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3162,51 +3162,55 @@ x_11 = l_Lean_Compiler_LCNF_PullLetDecls_attachToPull(x_3, x_4, x_5, x_6, x_7, x
 x_12 = !lean_is_exclusive(x_11);
 if (x_12 == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; uint8_t x_18; lean_object* x_19; 
 x_13 = lean_ctor_get(x_11, 0);
 x_14 = lean_ctor_get(x_1, 0);
 x_15 = lean_ctor_get(x_1, 1);
 x_16 = lean_ctor_get(x_1, 2);
 x_17 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_18 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
-x_18 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_18, 0, x_14);
-lean_ctor_set(x_18, 1, x_15);
-lean_ctor_set(x_18, 2, x_16);
-lean_ctor_set(x_18, 3, x_2);
-lean_ctor_set(x_18, 4, x_13);
-lean_ctor_set_uint8(x_18, sizeof(void*)*5, x_17);
-lean_ctor_set(x_11, 0, x_18);
+x_19 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_19, 0, x_14);
+lean_ctor_set(x_19, 1, x_15);
+lean_ctor_set(x_19, 2, x_16);
+lean_ctor_set(x_19, 3, x_2);
+lean_ctor_set(x_19, 4, x_13);
+lean_ctor_set_uint8(x_19, sizeof(void*)*5, x_17);
+lean_ctor_set_uint8(x_19, sizeof(void*)*5 + 1, x_18);
+lean_ctor_set(x_11, 0, x_19);
 return x_11;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; 
-x_19 = lean_ctor_get(x_11, 0);
-x_20 = lean_ctor_get(x_11, 1);
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; 
+x_20 = lean_ctor_get(x_11, 0);
+x_21 = lean_ctor_get(x_11, 1);
+lean_inc(x_21);
 lean_inc(x_20);
-lean_inc(x_19);
 lean_dec(x_11);
-x_21 = lean_ctor_get(x_1, 0);
-x_22 = lean_ctor_get(x_1, 1);
-x_23 = lean_ctor_get(x_1, 2);
-x_24 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_22 = lean_ctor_get(x_1, 0);
+x_23 = lean_ctor_get(x_1, 1);
+x_24 = lean_ctor_get(x_1, 2);
+x_25 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_26 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
+lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
-lean_inc(x_21);
-x_25 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_25, 0, x_21);
-lean_ctor_set(x_25, 1, x_22);
-lean_ctor_set(x_25, 2, x_23);
-lean_ctor_set(x_25, 3, x_2);
-lean_ctor_set(x_25, 4, x_19);
-lean_ctor_set_uint8(x_25, sizeof(void*)*5, x_24);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_25);
-lean_ctor_set(x_26, 1, x_20);
-return x_26;
+x_27 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_27, 0, x_22);
+lean_ctor_set(x_27, 1, x_23);
+lean_ctor_set(x_27, 2, x_24);
+lean_ctor_set(x_27, 3, x_2);
+lean_ctor_set(x_27, 4, x_20);
+lean_ctor_set_uint8(x_27, sizeof(void*)*5, x_25);
+lean_ctor_set_uint8(x_27, sizeof(void*)*5 + 1, x_26);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_21);
+return x_28;
 }
 }
 }
@@ -3491,7 +3495,7 @@ x_1 = l_Lean_Compiler_LCNF_pullInstances___closed__4;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -3499,21 +3503,21 @@ x_1 = lean_mk_string_from_bytes("Compiler", 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1;
 x_2 = l_Lean_Compiler_LCNF_pullInstances___closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -3578,11 +3582,11 @@ l_Lean_Compiler_LCNF_pullInstances___closed__4 = _init_l_Lean_Compiler_LCNF_pull
 lean_mark_persistent(l_Lean_Compiler_LCNF_pullInstances___closed__4);
 l_Lean_Compiler_LCNF_pullInstances = _init_l_Lean_Compiler_LCNF_pullInstances();
 lean_mark_persistent(l_Lean_Compiler_LCNF_pullInstances);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357____closed__2);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1357_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358____closed__2);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_PullLetDecls___hyg_1358_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/ReduceJpArity.c b/stage0/stdlib/Lean/Compiler/LCNF/ReduceJpArity.c
index cb3e333947..23b1e8e782 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/ReduceJpArity.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/ReduceJpArity.c
@@ -23,14 +23,16 @@ lean_object* lean_array_uget(lean_object*, size_t);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_eraseParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ReduceJpArity_reduce___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__7___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_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883_(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_ReduceJpArity_reduce___closed__1;
 uint8_t lean_usize_dec_lt(size_t, size_t);
 lean_object* l_Lean_Compiler_LCNF_Code_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -42,7 +44,6 @@ lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_RBNode_setBlack___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_RBNode_find___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__6___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_reduceJpArity;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_reduceJpArity___closed__4;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -56,7 +57,6 @@ size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_RBNode_insert___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_mkForallParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_ptr_addr(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__2___at_Lean_Compiler_LCNF_ReduceJpArity_reduce___spec__3___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_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_collectExpr(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_AltCore_getCode(lean_object*);
@@ -4862,79 +4862,81 @@ return x_23;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; 
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; 
 x_24 = lean_ctor_get(x_1, 0);
 x_25 = lean_ctor_get(x_1, 1);
 x_26 = lean_ctor_get(x_1, 2);
 x_27 = lean_ctor_get(x_1, 3);
 x_28 = lean_ctor_get(x_1, 4);
 x_29 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_30 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_dec(x_1);
-x_30 = lean_box(0);
-x_31 = l_Lean_Compiler_LCNF_ReduceJpArity_reduce(x_28, x_30, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_31) == 0)
+x_31 = lean_box(0);
+x_32 = l_Lean_Compiler_LCNF_ReduceJpArity_reduce(x_28, x_31, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_32) == 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_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
-if (lean_is_exclusive(x_31)) {
- lean_ctor_release(x_31, 0);
- lean_ctor_release(x_31, 1);
- x_34 = x_31;
+x_34 = lean_ctor_get(x_32, 1);
+lean_inc(x_34);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ lean_ctor_release(x_32, 1);
+ x_35 = x_32;
 } else {
- lean_dec_ref(x_31);
- x_34 = lean_box(0);
+ lean_dec_ref(x_32);
+ x_35 = lean_box(0);
 }
-x_35 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_35, 0, x_24);
-lean_ctor_set(x_35, 1, x_25);
-lean_ctor_set(x_35, 2, x_26);
-lean_ctor_set(x_35, 3, x_27);
-lean_ctor_set(x_35, 4, x_32);
-lean_ctor_set_uint8(x_35, sizeof(void*)*5, x_29);
-if (lean_is_scalar(x_34)) {
- x_36 = lean_alloc_ctor(0, 2, 0);
+x_36 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_36, 0, x_24);
+lean_ctor_set(x_36, 1, x_25);
+lean_ctor_set(x_36, 2, x_26);
+lean_ctor_set(x_36, 3, x_27);
+lean_ctor_set(x_36, 4, x_33);
+lean_ctor_set_uint8(x_36, sizeof(void*)*5, x_29);
+lean_ctor_set_uint8(x_36, sizeof(void*)*5 + 1, x_30);
+if (lean_is_scalar(x_35)) {
+ x_37 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_36 = x_34;
+ x_37 = x_35;
 }
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_33);
-return x_36;
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_34);
+return x_37;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_27);
 lean_dec(x_26);
 lean_dec(x_25);
 lean_dec(x_24);
-x_37 = lean_ctor_get(x_31, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_31, 1);
+x_38 = lean_ctor_get(x_32, 0);
 lean_inc(x_38);
-if (lean_is_exclusive(x_31)) {
- lean_ctor_release(x_31, 0);
- lean_ctor_release(x_31, 1);
- x_39 = x_31;
+x_39 = lean_ctor_get(x_32, 1);
+lean_inc(x_39);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ lean_ctor_release(x_32, 1);
+ x_40 = x_32;
 } else {
- lean_dec_ref(x_31);
- x_39 = lean_box(0);
+ lean_dec_ref(x_32);
+ x_40 = lean_box(0);
 }
-if (lean_is_scalar(x_39)) {
- x_40 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_40)) {
+ x_41 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_40 = x_39;
+ x_41 = x_40;
 }
-lean_ctor_set(x_40, 0, x_37);
-lean_ctor_set(x_40, 1, x_38);
-return x_40;
+lean_ctor_set(x_41, 0, x_38);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
 }
 }
 }
@@ -4985,7 +4987,7 @@ x_1 = l_Lean_Compiler_LCNF_reduceJpArity___closed__4;
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4993,21 +4995,21 @@ x_1 = lean_mk_string_from_bytes("Compiler", 8);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1;
 x_2 = l_Lean_Compiler_LCNF_reduceJpArity___closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -5048,11 +5050,11 @@ l_Lean_Compiler_LCNF_reduceJpArity___closed__4 = _init_l_Lean_Compiler_LCNF_redu
 lean_mark_persistent(l_Lean_Compiler_LCNF_reduceJpArity___closed__4);
 l_Lean_Compiler_LCNF_reduceJpArity = _init_l_Lean_Compiler_LCNF_reduceJpArity();
 lean_mark_persistent(l_Lean_Compiler_LCNF_reduceJpArity);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882____closed__2);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_882_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883____closed__2);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_ReduceJpArity___hyg_883_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Renaming.c b/stage0/stdlib/Lean/Compiler/LCNF/Renaming.c
index c043dbfa77..34d654cf3a 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Renaming.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Renaming.c
@@ -2269,13 +2269,14 @@ return x_32;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; 
 x_33 = lean_ctor_get(x_1, 0);
 x_34 = lean_ctor_get(x_1, 1);
 x_35 = lean_ctor_get(x_1, 2);
 x_36 = lean_ctor_get(x_1, 3);
 x_37 = lean_ctor_get(x_1, 4);
 x_38 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_39 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
@@ -2283,85 +2284,86 @@ lean_inc(x_34);
 lean_inc(x_33);
 lean_dec(x_1);
 lean_inc(x_2);
-x_39 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Code_applyRenaming___lambda__1___boxed), 7, 1);
-lean_closure_set(x_39, 0, x_2);
+x_40 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Code_applyRenaming___lambda__1___boxed), 7, 1);
+lean_closure_set(x_40, 0, x_2);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_40 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_applyRenaming___spec__1(x_36, x_39, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_40) == 0)
+x_41 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_applyRenaming___spec__1(x_36, x_40, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_41) == 0)
 {
-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_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l_Lean_Compiler_LCNF_Code_applyRenaming(x_37, x_2, x_3, x_4, x_5, x_6, x_42);
-if (lean_obj_tag(x_43) == 0)
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = l_Lean_Compiler_LCNF_Code_applyRenaming(x_37, x_2, x_3, x_4, x_5, x_6, x_43);
+if (lean_obj_tag(x_44) == 0)
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_43, 1);
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_45 = lean_ctor_get(x_44, 0);
 lean_inc(x_45);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_46 = x_43;
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ lean_ctor_release(x_44, 1);
+ x_47 = x_44;
 } else {
- lean_dec_ref(x_43);
- x_46 = lean_box(0);
+ lean_dec_ref(x_44);
+ x_47 = lean_box(0);
 }
-x_47 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_47, 0, x_33);
-lean_ctor_set(x_47, 1, x_34);
-lean_ctor_set(x_47, 2, x_35);
-lean_ctor_set(x_47, 3, x_41);
-lean_ctor_set(x_47, 4, x_44);
-lean_ctor_set_uint8(x_47, sizeof(void*)*5, x_38);
-if (lean_is_scalar(x_46)) {
- x_48 = lean_alloc_ctor(0, 2, 0);
+x_48 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_48, 0, x_33);
+lean_ctor_set(x_48, 1, x_34);
+lean_ctor_set(x_48, 2, x_35);
+lean_ctor_set(x_48, 3, x_42);
+lean_ctor_set(x_48, 4, x_45);
+lean_ctor_set_uint8(x_48, sizeof(void*)*5, x_38);
+lean_ctor_set_uint8(x_48, sizeof(void*)*5 + 1, x_39);
+if (lean_is_scalar(x_47)) {
+ x_49 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_48 = x_46;
+ x_49 = x_47;
 }
-lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_45);
-return x_48;
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_46);
+return x_49;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-lean_dec(x_41);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+lean_dec(x_42);
 lean_dec(x_35);
 lean_dec(x_34);
 lean_dec(x_33);
-x_49 = lean_ctor_get(x_43, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_43, 1);
+x_50 = lean_ctor_get(x_44, 0);
 lean_inc(x_50);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_51 = x_43;
+x_51 = lean_ctor_get(x_44, 1);
+lean_inc(x_51);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ lean_ctor_release(x_44, 1);
+ x_52 = x_44;
 } else {
- lean_dec_ref(x_43);
- x_51 = lean_box(0);
+ lean_dec_ref(x_44);
+ x_52 = lean_box(0);
 }
-if (lean_is_scalar(x_51)) {
- x_52 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_52)) {
+ x_53 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_52 = x_51;
+ x_53 = x_52;
 }
-lean_ctor_set(x_52, 0, x_49);
-lean_ctor_set(x_52, 1, x_50);
-return x_52;
+lean_ctor_set(x_53, 0, x_50);
+lean_ctor_set(x_53, 1, x_51);
+return x_53;
 }
 }
 else
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
 lean_dec(x_37);
 lean_dec(x_35);
 lean_dec(x_34);
@@ -2371,26 +2373,26 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_53 = lean_ctor_get(x_40, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_40, 1);
+x_54 = lean_ctor_get(x_41, 0);
 lean_inc(x_54);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- lean_ctor_release(x_40, 1);
- x_55 = x_40;
+x_55 = lean_ctor_get(x_41, 1);
+lean_inc(x_55);
+if (lean_is_exclusive(x_41)) {
+ lean_ctor_release(x_41, 0);
+ lean_ctor_release(x_41, 1);
+ x_56 = x_41;
 } else {
- lean_dec_ref(x_40);
- x_55 = lean_box(0);
+ lean_dec_ref(x_41);
+ x_56 = lean_box(0);
 }
-if (lean_is_scalar(x_55)) {
- x_56 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_56)) {
+ x_57 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_56 = x_55;
+ x_57 = x_56;
 }
-lean_ctor_set(x_56, 0, x_53);
-lean_ctor_set(x_56, 1, x_54);
-return x_56;
+lean_ctor_set(x_57, 0, x_54);
+lean_ctor_set(x_57, 1, x_55);
+return x_57;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Simp.c b/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
index 6d4c7d02c8..b5433a59ea 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
@@ -15,6 +15,7 @@ extern "C" {
 #endif
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__11;
 lean_object* l_Lean_Compiler_LCNF_ppDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1;
 lean_object* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
@@ -26,9 +27,9 @@ static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__6;
 lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_go___closed__5;
 lean_object* l_Lean_Name_mkStr3(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(lean_object*, 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkHashSetImp___rarg(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___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*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__2;
 lean_object* l_Lean_mkHashMapImp___rarg(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_go___closed__6;
@@ -38,7 +39,6 @@ static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__7;
 lean_object* l_Lean_Compiler_LCNF_Simp_simp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1;
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__5;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__16;
@@ -64,16 +64,16 @@ static lean_object* l_Lean_Compiler_LCNF_Decl_simp_go___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_go___closed__4;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__17;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__4;
 lean_object* l_Lean_Compiler_LCNF_Code_size_go(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(lean_object*, 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
 lean_object* l_Lean_Compiler_LCNF_Decl_reduceJpArity(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Code_applyRenaming(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__20;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_simp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__13;
@@ -86,281 +86,285 @@ static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__1;
 lean_object* lean_nat_to_int(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-lean_object* x_15; 
+lean_object* x_16; 
+lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
-lean_inc(x_10);
 lean_inc(x_1);
-x_15 = l_Lean_Compiler_LCNF_Simp_simpJpCases_x3f(x_1, x_10, x_11, x_12, x_13, x_14);
-if (lean_obj_tag(x_15) == 0)
-{
-lean_object* x_16; 
-x_16 = lean_ctor_get(x_15, 0);
-lean_inc(x_16);
+x_16 = l_Lean_Compiler_LCNF_Simp_simpJpCases_x3f(x_1, x_11, x_12, x_13, x_14, x_15);
 if (lean_obj_tag(x_16) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+lean_object* x_17; 
+x_17 = lean_ctor_get(x_16, 0);
+lean_inc(x_17);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_10);
-x_17 = lean_ctor_get(x_15, 1);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = lean_st_ref_get(x_13, x_17);
-lean_dec(x_13);
-x_19 = lean_ctor_get(x_18, 1);
-lean_inc(x_19);
-lean_dec(x_18);
-x_20 = lean_st_ref_get(x_9, x_19);
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get_uint8(x_21, sizeof(void*)*7);
-lean_dec(x_21);
-if (x_22 == 0)
-{
-uint8_t x_23; 
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_23 = !lean_is_exclusive(x_20);
+x_18 = lean_ctor_get(x_16, 1);
+lean_inc(x_18);
+lean_dec(x_16);
+x_19 = lean_st_ref_get(x_14, x_18);
+lean_dec(x_14);
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = lean_st_ref_get(x_10, x_20);
+x_22 = lean_ctor_get(x_21, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get_uint8(x_22, sizeof(void*)*7);
+lean_dec(x_22);
 if (x_23 == 0)
 {
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_20, 0);
-lean_dec(x_24);
-x_25 = lean_box(0);
-lean_ctor_set(x_20, 0, x_25);
-return x_20;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_20, 1);
-lean_inc(x_26);
-lean_dec(x_20);
-x_27 = lean_box(0);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_26);
-return x_28;
-}
-}
-else
-{
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_20);
-if (x_29 == 0)
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_30 = lean_ctor_get(x_20, 0);
-lean_dec(x_30);
-x_31 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_31, 0, x_2);
-lean_ctor_set(x_31, 1, x_3);
-lean_ctor_set(x_31, 2, x_4);
-lean_ctor_set(x_31, 3, x_5);
-lean_ctor_set(x_31, 4, x_1);
-lean_ctor_set_uint8(x_31, sizeof(void*)*5, x_6);
-x_32 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_20, 0, x_32);
-return x_20;
-}
-else
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_33 = lean_ctor_get(x_20, 1);
-lean_inc(x_33);
-lean_dec(x_20);
-x_34 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_34, 0, x_2);
-lean_ctor_set(x_34, 1, x_3);
-lean_ctor_set(x_34, 2, x_4);
-lean_ctor_set(x_34, 3, x_5);
-lean_ctor_set(x_34, 4, x_1);
-lean_ctor_set_uint8(x_34, sizeof(void*)*5, x_6);
-x_35 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_35, 0, x_34);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_33);
-return x_36;
-}
-}
-}
-else
-{
-lean_object* x_37; uint8_t x_38; 
-lean_dec(x_1);
-x_37 = lean_ctor_get(x_15, 1);
-lean_inc(x_37);
-lean_dec(x_15);
-x_38 = !lean_is_exclusive(x_16);
-if (x_38 == 0)
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_39 = lean_ctor_get(x_16, 0);
-x_40 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_40, 0, x_2);
-lean_ctor_set(x_40, 1, x_3);
-lean_ctor_set(x_40, 2, x_4);
-lean_ctor_set(x_40, 3, x_5);
-lean_ctor_set(x_40, 4, x_39);
-lean_ctor_set_uint8(x_40, sizeof(void*)*5, x_6);
-x_41 = l_Lean_Compiler_LCNF_Decl_reduceJpArity(x_40, x_10, x_11, x_12, x_13, x_37);
-if (lean_obj_tag(x_41) == 0)
-{
-uint8_t x_42; 
-x_42 = !lean_is_exclusive(x_41);
-if (x_42 == 0)
-{
-lean_object* x_43; 
-x_43 = lean_ctor_get(x_41, 0);
-lean_ctor_set(x_16, 0, x_43);
-lean_ctor_set(x_41, 0, x_16);
-return x_41;
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_41, 0);
-x_45 = lean_ctor_get(x_41, 1);
-lean_inc(x_45);
-lean_inc(x_44);
-lean_dec(x_41);
-lean_ctor_set(x_16, 0, x_44);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_16);
-lean_ctor_set(x_46, 1, x_45);
-return x_46;
-}
-}
-else
-{
-uint8_t x_47; 
-lean_free_object(x_16);
-x_47 = !lean_is_exclusive(x_41);
-if (x_47 == 0)
-{
-return x_41;
-}
-else
-{
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_41, 0);
-x_49 = lean_ctor_get(x_41, 1);
-lean_inc(x_49);
-lean_inc(x_48);
-lean_dec(x_41);
-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_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_16, 0);
-lean_inc(x_51);
-lean_dec(x_16);
-x_52 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_52, 0, x_2);
-lean_ctor_set(x_52, 1, x_3);
-lean_ctor_set(x_52, 2, x_4);
-lean_ctor_set(x_52, 3, x_5);
-lean_ctor_set(x_52, 4, x_51);
-lean_ctor_set_uint8(x_52, sizeof(void*)*5, x_6);
-x_53 = l_Lean_Compiler_LCNF_Decl_reduceJpArity(x_52, x_10, x_11, x_12, x_13, x_37);
-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);
-if (lean_is_exclusive(x_53)) {
- lean_ctor_release(x_53, 0);
- lean_ctor_release(x_53, 1);
- x_56 = x_53;
-} else {
- lean_dec_ref(x_53);
- x_56 = lean_box(0);
-}
-x_57 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_57, 0, x_54);
-if (lean_is_scalar(x_56)) {
- x_58 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_58 = x_56;
-}
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_55);
-return x_58;
-}
-else
-{
-lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_59 = lean_ctor_get(x_53, 0);
-lean_inc(x_59);
-x_60 = lean_ctor_get(x_53, 1);
-lean_inc(x_60);
-if (lean_is_exclusive(x_53)) {
- lean_ctor_release(x_53, 0);
- lean_ctor_release(x_53, 1);
- x_61 = x_53;
-} else {
- lean_dec_ref(x_53);
- x_61 = lean_box(0);
-}
-if (lean_is_scalar(x_61)) {
- x_62 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_62 = x_61;
-}
-lean_ctor_set(x_62, 0, x_59);
-lean_ctor_set(x_62, 1, x_60);
-return x_62;
-}
-}
-}
-}
-else
-{
-uint8_t x_63; 
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
+uint8_t x_24; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_63 = !lean_is_exclusive(x_15);
-if (x_63 == 0)
+x_24 = !lean_is_exclusive(x_21);
+if (x_24 == 0)
 {
-return x_15;
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_ctor_get(x_21, 0);
+lean_dec(x_25);
+x_26 = lean_box(0);
+lean_ctor_set(x_21, 0, x_26);
+return x_21;
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_15, 0);
-x_65 = lean_ctor_get(x_15, 1);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_21, 1);
+lean_inc(x_27);
+lean_dec(x_21);
+x_28 = lean_box(0);
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_27);
+return x_29;
+}
+}
+else
+{
+uint8_t x_30; 
+x_30 = !lean_is_exclusive(x_21);
+if (x_30 == 0)
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_21, 0);
+lean_dec(x_31);
+x_32 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_32, 0, x_2);
+lean_ctor_set(x_32, 1, x_3);
+lean_ctor_set(x_32, 2, x_4);
+lean_ctor_set(x_32, 3, x_5);
+lean_ctor_set(x_32, 4, x_1);
+lean_ctor_set_uint8(x_32, sizeof(void*)*5, x_6);
+lean_ctor_set_uint8(x_32, sizeof(void*)*5 + 1, x_7);
+x_33 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_21, 0, x_33);
+return x_21;
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_34 = lean_ctor_get(x_21, 1);
+lean_inc(x_34);
+lean_dec(x_21);
+x_35 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_35, 0, x_2);
+lean_ctor_set(x_35, 1, x_3);
+lean_ctor_set(x_35, 2, x_4);
+lean_ctor_set(x_35, 3, x_5);
+lean_ctor_set(x_35, 4, x_1);
+lean_ctor_set_uint8(x_35, sizeof(void*)*5, x_6);
+lean_ctor_set_uint8(x_35, sizeof(void*)*5 + 1, x_7);
+x_36 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_36, 0, x_35);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_34);
+return x_37;
+}
+}
+}
+else
+{
+lean_object* x_38; uint8_t x_39; 
+lean_dec(x_1);
+x_38 = lean_ctor_get(x_16, 1);
+lean_inc(x_38);
+lean_dec(x_16);
+x_39 = !lean_is_exclusive(x_17);
+if (x_39 == 0)
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_17, 0);
+x_41 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_41, 0, x_2);
+lean_ctor_set(x_41, 1, x_3);
+lean_ctor_set(x_41, 2, x_4);
+lean_ctor_set(x_41, 3, x_5);
+lean_ctor_set(x_41, 4, x_40);
+lean_ctor_set_uint8(x_41, sizeof(void*)*5, x_6);
+lean_ctor_set_uint8(x_41, sizeof(void*)*5 + 1, x_7);
+x_42 = l_Lean_Compiler_LCNF_Decl_reduceJpArity(x_41, x_11, x_12, x_13, x_14, x_38);
+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; 
+x_44 = lean_ctor_get(x_42, 0);
+lean_ctor_set(x_17, 0, x_44);
+lean_ctor_set(x_42, 0, x_17);
+return x_42;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_45 = lean_ctor_get(x_42, 0);
+x_46 = lean_ctor_get(x_42, 1);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_dec(x_42);
+lean_ctor_set(x_17, 0, x_45);
+x_47 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_47, 0, x_17);
+lean_ctor_set(x_47, 1, x_46);
+return x_47;
+}
+}
+else
+{
+uint8_t x_48; 
+lean_free_object(x_17);
+x_48 = !lean_is_exclusive(x_42);
+if (x_48 == 0)
+{
+return x_42;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_42, 0);
+x_50 = lean_ctor_get(x_42, 1);
+lean_inc(x_50);
+lean_inc(x_49);
+lean_dec(x_42);
+x_51 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+return x_51;
+}
+}
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_17, 0);
+lean_inc(x_52);
+lean_dec(x_17);
+x_53 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_53, 0, x_2);
+lean_ctor_set(x_53, 1, x_3);
+lean_ctor_set(x_53, 2, x_4);
+lean_ctor_set(x_53, 3, x_5);
+lean_ctor_set(x_53, 4, x_52);
+lean_ctor_set_uint8(x_53, sizeof(void*)*5, x_6);
+lean_ctor_set_uint8(x_53, sizeof(void*)*5 + 1, x_7);
+x_54 = l_Lean_Compiler_LCNF_Decl_reduceJpArity(x_53, x_11, x_12, x_13, x_14, x_38);
+if (lean_obj_tag(x_54) == 0)
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_55 = lean_ctor_get(x_54, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_54, 1);
+lean_inc(x_56);
+if (lean_is_exclusive(x_54)) {
+ lean_ctor_release(x_54, 0);
+ lean_ctor_release(x_54, 1);
+ x_57 = x_54;
+} else {
+ lean_dec_ref(x_54);
+ x_57 = lean_box(0);
+}
+x_58 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_58, 0, x_55);
+if (lean_is_scalar(x_57)) {
+ x_59 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_59 = x_57;
+}
+lean_ctor_set(x_59, 0, x_58);
+lean_ctor_set(x_59, 1, x_56);
+return x_59;
+}
+else
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_60 = lean_ctor_get(x_54, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_54, 1);
+lean_inc(x_61);
+if (lean_is_exclusive(x_54)) {
+ lean_ctor_release(x_54, 0);
+ lean_ctor_release(x_54, 1);
+ x_62 = x_54;
+} else {
+ lean_dec_ref(x_54);
+ x_62 = lean_box(0);
+}
+if (lean_is_scalar(x_62)) {
+ x_63 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_63 = x_62;
+}
+lean_ctor_set(x_63, 0, x_60);
+lean_ctor_set(x_63, 1, x_61);
+return x_63;
+}
+}
+}
+}
+else
+{
+uint8_t x_64; 
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_64 = !lean_is_exclusive(x_16);
+if (x_64 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_16, 0);
+x_66 = lean_ctor_get(x_16, 1);
+lean_inc(x_66);
 lean_inc(x_65);
-lean_inc(x_64);
-lean_dec(x_15);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
-return x_66;
+lean_dec(x_16);
+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;
 }
 }
 }
@@ -541,402 +545,402 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-lean_object* x_16; lean_object* x_108; lean_object* x_109; lean_object* x_110; uint8_t x_111; 
-lean_dec(x_8);
-x_108 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__4;
-x_109 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_108, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
-x_110 = lean_ctor_get(x_109, 0);
-lean_inc(x_110);
-x_111 = lean_unbox(x_110);
-lean_dec(x_110);
-if (x_111 == 0)
+lean_object* x_17; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_112; 
+lean_dec(x_9);
+x_109 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__4;
+x_110 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_109, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_unbox(x_111);
+lean_dec(x_111);
+if (x_112 == 0)
 {
-lean_object* x_112; 
-lean_dec(x_7);
-x_112 = lean_ctor_get(x_109, 1);
-lean_inc(x_112);
-lean_dec(x_109);
-x_16 = x_112;
-goto block_107;
+lean_object* x_113; 
+lean_dec(x_8);
+x_113 = lean_ctor_get(x_110, 1);
+lean_inc(x_113);
+lean_dec(x_110);
+x_17 = x_113;
+goto block_108;
 }
 else
 {
-lean_object* x_113; lean_object* x_114; 
-x_113 = lean_ctor_get(x_109, 1);
-lean_inc(x_113);
-lean_dec(x_109);
+lean_object* x_114; lean_object* x_115; 
+x_114 = lean_ctor_get(x_110, 1);
+lean_inc(x_114);
+lean_dec(x_110);
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_11);
-x_114 = l_Lean_Compiler_LCNF_ppDecl(x_7, x_11, x_12, x_13, x_14, x_113);
-if (lean_obj_tag(x_114) == 0)
+x_115 = l_Lean_Compiler_LCNF_ppDecl(x_8, x_12, x_13, x_14, x_15, x_114);
+if (lean_obj_tag(x_115) == 0)
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-x_115 = lean_ctor_get(x_114, 0);
-lean_inc(x_115);
-x_116 = lean_ctor_get(x_114, 1);
+lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_116 = lean_ctor_get(x_115, 0);
 lean_inc(x_116);
-lean_dec(x_114);
-x_117 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_117, 0, x_115);
-x_118 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_108, x_117, x_9, x_10, x_11, x_12, x_13, x_14, x_116);
-x_119 = lean_ctor_get(x_118, 1);
-lean_inc(x_119);
-lean_dec(x_118);
-x_16 = x_119;
-goto block_107;
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+lean_dec(x_115);
+x_118 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_118, 0, x_116);
+x_119 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_109, x_118, x_10, x_11, x_12, x_13, x_14, x_15, x_117);
+x_120 = lean_ctor_get(x_119, 1);
+lean_inc(x_120);
+lean_dec(x_119);
+x_17 = x_120;
+goto block_108;
 }
 else
 {
-uint8_t x_120; 
+uint8_t x_121; 
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_120 = !lean_is_exclusive(x_114);
-if (x_120 == 0)
+x_121 = !lean_is_exclusive(x_115);
+if (x_121 == 0)
 {
-return x_114;
+return x_115;
 }
 else
 {
-lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_121 = lean_ctor_get(x_114, 0);
-x_122 = lean_ctor_get(x_114, 1);
+lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_122 = lean_ctor_get(x_115, 0);
+x_123 = lean_ctor_get(x_115, 1);
+lean_inc(x_123);
 lean_inc(x_122);
-lean_inc(x_121);
-lean_dec(x_114);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_121);
-lean_ctor_set(x_123, 1, x_122);
-return x_123;
+lean_dec(x_115);
+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;
 }
 }
 }
-block_107:
+block_108:
 {
-lean_object* x_17; 
+lean_object* x_18; 
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-lean_inc(x_9);
-x_17 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_9, x_10, x_11, x_12, x_13, x_14, x_16);
-if (lean_obj_tag(x_17) == 0)
+x_18 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_10, x_11, x_12, x_13, x_14, x_15, x_17);
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = lean_st_ref_get(x_14, x_19);
-x_21 = lean_ctor_get(x_20, 1);
-lean_inc(x_21);
-lean_dec(x_20);
-x_22 = lean_st_ref_get(x_10, x_21);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_22, 1);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = lean_st_ref_get(x_15, x_20);
+x_22 = lean_ctor_get(x_21, 1);
+lean_inc(x_22);
+lean_dec(x_21);
+x_23 = lean_st_ref_get(x_11, x_22);
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-x_25 = lean_ctor_get(x_23, 2);
+x_25 = lean_ctor_get(x_23, 1);
 lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_ctor_get(x_24, 2);
+lean_inc(x_26);
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_11);
-x_26 = l_Lean_Compiler_LCNF_Code_applyRenaming(x_18, x_25, x_11, x_12, x_13, x_14, x_24);
-if (lean_obj_tag(x_26) == 0)
+x_27 = l_Lean_Compiler_LCNF_Code_applyRenaming(x_19, x_26, x_12, x_13, x_14, x_15, x_25);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_76; lean_object* x_77; lean_object* x_78; uint8_t x_79; 
-x_27 = lean_ctor_get(x_26, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_26, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_77; lean_object* x_78; lean_object* x_79; uint8_t x_80; 
+x_28 = lean_ctor_get(x_27, 0);
 lean_inc(x_28);
-lean_dec(x_26);
-x_76 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__6;
-x_77 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_76, x_9, x_10, x_11, x_12, x_13, x_14, x_28);
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_unbox(x_78);
-lean_dec(x_78);
-if (x_79 == 0)
+x_29 = lean_ctor_get(x_27, 1);
+lean_inc(x_29);
+lean_dec(x_27);
+x_77 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__6;
+x_78 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_77, x_10, x_11, x_12, x_13, x_14, x_15, x_29);
+x_79 = lean_ctor_get(x_78, 0);
+lean_inc(x_79);
+x_80 = lean_unbox(x_79);
+lean_dec(x_79);
+if (x_80 == 0)
 {
-lean_object* x_80; 
-x_80 = lean_ctor_get(x_77, 1);
-lean_inc(x_80);
-lean_dec(x_77);
-x_29 = x_80;
-goto block_75;
+lean_object* x_81; 
+x_81 = lean_ctor_get(x_78, 1);
+lean_inc(x_81);
+lean_dec(x_78);
+x_30 = x_81;
+goto block_76;
 }
 else
 {
-lean_object* x_81; lean_object* x_82; 
-x_81 = lean_ctor_get(x_77, 1);
-lean_inc(x_81);
-lean_dec(x_77);
+lean_object* x_82; lean_object* x_83; 
+x_82 = lean_ctor_get(x_78, 1);
+lean_inc(x_82);
+lean_dec(x_78);
+lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_27);
-x_82 = l_Lean_Compiler_LCNF_ppCode(x_27, x_11, x_12, x_13, x_14, x_81);
-if (lean_obj_tag(x_82) == 0)
+lean_inc(x_28);
+x_83 = l_Lean_Compiler_LCNF_ppCode(x_28, x_12, x_13, x_14, x_15, x_82);
+if (lean_obj_tag(x_83) == 0)
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-x_84 = lean_ctor_get(x_82, 1);
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+x_84 = lean_ctor_get(x_83, 0);
 lean_inc(x_84);
-lean_dec(x_82);
+x_85 = lean_ctor_get(x_83, 1);
+lean_inc(x_85);
+lean_dec(x_83);
 lean_inc(x_2);
-x_85 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_85, 0, x_2);
-x_86 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
-x_87 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_87, 0, x_86);
-lean_ctor_set(x_87, 1, x_85);
-x_88 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__20;
-x_89 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_89, 0, x_87);
-lean_ctor_set(x_89, 1, x_88);
-x_90 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_90, 0, x_83);
-x_91 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
+x_86 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_86, 0, x_2);
+x_87 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
+x_88 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_88, 0, x_87);
+lean_ctor_set(x_88, 1, x_86);
+x_89 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__20;
+x_90 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_91, 0, x_84);
 x_92 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_92, 0, x_91);
-lean_ctor_set(x_92, 1, x_86);
-x_93 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_76, x_92, x_9, x_10, x_11, x_12, x_13, x_14, x_84);
-x_94 = lean_ctor_get(x_93, 1);
-lean_inc(x_94);
-lean_dec(x_93);
-x_29 = x_94;
-goto block_75;
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+x_93 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_93, 0, x_92);
+lean_ctor_set(x_93, 1, x_87);
+x_94 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_77, x_93, x_10, x_11, x_12, x_13, x_14, x_15, x_85);
+x_95 = lean_ctor_get(x_94, 1);
+lean_inc(x_95);
+lean_dec(x_94);
+x_30 = x_95;
+goto block_76;
 }
 else
 {
-uint8_t x_95; 
-lean_dec(x_27);
-lean_dec(x_23);
+uint8_t x_96; 
+lean_dec(x_28);
+lean_dec(x_24);
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_95 = !lean_is_exclusive(x_82);
-if (x_95 == 0)
+x_96 = !lean_is_exclusive(x_83);
+if (x_96 == 0)
 {
-return x_82;
+return x_83;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_82, 0);
-x_97 = lean_ctor_get(x_82, 1);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_83, 0);
+x_98 = lean_ctor_get(x_83, 1);
+lean_inc(x_98);
 lean_inc(x_97);
-lean_inc(x_96);
-lean_dec(x_82);
-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_dec(x_83);
+x_99 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_99, 0, x_97);
+lean_ctor_set(x_99, 1, x_98);
+return x_99;
 }
 }
 }
-block_75:
+block_76:
 {
-lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_30 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__8;
-x_31 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_30, x_9, x_10, x_11, x_12, x_13, x_14, x_29);
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_unbox(x_32);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_31 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__8;
+x_32 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_31, x_10, x_11, x_12, x_13, x_14, x_15, x_30);
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+x_34 = lean_unbox(x_33);
+lean_dec(x_33);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+lean_dec(x_24);
+x_35 = lean_ctor_get(x_32, 1);
+lean_inc(x_35);
 lean_dec(x_32);
-if (x_33 == 0)
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_23);
-x_34 = lean_ctor_get(x_31, 1);
-lean_inc(x_34);
-lean_dec(x_31);
-x_35 = lean_box(0);
-x_36 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_27, x_2, x_3, x_4, x_5, x_6, x_35, x_9, x_10, x_11, x_12, x_13, x_14, x_34);
+x_36 = lean_box(0);
+x_37 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_28, x_2, x_3, x_4, x_5, x_6, x_7, x_36, x_10, x_11, x_12, x_13, x_14, x_15, x_35);
+lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
-return x_36;
+return x_37;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_37 = lean_ctor_get(x_31, 1);
-lean_inc(x_37);
-lean_dec(x_31);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_38 = lean_ctor_get(x_32, 1);
+lean_inc(x_38);
+lean_dec(x_32);
 lean_inc(x_2);
-x_38 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_38, 0, x_2);
-x_39 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
-x_40 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-x_41 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__12;
-x_42 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_42, 0, x_40);
-lean_ctor_set(x_42, 1, x_41);
-x_43 = lean_unsigned_to_nat(0u);
-lean_inc(x_27);
-x_44 = l_Lean_Compiler_LCNF_Code_size_go(x_27, x_43);
-x_45 = l_Nat_repr(x_44);
-x_46 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_46, 0, x_45);
-x_47 = lean_alloc_ctor(0, 1, 0);
+x_39 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_39, 0, x_2);
+x_40 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
+x_41 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_39);
+x_42 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__12;
+x_43 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+x_44 = lean_unsigned_to_nat(0u);
+lean_inc(x_28);
+x_45 = l_Lean_Compiler_LCNF_Code_size_go(x_28, x_44);
+x_46 = l_Nat_repr(x_45);
+x_47 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_47, 0, x_46);
-x_48 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_48, 0, x_42);
-lean_ctor_set(x_48, 1, x_47);
-x_49 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__14;
-x_50 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-x_51 = lean_ctor_get(x_23, 4);
-lean_inc(x_51);
-x_52 = l_Nat_repr(x_51);
-x_53 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_53, 0, x_52);
-x_54 = lean_alloc_ctor(0, 1, 0);
+x_48 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+x_49 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_49, 0, x_43);
+lean_ctor_set(x_49, 1, x_48);
+x_50 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__14;
+x_51 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_51, 0, x_49);
+lean_ctor_set(x_51, 1, x_50);
+x_52 = lean_ctor_get(x_24, 4);
+lean_inc(x_52);
+x_53 = l_Nat_repr(x_52);
+x_54 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_54, 0, x_53);
-x_55 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_55, 0, x_50);
-lean_ctor_set(x_55, 1, x_54);
-x_56 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__16;
-x_57 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-x_58 = lean_ctor_get(x_23, 5);
-lean_inc(x_58);
-x_59 = l_Nat_repr(x_58);
-x_60 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_60, 0, x_59);
-x_61 = lean_alloc_ctor(0, 1, 0);
+x_55 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_55, 0, x_54);
+x_56 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_56, 0, x_51);
+lean_ctor_set(x_56, 1, x_55);
+x_57 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__16;
+x_58 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_58, 0, x_56);
+lean_ctor_set(x_58, 1, x_57);
+x_59 = lean_ctor_get(x_24, 5);
+lean_inc(x_59);
+x_60 = l_Nat_repr(x_59);
+x_61 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_61, 0, x_60);
-x_62 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_62, 0, x_57);
-lean_ctor_set(x_62, 1, x_61);
-x_63 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__18;
-x_64 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-x_65 = lean_ctor_get(x_23, 6);
-lean_inc(x_65);
-lean_dec(x_23);
-x_66 = l_Nat_repr(x_65);
-x_67 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-x_68 = lean_alloc_ctor(0, 1, 0);
+x_62 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_62, 0, x_61);
+x_63 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_63, 0, x_58);
+lean_ctor_set(x_63, 1, x_62);
+x_64 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__18;
+x_65 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_65, 0, x_63);
+lean_ctor_set(x_65, 1, x_64);
+x_66 = lean_ctor_get(x_24, 6);
+lean_inc(x_66);
+lean_dec(x_24);
+x_67 = l_Nat_repr(x_66);
+x_68 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_68, 0, x_67);
-x_69 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_69, 0, x_64);
-lean_ctor_set(x_69, 1, x_68);
+x_69 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_69, 0, x_68);
 x_70 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_39);
-x_71 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_30, x_70, x_9, x_10, x_11, x_12, x_13, x_14, x_37);
-x_72 = lean_ctor_get(x_71, 0);
-lean_inc(x_72);
-x_73 = lean_ctor_get(x_71, 1);
+lean_ctor_set(x_70, 0, x_65);
+lean_ctor_set(x_70, 1, x_69);
+x_71 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_40);
+x_72 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_31, x_71, x_10, x_11, x_12, x_13, x_14, x_15, x_38);
+x_73 = lean_ctor_get(x_72, 0);
 lean_inc(x_73);
-lean_dec(x_71);
-x_74 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_27, x_2, x_3, x_4, x_5, x_6, x_72, x_9, x_10, x_11, x_12, x_13, x_14, x_73);
-lean_dec(x_10);
-lean_dec(x_9);
+x_74 = lean_ctor_get(x_72, 1);
+lean_inc(x_74);
 lean_dec(x_72);
-return x_74;
+x_75 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_28, x_2, x_3, x_4, x_5, x_6, x_7, x_73, x_10, x_11, x_12, x_13, x_14, x_15, x_74);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_73);
+return x_75;
 }
 }
 }
 else
 {
-uint8_t x_99; 
-lean_dec(x_23);
+uint8_t x_100; 
+lean_dec(x_24);
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_99 = !lean_is_exclusive(x_26);
-if (x_99 == 0)
+x_100 = !lean_is_exclusive(x_27);
+if (x_100 == 0)
 {
-return x_26;
+return x_27;
 }
 else
 {
-lean_object* x_100; lean_object* x_101; lean_object* x_102; 
-x_100 = lean_ctor_get(x_26, 0);
-x_101 = lean_ctor_get(x_26, 1);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_27, 0);
+x_102 = lean_ctor_get(x_27, 1);
+lean_inc(x_102);
 lean_inc(x_101);
-lean_inc(x_100);
-lean_dec(x_26);
-x_102 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_102, 0, x_100);
-lean_ctor_set(x_102, 1, x_101);
-return x_102;
+lean_dec(x_27);
+x_103 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_103, 0, x_101);
+lean_ctor_set(x_103, 1, x_102);
+return x_103;
 }
 }
 }
 else
 {
-uint8_t x_103; 
+uint8_t x_104; 
+lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_103 = !lean_is_exclusive(x_17);
-if (x_103 == 0)
+x_104 = !lean_is_exclusive(x_18);
+if (x_104 == 0)
 {
-return x_17;
+return x_18;
 }
 else
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; 
-x_104 = lean_ctor_get(x_17, 0);
-x_105 = lean_ctor_get(x_17, 1);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_ctor_get(x_18, 0);
+x_106 = lean_ctor_get(x_18, 1);
+lean_inc(x_106);
 lean_inc(x_105);
-lean_inc(x_104);
-lean_dec(x_17);
-x_106 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_106, 0, x_104);
-lean_ctor_set(x_106, 1, x_105);
-return x_106;
+lean_dec(x_18);
+x_107 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_107, 0, x_105);
+lean_ctor_set(x_107, 1, x_106);
+return x_107;
 }
 }
 }
@@ -999,7 +1003,7 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; uint8_t x_15; lean_object* x_16; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; uint8_t x_15; uint8_t x_16; lean_object* x_17; 
 x_9 = lean_ctor_get(x_1, 0);
 lean_inc(x_9);
 x_10 = lean_ctor_get(x_1, 1);
@@ -1011,98 +1015,99 @@ lean_inc(x_12);
 x_13 = lean_ctor_get(x_1, 4);
 lean_inc(x_13);
 x_14 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
-x_15 = 0;
+x_15 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
+x_16 = 0;
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_13);
-x_16 = l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo(x_13, x_15, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_16) == 0)
+x_17 = l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo(x_13, x_16, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_17) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_17 = lean_ctor_get(x_16, 1);
-lean_inc(x_17);
-lean_dec(x_16);
-x_18 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__3;
-x_19 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_18, x_2, x_3, x_4, x_5, x_6, x_7, x_17);
-x_20 = lean_ctor_get(x_19, 0);
-lean_inc(x_20);
-x_21 = lean_unbox(x_20);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_18 = lean_ctor_get(x_17, 1);
+lean_inc(x_18);
+lean_dec(x_17);
+x_19 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__3;
+x_20 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_19, x_2, x_3, x_4, x_5, x_6, x_7, x_18);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_unbox(x_21);
+lean_dec(x_21);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_20, 1);
+lean_inc(x_23);
 lean_dec(x_20);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_19, 1);
-lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_box(0);
-x_24 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_13, x_9, x_10, x_11, x_12, x_14, x_1, x_23, x_2, x_3, x_4, x_5, x_6, x_7, x_22);
-return x_24;
+x_24 = lean_box(0);
+x_25 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_13, x_9, x_10, x_11, x_12, x_14, x_15, x_1, x_24, x_2, x_3, x_4, x_5, x_6, x_7, x_23);
+return x_25;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_25 = lean_ctor_get(x_19, 1);
-lean_inc(x_25);
-lean_dec(x_19);
-x_26 = lean_st_ref_get(x_7, x_25);
-x_27 = lean_ctor_get(x_26, 1);
-lean_inc(x_27);
-lean_dec(x_26);
-x_28 = lean_st_ref_get(x_3, x_27);
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_28, 1);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_26 = lean_ctor_get(x_20, 1);
+lean_inc(x_26);
+lean_dec(x_20);
+x_27 = lean_st_ref_get(x_7, x_26);
+x_28 = lean_ctor_get(x_27, 1);
+lean_inc(x_28);
+lean_dec(x_27);
+x_29 = lean_st_ref_get(x_3, x_28);
+x_30 = lean_ctor_get(x_29, 0);
 lean_inc(x_30);
-lean_dec(x_28);
-x_31 = lean_ctor_get(x_29, 3);
+x_31 = lean_ctor_get(x_29, 1);
 lean_inc(x_31);
 lean_dec(x_29);
-x_32 = l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format(x_31, x_4, x_5, x_6, x_7, x_30);
-if (lean_obj_tag(x_32) == 0)
+x_32 = lean_ctor_get(x_30, 3);
+lean_inc(x_32);
+lean_dec(x_30);
+x_33 = l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format(x_32, x_4, x_5, x_6, x_7, x_31);
+if (lean_obj_tag(x_33) == 0)
 {
-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; 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_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_34 = lean_ctor_get(x_33, 0);
 lean_inc(x_34);
-lean_dec(x_32);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
 lean_inc(x_9);
-x_35 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_35, 0, x_9);
-x_36 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
-x_37 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_35);
-x_38 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__5;
-x_39 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_39, 0, x_37);
-lean_ctor_set(x_39, 1, x_38);
-x_40 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__6;
-x_41 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_41, 0, x_40);
-lean_ctor_set(x_41, 1, x_33);
-x_42 = lean_alloc_ctor(0, 1, 0);
+x_36 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_36, 0, x_9);
+x_37 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
+x_38 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+x_39 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__5;
+x_40 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+x_41 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__6;
+x_42 = lean_alloc_ctor(3, 2, 0);
 lean_ctor_set(x_42, 0, x_41);
-x_43 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_43, 0, x_39);
-lean_ctor_set(x_43, 1, x_42);
+lean_ctor_set(x_42, 1, x_34);
+x_43 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_43, 0, x_42);
 x_44 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_36);
-x_45 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_18, x_44, x_2, x_3, x_4, x_5, x_6, x_7, x_34);
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
+lean_ctor_set(x_44, 0, x_40);
+lean_ctor_set(x_44, 1, x_43);
+x_45 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_37);
+x_46 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_19, x_45, x_2, x_3, x_4, x_5, x_6, x_7, x_35);
+x_47 = lean_ctor_get(x_46, 0);
 lean_inc(x_47);
-lean_dec(x_45);
-x_48 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_13, x_9, x_10, x_11, x_12, x_14, x_1, x_46, x_2, x_3, x_4, x_5, x_6, x_7, x_47);
-return x_48;
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec(x_46);
+x_49 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_13, x_9, x_10, x_11, x_12, x_14, x_15, x_1, x_47, x_2, x_3, x_4, x_5, x_6, x_7, x_48);
+return x_49;
 }
 else
 {
-uint8_t x_49; 
+uint8_t x_50; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -1115,30 +1120,30 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_49 = !lean_is_exclusive(x_32);
-if (x_49 == 0)
+x_50 = !lean_is_exclusive(x_33);
+if (x_50 == 0)
 {
-return x_32;
+return x_33;
 }
 else
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_50 = lean_ctor_get(x_32, 0);
-x_51 = lean_ctor_get(x_32, 1);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_33, 0);
+x_52 = lean_ctor_get(x_33, 1);
+lean_inc(x_52);
 lean_inc(x_51);
-lean_inc(x_50);
-lean_dec(x_32);
-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;
+lean_dec(x_33);
+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;
 }
 }
 }
 }
 else
 {
-uint8_t x_53; 
+uint8_t x_54; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -1151,48 +1156,52 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_53 = !lean_is_exclusive(x_16);
-if (x_53 == 0)
+x_54 = !lean_is_exclusive(x_17);
+if (x_54 == 0)
 {
-return x_16;
+return x_17;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_16, 0);
-x_55 = lean_ctor_get(x_16, 1);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_17, 0);
+x_56 = lean_ctor_get(x_17, 1);
+lean_inc(x_56);
 lean_inc(x_55);
-lean_inc(x_54);
-lean_dec(x_16);
-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_dec(x_17);
+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;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-uint8_t x_15; lean_object* x_16; 
-x_15 = lean_unbox(x_6);
-lean_dec(x_6);
-x_16 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_1, x_2, x_3, x_4, x_5, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_16;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___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, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
-_start:
-{
-uint8_t x_16; lean_object* x_17; 
+uint8_t x_16; uint8_t x_17; lean_object* x_18; 
 x_16 = lean_unbox(x_6);
 lean_dec(x_6);
-x_17 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_1, x_2, x_3, x_4, x_5, x_16, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
-return x_17;
+x_17 = lean_unbox(x_7);
+lean_dec(x_7);
+x_18 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(x_1, x_2, x_3, x_4, x_5, x_16, x_17, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___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, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+uint8_t x_17; uint8_t x_18; lean_object* x_19; 
+x_17 = lean_unbox(x_6);
+lean_dec(x_6);
+x_18 = lean_unbox(x_7);
+lean_dec(x_7);
+x_19 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_1, x_2, x_3, x_4, x_5, x_17, x_18, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+return x_19;
 }
 }
 static lean_object* _init_l_Lean_Compiler_LCNF_Decl_simp_go___closed__1() {
@@ -1499,7 +1508,7 @@ x_6 = l_Lean_Compiler_LCNF_Pass_mkPerDeclaration(x_4, x_3, x_5, x_2);
 return x_6;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1509,11 +1518,11 @@ x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)
@@ -1742,9 +1751,9 @@ l_Lean_Compiler_LCNF_Decl_simp_go___closed__7 = _init_l_Lean_Compiler_LCNF_Decl_
 lean_mark_persistent(l_Lean_Compiler_LCNF_Decl_simp_go___closed__7);
 l_Lean_Compiler_LCNF_simp___closed__1 = _init_l_Lean_Compiler_LCNF_simp___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_simp___closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734____closed__1);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_734_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736____closed__1);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_736_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Simp/InlineCandidate.c b/stage0/stdlib/Lean/Compiler/LCNF/Simp/InlineCandidate.c
index 147a3d9194..5e37ea04ac 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Simp/InlineCandidate.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Simp/InlineCandidate.c
@@ -14,16 +14,17 @@
 extern "C" {
 #endif
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(lean_object*, 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* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_arity(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___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*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
 lean_object* l_Lean_Compiler_LCNF_Decl_isCasesOnParam_x3f(lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(lean_object*, 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* l_Lean_Compiler_LCNF_Simp_findFunDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+lean_object* l_Lean_Name_mkStr3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
@@ -32,6 +33,7 @@ lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___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* l_Lean_Compiler_LCNF_Simp_incInlineLocal___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2;
+static lean_object* l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_recursive___default;
@@ -55,15 +57,19 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f(lean_obje
 lean_object* l_Lean_Compiler_LCNF_getDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__3;
 lean_object* l_Lean_Compiler_LCNF_Decl_instantiateParamsLevelParams(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Simp_incInline___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(lean_object*, 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isConstructorApp(lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3;
 lean_object* lean_mk_array(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2;
+lean_object* l_Lean_Compiler_LCNF_Simp_isSmall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4(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_Expr_getAppFn(lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -556,14 +562,30 @@ return x_27;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15) {
 _start:
 {
-lean_object* x_16; lean_object* x_17; 
 lean_dec(x_8);
-x_16 = l_Lean_Compiler_LCNF_getDecl_x3f(x_1, x_11, x_12, x_13, x_14, x_15);
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-if (lean_obj_tag(x_17) == 0)
+if (x_7 == 0)
 {
-uint8_t x_18; 
+lean_object* x_16; uint8_t x_17; 
+x_16 = lean_ctor_get(x_9, 1);
+lean_inc(x_16);
+x_17 = lean_ctor_get_uint8(x_16, 1);
+lean_dec(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; uint8_t x_19; 
+x_18 = l_Lean_Compiler_LCNF_Decl_getArity(x_1);
+x_19 = lean_nat_dec_lt(x_3, x_18);
+lean_dec(x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_box(0);
+x_21 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_1, x_2, x_3, x_4, x_5, x_6, x_20, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+return x_21;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
@@ -574,171 +596,46 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_18 = !lean_is_exclusive(x_16);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_16, 0);
-lean_dec(x_19);
-x_20 = lean_box(0);
-lean_ctor_set(x_16, 0, x_20);
-return x_16;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_16, 1);
-lean_inc(x_21);
-lean_dec(x_16);
+lean_dec(x_1);
 x_22 = lean_box(0);
 x_23 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_21);
+lean_ctor_set(x_23, 1, x_15);
 return x_23;
 }
 }
 else
 {
-if (x_7 == 0)
-{
-lean_object* x_24; uint8_t x_25; 
-x_24 = lean_ctor_get(x_9, 1);
-lean_inc(x_24);
-x_25 = lean_ctor_get_uint8(x_24, 1);
-lean_dec(x_24);
-if (x_25 == 0)
-{
-uint8_t x_26; 
-x_26 = !lean_is_exclusive(x_16);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_ctor_get(x_16, 1);
-x_28 = lean_ctor_get(x_16, 0);
-lean_dec(x_28);
-x_29 = lean_ctor_get(x_17, 0);
-lean_inc(x_29);
-lean_dec(x_17);
-x_30 = l_Lean_Compiler_LCNF_Decl_getArity(x_29);
-x_31 = lean_nat_dec_lt(x_3, x_30);
-lean_dec(x_30);
-if (x_31 == 0)
-{
-lean_object* x_32; lean_object* x_33; 
-lean_free_object(x_16);
-x_32 = lean_box(0);
-x_33 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_29, x_2, x_3, x_4, x_5, x_6, x_32, x_9, x_10, x_11, x_12, x_13, x_14, x_27);
-return x_33;
-}
-else
-{
-lean_object* x_34; 
-lean_dec(x_29);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_34 = lean_box(0);
-lean_ctor_set(x_16, 0, x_34);
-return x_16;
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_box(0);
+x_25 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_1, x_2, x_3, x_4, x_5, x_6, x_24, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+return x_25;
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
-x_35 = lean_ctor_get(x_16, 1);
-lean_inc(x_35);
-lean_dec(x_16);
-x_36 = lean_ctor_get(x_17, 0);
-lean_inc(x_36);
-lean_dec(x_17);
-x_37 = l_Lean_Compiler_LCNF_Decl_getArity(x_36);
-x_38 = lean_nat_dec_lt(x_3, x_37);
-lean_dec(x_37);
-if (x_38 == 0)
-{
-lean_object* x_39; lean_object* x_40; 
-x_39 = lean_box(0);
-x_40 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_36, x_2, x_3, x_4, x_5, x_6, x_39, x_9, x_10, x_11, x_12, x_13, x_14, x_35);
-return x_40;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; 
-lean_dec(x_36);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_41 = lean_box(0);
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_35);
-return x_42;
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_box(0);
+x_27 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_1, x_2, x_3, x_4, x_5, x_6, x_26, x_9, x_10, x_11, x_12, x_13, x_14, x_15);
+return x_27;
 }
 }
 }
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_43 = lean_ctor_get(x_16, 1);
-lean_inc(x_43);
-lean_dec(x_16);
-x_44 = lean_ctor_get(x_17, 0);
-lean_inc(x_44);
-lean_dec(x_17);
-x_45 = lean_box(0);
-x_46 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_44, x_2, x_3, x_4, x_5, x_6, x_45, x_9, x_10, x_11, x_12, x_13, x_14, x_43);
-return x_46;
-}
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_47 = lean_ctor_get(x_16, 1);
-lean_inc(x_47);
-lean_dec(x_16);
-x_48 = lean_ctor_get(x_17, 0);
-lean_inc(x_48);
-lean_dec(x_17);
-x_49 = lean_box(0);
-x_50 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__5(x_48, x_2, x_3, x_4, x_5, x_6, x_49, x_9, x_10, x_11, x_12, x_13, x_14, x_47);
-return x_50;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-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_dec(x_7);
-x_15 = lean_st_ref_get(x_13, x_14);
-x_16 = lean_ctor_get(x_15, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_15, 1);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+lean_dec(x_9);
+x_17 = lean_ctor_get(x_1, 4);
 lean_inc(x_17);
-lean_dec(x_15);
-x_18 = lean_ctor_get(x_16, 0);
-lean_inc(x_18);
-lean_dec(x_16);
-x_19 = 3;
-lean_inc(x_1);
-x_20 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_18, x_19, x_1);
-x_21 = lean_st_ref_get(x_13, x_17);
-if (x_6 == 0)
+x_18 = l_Lean_Compiler_LCNF_Simp_isSmall(x_17, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+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_st_ref_get(x_15, x_20);
+if (x_7 == 0)
 {
 uint8_t x_22; 
 x_22 = !lean_is_exclusive(x_21);
@@ -751,109 +648,206 @@ x_25 = lean_ctor_get(x_23, 0);
 lean_inc(x_25);
 lean_dec(x_23);
 x_26 = 0;
-lean_inc(x_1);
-x_27 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_25, x_26, x_1);
+lean_inc(x_8);
+lean_inc(x_25);
+x_27 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_25, x_26, x_8);
 if (x_27 == 0)
 {
-if (x_20 == 0)
+if (x_6 == 0)
 {
-lean_object* x_28; 
+uint8_t x_28; 
+x_28 = lean_unbox(x_19);
+lean_dec(x_19);
+if (x_28 == 0)
+{
+lean_object* x_29; 
+lean_dec(x_25);
+lean_dec(x_15);
+lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_28 = lean_box(0);
-lean_ctor_set(x_21, 0, x_28);
+x_29 = lean_box(0);
+lean_ctor_set(x_21, 0, x_29);
 return x_21;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; 
+uint8_t x_30; uint8_t x_31; 
+x_30 = 1;
+x_31 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_25, x_30, x_8);
+if (x_31 == 0)
+{
+lean_object* x_32; lean_object* x_33; 
 lean_free_object(x_21);
-x_29 = lean_box(0);
-x_30 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_20, x_6, x_29, x_8, x_9, x_10, x_11, x_12, x_13, x_24);
-return x_30;
-}
+x_32 = lean_box(0);
+x_33 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_32, x_10, x_11, x_12, x_13, x_14, x_15, x_24);
+return x_33;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; 
-lean_free_object(x_21);
-x_31 = lean_box(0);
-x_32 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_20, x_6, x_31, x_8, x_9, x_10, x_11, x_12, x_13, x_24);
-return x_32;
-}
-}
-else
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; uint8_t x_37; 
-x_33 = lean_ctor_get(x_21, 0);
-x_34 = lean_ctor_get(x_21, 1);
-lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_21);
-x_35 = lean_ctor_get(x_33, 0);
-lean_inc(x_35);
-lean_dec(x_33);
-x_36 = 0;
-lean_inc(x_1);
-x_37 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_35, x_36, x_1);
-if (x_37 == 0)
-{
-if (x_20 == 0)
-{
-lean_object* x_38; lean_object* x_39; 
+lean_object* x_34; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+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_34 = lean_box(0);
+lean_ctor_set(x_21, 0, x_34);
+return x_21;
+}
+}
+}
+else
+{
+lean_object* x_35; lean_object* x_36; 
+lean_dec(x_25);
+lean_free_object(x_21);
+lean_dec(x_19);
+lean_dec(x_8);
+x_35 = lean_box(0);
+x_36 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_35, x_10, x_11, x_12, x_13, x_14, x_15, x_24);
+return x_36;
+}
+}
+else
+{
+lean_object* x_37; lean_object* x_38; 
+lean_dec(x_25);
+lean_free_object(x_21);
+lean_dec(x_19);
+lean_dec(x_8);
+x_37 = lean_box(0);
+x_38 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_37, x_10, x_11, x_12, x_13, x_14, x_15, x_24);
+return x_38;
+}
+}
+else
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; uint8_t x_43; 
+x_39 = lean_ctor_get(x_21, 0);
+x_40 = lean_ctor_get(x_21, 1);
+lean_inc(x_40);
+lean_inc(x_39);
+lean_dec(x_21);
+x_41 = lean_ctor_get(x_39, 0);
+lean_inc(x_41);
+lean_dec(x_39);
+x_42 = 0;
+lean_inc(x_8);
+lean_inc(x_41);
+x_43 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_41, x_42, x_8);
+if (x_43 == 0)
+{
+if (x_6 == 0)
+{
+uint8_t x_44; 
+x_44 = lean_unbox(x_19);
+lean_dec(x_19);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; 
+lean_dec(x_41);
+lean_dec(x_15);
+lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
-lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_38 = lean_box(0);
-x_39 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_39, 0, x_38);
-lean_ctor_set(x_39, 1, x_34);
-return x_39;
-}
-else
-{
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_box(0);
-x_41 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_20, x_6, x_40, x_8, x_9, x_10, x_11, x_12, x_13, x_34);
-return x_41;
-}
-}
-else
-{
-lean_object* x_42; lean_object* x_43; 
-x_42 = lean_box(0);
-x_43 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_20, x_6, x_42, x_8, x_9, x_10, x_11, x_12, x_13, x_34);
-return x_43;
-}
-}
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_21, 1);
-lean_inc(x_44);
-lean_dec(x_21);
 x_45 = lean_box(0);
-x_46 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_20, x_6, x_45, x_8, x_9, x_10, x_11, x_12, x_13, x_44);
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_40);
 return x_46;
 }
+else
+{
+uint8_t x_47; uint8_t x_48; 
+x_47 = 1;
+x_48 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_41, x_47, x_8);
+if (x_48 == 0)
+{
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_box(0);
+x_50 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_49, x_10, x_11, x_12, x_13, x_14, x_15, x_40);
+return x_50;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+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_51 = lean_box(0);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_40);
+return x_52;
+}
+}
+}
+else
+{
+lean_object* x_53; lean_object* x_54; 
+lean_dec(x_41);
+lean_dec(x_19);
+lean_dec(x_8);
+x_53 = lean_box(0);
+x_54 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_53, x_10, x_11, x_12, x_13, x_14, x_15, x_40);
+return x_54;
+}
+}
+else
+{
+lean_object* x_55; lean_object* x_56; 
+lean_dec(x_41);
+lean_dec(x_19);
+lean_dec(x_8);
+x_55 = lean_box(0);
+x_56 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_55, x_10, x_11, x_12, x_13, x_14, x_15, x_40);
+return x_56;
+}
+}
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+lean_dec(x_19);
+lean_dec(x_8);
+x_57 = lean_ctor_get(x_21, 1);
+lean_inc(x_57);
+lean_dec(x_21);
+x_58 = lean_box(0);
+x_59 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_58, x_10, x_11, x_12, x_13, x_14, x_15, x_57);
+return x_59;
+}
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
@@ -871,36 +865,24 @@ x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
 if (lean_obj_tag(x_16) == 4)
 {
-uint8_t x_17; 
-x_17 = !lean_is_exclusive(x_15);
-if (x_17 == 0)
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_18 = lean_ctor_get(x_15, 1);
-x_19 = lean_ctor_get(x_15, 0);
-lean_dec(x_19);
-x_20 = lean_ctor_get(x_16, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_16, 1);
-lean_inc(x_21);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = lean_ctor_get(x_16, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_16, 1);
+lean_inc(x_19);
 lean_dec(x_16);
-x_22 = lean_ctor_get(x_4, 0);
-lean_inc(x_22);
-x_23 = lean_name_eq(x_20, x_22);
-lean_dec(x_22);
-if (x_23 == 0)
+lean_inc(x_18);
+x_20 = l_Lean_Compiler_LCNF_getDecl_x3f(x_18, x_6, x_7, x_8, x_9, x_17);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+if (lean_obj_tag(x_21) == 0)
 {
-lean_object* x_24; lean_object* x_25; 
-lean_free_object(x_15);
-x_24 = lean_box(0);
-x_25 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_20, x_21, x_12, x_1, x_13, x_2, x_24, x_4, x_5, x_6, x_7, x_8, x_9, x_18);
-return x_25;
-}
-else
-{
-lean_object* x_26; 
-lean_dec(x_21);
-lean_dec(x_20);
+uint8_t x_22; 
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_9);
@@ -910,38 +892,69 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
+x_22 = !lean_is_exclusive(x_20);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_ctor_get(x_20, 0);
+lean_dec(x_23);
+x_24 = lean_box(0);
+lean_ctor_set(x_20, 0, x_24);
+return x_20;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_20, 1);
+lean_inc(x_25);
+lean_dec(x_20);
 x_26 = lean_box(0);
-lean_ctor_set(x_15, 0, x_26);
-return x_15;
+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
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_ctor_get(x_15, 1);
-lean_inc(x_27);
-lean_dec(x_15);
-x_28 = lean_ctor_get(x_16, 0);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_28 = lean_ctor_get(x_20, 1);
 lean_inc(x_28);
-x_29 = lean_ctor_get(x_16, 1);
+lean_dec(x_20);
+x_29 = lean_ctor_get(x_21, 0);
 lean_inc(x_29);
-lean_dec(x_16);
-x_30 = lean_ctor_get(x_4, 0);
-lean_inc(x_30);
-x_31 = lean_name_eq(x_28, x_30);
-lean_dec(x_30);
+lean_dec(x_21);
+x_30 = lean_st_ref_get(x_9, x_28);
+x_31 = !lean_is_exclusive(x_30);
 if (x_31 == 0)
 {
-lean_object* x_32; lean_object* x_33; 
-x_32 = lean_box(0);
-x_33 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_28, x_29, x_12, x_1, x_13, x_2, x_32, x_4, x_5, x_6, x_7, x_8, x_9, x_27);
-return x_33;
+lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; uint8_t x_36; 
+x_32 = lean_ctor_get(x_30, 0);
+x_33 = lean_ctor_get(x_30, 1);
+x_34 = lean_ctor_get(x_32, 0);
+lean_inc(x_34);
+lean_dec(x_32);
+x_35 = 3;
+lean_inc(x_18);
+x_36 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_34, x_35, x_18);
+if (x_36 == 0)
+{
+uint8_t x_37; 
+x_37 = lean_ctor_get_uint8(x_29, sizeof(void*)*5);
+if (x_37 == 0)
+{
+lean_object* x_38; lean_object* x_39; 
+lean_free_object(x_30);
+x_38 = lean_box(0);
+x_39 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_29, x_19, x_12, x_1, x_13, x_36, x_2, x_18, x_38, x_4, x_5, x_6, x_7, x_8, x_9, x_33);
+return x_39;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; 
+lean_object* x_40; 
 lean_dec(x_29);
-lean_dec(x_28);
+lean_dec(x_19);
+lean_dec(x_18);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_9);
@@ -951,114 +964,91 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_34 = lean_box(0);
-x_35 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_27);
-return x_35;
-}
+x_40 = lean_box(0);
+lean_ctor_set(x_30, 0, x_40);
+return x_30;
 }
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-lean_dec(x_16);
-x_36 = lean_ctor_get(x_15, 1);
-lean_inc(x_36);
-lean_dec(x_15);
-lean_inc(x_13);
-x_37 = l_Lean_Compiler_LCNF_Simp_findFunDecl_x3f(x_13, x_6, x_7, x_8, x_9, x_36);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-if (lean_obj_tag(x_38) == 0)
-{
-uint8_t x_39; 
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_39 = !lean_is_exclusive(x_37);
-if (x_39 == 0)
-{
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_ctor_get(x_37, 0);
-lean_dec(x_40);
+lean_object* x_41; lean_object* x_42; 
+lean_free_object(x_30);
 x_41 = lean_box(0);
-lean_ctor_set(x_37, 0, x_41);
-return x_37;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_37, 1);
-lean_inc(x_42);
-lean_dec(x_37);
-x_43 = lean_box(0);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
+x_42 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_29, x_19, x_12, x_1, x_13, x_36, x_2, x_18, x_41, x_4, x_5, x_6, x_7, x_8, x_9, x_33);
+return x_42;
 }
 }
 else
 {
-uint8_t x_45; 
-x_45 = !lean_is_exclusive(x_37);
-if (x_45 == 0)
+lean_object* x_43; lean_object* x_44; lean_object* x_45; uint8_t x_46; uint8_t x_47; 
+x_43 = lean_ctor_get(x_30, 0);
+x_44 = lean_ctor_get(x_30, 1);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_dec(x_30);
+x_45 = lean_ctor_get(x_43, 0);
+lean_inc(x_45);
+lean_dec(x_43);
+x_46 = 3;
+lean_inc(x_18);
+x_47 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_45, x_46, x_18);
+if (x_47 == 0)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; uint8_t x_49; 
-x_46 = lean_ctor_get(x_37, 1);
-x_47 = lean_ctor_get(x_37, 0);
-lean_dec(x_47);
-x_48 = lean_ctor_get(x_38, 0);
-lean_inc(x_48);
-lean_dec(x_38);
-x_49 = lean_nat_dec_lt(x_11, x_12);
-if (x_49 == 0)
+uint8_t x_48; 
+x_48 = lean_ctor_get_uint8(x_29, sizeof(void*)*5);
+if (x_48 == 0)
 {
-lean_object* x_50; 
-lean_dec(x_48);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_50 = lean_box(0);
-lean_ctor_set(x_37, 0, x_50);
-return x_37;
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_box(0);
+x_50 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_29, x_19, x_12, x_1, x_13, x_47, x_2, x_18, x_49, x_4, x_5, x_6, x_7, x_8, x_9, x_44);
+return x_50;
 }
 else
 {
 lean_object* x_51; lean_object* x_52; 
-lean_free_object(x_37);
+lean_dec(x_29);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
 x_51 = lean_box(0);
-x_52 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(x_48, x_12, x_1, x_13, x_2, x_51, x_4, x_5, x_6, x_7, x_8, x_9, x_46);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_44);
 return x_52;
 }
 }
 else
 {
-lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-x_53 = lean_ctor_get(x_37, 1);
-lean_inc(x_53);
-lean_dec(x_37);
-x_54 = lean_ctor_get(x_38, 0);
-lean_inc(x_54);
-lean_dec(x_38);
-x_55 = lean_nat_dec_lt(x_11, x_12);
-if (x_55 == 0)
+lean_object* x_53; lean_object* x_54; 
+x_53 = lean_box(0);
+x_54 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_29, x_19, x_12, x_1, x_13, x_47, x_2, x_18, x_53, x_4, x_5, x_6, x_7, x_8, x_9, x_44);
+return x_54;
+}
+}
+}
+}
+else
 {
-lean_object* x_56; lean_object* x_57; 
-lean_dec(x_54);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+lean_dec(x_16);
+x_55 = lean_ctor_get(x_15, 1);
+lean_inc(x_55);
+lean_dec(x_15);
+lean_inc(x_13);
+x_56 = l_Lean_Compiler_LCNF_Simp_findFunDecl_x3f(x_13, x_6, x_7, x_8, x_9, x_55);
+x_57 = lean_ctor_get(x_56, 0);
+lean_inc(x_57);
+if (lean_obj_tag(x_57) == 0)
+{
+uint8_t x_58; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_9);
@@ -1068,18 +1058,104 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_56 = lean_box(0);
-x_57 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_53);
-return x_57;
+x_58 = !lean_is_exclusive(x_56);
+if (x_58 == 0)
+{
+lean_object* x_59; lean_object* x_60; 
+x_59 = lean_ctor_get(x_56, 0);
+lean_dec(x_59);
+x_60 = lean_box(0);
+lean_ctor_set(x_56, 0, x_60);
+return x_56;
 }
 else
 {
-lean_object* x_58; lean_object* x_59; 
-x_58 = lean_box(0);
-x_59 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(x_54, x_12, x_1, x_13, x_2, x_58, x_4, x_5, x_6, x_7, x_8, x_9, x_53);
-return x_59;
+lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_61 = lean_ctor_get(x_56, 1);
+lean_inc(x_61);
+lean_dec(x_56);
+x_62 = lean_box(0);
+x_63 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_63, 0, x_62);
+lean_ctor_set(x_63, 1, x_61);
+return x_63;
+}
+}
+else
+{
+uint8_t x_64; 
+x_64 = !lean_is_exclusive(x_56);
+if (x_64 == 0)
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; uint8_t x_68; 
+x_65 = lean_ctor_get(x_56, 1);
+x_66 = lean_ctor_get(x_56, 0);
+lean_dec(x_66);
+x_67 = lean_ctor_get(x_57, 0);
+lean_inc(x_67);
+lean_dec(x_57);
+x_68 = lean_nat_dec_lt(x_11, x_12);
+if (x_68 == 0)
+{
+lean_object* x_69; 
+lean_dec(x_67);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_69 = lean_box(0);
+lean_ctor_set(x_56, 0, x_69);
+return x_56;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; 
+lean_free_object(x_56);
+x_70 = lean_box(0);
+x_71 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(x_67, x_12, x_1, x_13, x_2, x_70, x_4, x_5, x_6, x_7, x_8, x_9, x_65);
+return x_71;
+}
+}
+else
+{
+lean_object* x_72; lean_object* x_73; uint8_t x_74; 
+x_72 = lean_ctor_get(x_56, 1);
+lean_inc(x_72);
+lean_dec(x_56);
+x_73 = lean_ctor_get(x_57, 0);
+lean_inc(x_73);
+lean_dec(x_57);
+x_74 = lean_nat_dec_lt(x_11, x_12);
+if (x_74 == 0)
+{
+lean_object* x_75; lean_object* x_76; 
+lean_dec(x_73);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_75 = lean_box(0);
+x_76 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_76, 0, x_75);
+lean_ctor_set(x_76, 1, x_72);
+return x_76;
+}
+else
+{
+lean_object* x_77; lean_object* x_78; 
+x_77 = lean_box(0);
+x_78 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(x_73, x_12, x_1, x_13, x_2, x_77, x_4, x_5, x_6, x_7, x_8, x_9, x_72);
+return x_78;
 }
 }
 }
@@ -1224,14 +1300,16 @@ x_18 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(x_1, x_2, x_3,
 return x_18;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-uint8_t x_15; lean_object* x_16; 
-x_15 = lean_unbox(x_6);
+uint8_t x_17; uint8_t x_18; lean_object* x_19; 
+x_17 = lean_unbox(x_6);
 lean_dec(x_6);
-x_16 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_1, x_2, x_3, x_4, x_5, x_15, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
-return x_16;
+x_18 = lean_unbox(x_7);
+lean_dec(x_7);
+x_19 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__7(x_1, x_2, x_3, x_4, x_5, x_17, x_18, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+return x_19;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8___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) {
@@ -1244,6 +1322,43 @@ x_12 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8(x_1, x_11, x_3,
 return x_12;
 }
 }
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("Compiler", 8);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("simp", 4);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2;
+x_3 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2;
+x_4 = l_Lean_Name_mkStr3(x_1, x_2, x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012_(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; uint8_t x_3; lean_object* x_4; 
+x_2 = l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3;
+x_3 = 0;
+x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
+return x_4;
+}
+}
 lean_object* initialize_Init(uint8_t builtin, lean_object*);
 lean_object* initialize_Lean_Compiler_LCNF_Simp_SimpM(uint8_t builtin, lean_object*);
 static bool _G_initialized = false;
@@ -1266,6 +1381,15 @@ l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2 = _init_l_Lean_Compile
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2);
 l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__3();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__3);
+l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1 = _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__1);
+l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2 = _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__2);
+l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3 = _init_l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012____closed__3);
+res = l_Lean_Compiler_LCNF_Simp_initFn____x40_Lean_Compiler_LCNF_Simp_InlineCandidate___hyg_1012_(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Simp/SimpM.c b/stage0/stdlib/Lean/Compiler/LCNF/Simp/SimpM.c
index 9aae4cbd94..94f68babf1 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Simp/SimpM.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Simp/SimpM.c
@@ -15,6 +15,7 @@ extern "C" {
 #endif
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__1;
 lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_restore(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(lean_object*, size_t, lean_object*);
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_subst___default;
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__5;
@@ -22,6 +23,8 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markSimplified___boxed(lean_o
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth(lean_object*);
 size_t lean_usize_add(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6;
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
 extern lean_object* l_Lean_Compiler_LCNF_anyTypeExpr;
 static lean_object* l_Lean_Compiler_LCNF_Simp_Context_ctorDiscrMap___default___closed__1;
@@ -37,7 +40,6 @@ LEAN_EXPORT lean_object* l_Lean_RBNode_ins___at_Lean_Compiler_LCNF_Simp_withDisc
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_getIndInfo_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l_Lean_Compiler_LCNF_mkLcCast(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markSimplified(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth(lean_object*);
 extern lean_object* l_Lean_maxRecDepthErrorMessage;
@@ -46,7 +48,10 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incVisited(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addFunOcc(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_sub(size_t, size_t);
 lean_object* lean_environment_find(lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
@@ -61,6 +66,7 @@ lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Name_mkStr3(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___rarg___closed__3;
 lean_object* l_Lean_getConstInfo___at___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isValidMacroInline___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withAddMustInline___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -70,7 +76,6 @@ lean_object* l_Lean_Compiler_LCNF_eraseLetDecl(lean_object*, lean_object*, lean_
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_betaReduce___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___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_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__10(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -83,10 +88,8 @@ static lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth__
 static lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10___closed__1;
 LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withDiscrCtor(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
@@ -123,7 +126,6 @@ static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___clo
 lean_object* l_Lean_RBNode_setBlack___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2;
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addFVarSubst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfoCtor___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInline___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -136,6 +138,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withIncRecDepth___rarg(lean_o
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_eraseFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__3;
@@ -144,17 +147,15 @@ static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__5;
 uint8_t l_Lean_Name_isInternal(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_shouldInlineLocal___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__9(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Code_internalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Simp_findExpr(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withDiscrCtor___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t l_Lean_Expr_hash(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_sort___override(lean_object*);
 lean_object* l_Lean_HashMap_insert___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__3(lean_object*, lean_object*, uint8_t);
 size_t lean_usize_shift_left(size_t, size_t);
@@ -163,14 +164,10 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addFunOcc___boxed(lean_object
 LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__7(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(lean_object*, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_mul(size_t, size_t);
-static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__1(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_RBNode_find___at_Lean_Compiler_LCNF_Simp_findCtor___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addMustInline(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Context_ctorDiscrMap___default;
@@ -196,9 +193,9 @@ static lean_object* l_Lean_Compiler_LCNF_Simp_getIndInfo_x3f___lambda__1___close
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__4;
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__4;
 static size_t l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__8___closed__2;
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvar___override(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8;
 static lean_object* l_Lean_Compiler_LCNF_Simp_Context_config___default___closed__1;
 lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_update(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_binderRenaming___default;
@@ -215,7 +212,6 @@ uint8_t l___private_Lean_Util_Trace_0__Lean_checkTraceOption(lean_object*, lean_
 uint8_t l_Lean_RBNode_isRed___rarg(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_toLocalContext(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_getConfig(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_RBNode_insert___at_Lean_Elab_Term_withAuxDecl___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_State_simplified___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Context_inlineStackOccs___default;
@@ -226,11 +222,12 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isAnyType(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___closed__1;
 lean_object* l_Lean_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_funDeclInfoMap___default;
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_betaReduce___spec__1___closed__2;
@@ -245,7 +242,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addFunHoOcc___boxed(lean_obje
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isSmall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__2;
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_eraseFunDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_used___default;
@@ -268,7 +264,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda_
 static lean_object* l_Lean_Compiler_LCNF_Simp_Context_inlineStackOccs___default___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__3;
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__3;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -278,6 +273,7 @@ LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDi
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Context_config___default;
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInline(lean_object*);
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_Context_config___default___closed__1() {
 _start:
@@ -6052,7 +6048,141 @@ return x_23;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(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; uint8_t x_7; 
+x_6 = lean_array_get_size(x_1);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_4);
+x_8 = lean_box(0);
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_array_fget(x_1, x_4);
+x_10 = lean_name_eq(x_5, x_9);
+lean_dec(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_add(x_4, x_11);
+lean_dec(x_4);
+x_3 = lean_box(0);
+x_4 = x_12;
+goto _start;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_array_fget(x_2, x_4);
+lean_dec(x_4);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+return x_15;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(lean_object* x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_4; size_t x_5; size_t x_6; size_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+lean_dec(x_1);
+x_5 = 5;
+x_6 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__8___closed__2;
+x_7 = lean_usize_land(x_2, x_6);
+x_8 = lean_usize_to_nat(x_7);
+x_9 = lean_box(2);
+x_10 = lean_array_get(x_9, x_4, x_8);
+lean_dec(x_8);
+lean_dec(x_4);
+switch (lean_obj_tag(x_10)) {
+case 0:
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = lean_name_eq(x_3, x_11);
+lean_dec(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_12);
+x_14 = lean_box(0);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_12);
+return x_15;
+}
+}
+case 1:
+{
+lean_object* x_16; size_t x_17; 
+x_16 = lean_ctor_get(x_10, 0);
+lean_inc(x_16);
+lean_dec(x_10);
+x_17 = lean_usize_shift_right(x_2, x_5);
+x_1 = x_16;
+x_2 = x_17;
+goto _start;
+}
+default: 
+{
+lean_object* x_19; 
+x_19 = lean_box(0);
+return x_19;
+}
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_dec(x_1);
+x_22 = lean_unsigned_to_nat(0u);
+x_23 = l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(x_20, x_21, lean_box(0), x_22, x_3);
+lean_dec(x_21);
+lean_dec(x_20);
+return x_23;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; uint64_t x_4; size_t x_5; lean_object* x_6; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+lean_dec(x_1);
+x_4 = l_Lean_Name_hash___override(x_2);
+x_5 = lean_uint64_to_usize(x_4);
+x_6 = l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_3, x_5, x_2);
+lean_dec(x_2);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(size_t 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; uint8_t x_8; 
@@ -6079,7 +6209,7 @@ x_17 = lean_usize_shift_right(x_12, x_16);
 x_18 = lean_unsigned_to_nat(1u);
 x_19 = lean_nat_add(x_5, x_18);
 lean_dec(x_5);
-x_20 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_6, x_17, x_1, x_9, x_10);
+x_20 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_6, x_17, x_1, x_9, x_10);
 x_4 = lean_box(0);
 x_5 = x_19;
 x_6 = x_20;
@@ -6087,7 +6217,7 @@ goto _start;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
@@ -6179,7 +6309,7 @@ return x_29;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -6292,7 +6422,7 @@ lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_3
 x_35 = lean_ctor_get(x_15, 0);
 x_36 = lean_usize_shift_right(x_2, x_9);
 x_37 = lean_usize_add(x_3, x_8);
-x_38 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_35, x_36, x_37, x_4, x_5);
+x_38 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_35, x_36, x_37, x_4, x_5);
 lean_ctor_set(x_15, 0, x_38);
 x_39 = lean_array_fset(x_17, x_12, x_15);
 lean_dec(x_12);
@@ -6307,7 +6437,7 @@ lean_inc(x_40);
 lean_dec(x_15);
 x_41 = lean_usize_shift_right(x_2, x_9);
 x_42 = lean_usize_add(x_3, x_8);
-x_43 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_40, x_41, x_42, x_4, x_5);
+x_43 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_40, x_41, x_42, x_4, x_5);
 x_44 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_44, 0, x_43);
 x_45 = lean_array_fset(x_17, x_12, x_44);
@@ -6423,7 +6553,7 @@ if (lean_is_exclusive(x_57)) {
 }
 x_73 = lean_usize_shift_right(x_2, x_50);
 x_74 = lean_usize_add(x_3, x_49);
-x_75 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_71, x_73, x_74, x_4, x_5);
+x_75 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_71, x_73, x_74, x_4, x_5);
 if (lean_is_scalar(x_72)) {
  x_76 = lean_alloc_ctor(1, 1, 0);
 } else {
@@ -6460,7 +6590,7 @@ if (x_82 == 0)
 {
 lean_object* x_83; lean_object* x_84; size_t x_85; uint8_t x_86; 
 x_83 = lean_unsigned_to_nat(0u);
-x_84 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(x_1, x_83, x_4, x_5);
+x_84 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(x_1, x_83, x_4, x_5);
 x_85 = 7;
 x_86 = lean_usize_dec_le(x_85, x_3);
 if (x_86 == 0)
@@ -6479,7 +6609,7 @@ x_91 = lean_ctor_get(x_84, 1);
 lean_inc(x_91);
 lean_dec(x_84);
 x_92 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__8___closed__3;
-x_93 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(x_3, x_90, x_91, lean_box(0), x_83, x_92);
+x_93 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(x_3, x_90, x_91, lean_box(0), x_83, x_92);
 lean_dec(x_91);
 lean_dec(x_90);
 return x_93;
@@ -6506,7 +6636,7 @@ x_96 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_96, 0, x_94);
 lean_ctor_set(x_96, 1, x_95);
 x_97 = lean_unsigned_to_nat(0u);
-x_98 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(x_96, x_97, x_4, x_5);
+x_98 = l_Lean_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(x_96, x_97, x_4, x_5);
 x_99 = 7;
 x_100 = lean_usize_dec_le(x_99, x_3);
 if (x_100 == 0)
@@ -6525,7 +6655,7 @@ x_105 = lean_ctor_get(x_98, 1);
 lean_inc(x_105);
 lean_dec(x_98);
 x_106 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__8___closed__3;
-x_107 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(x_3, x_104, x_105, lean_box(0), x_97, x_106);
+x_107 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(x_3, x_104, x_105, lean_box(0), x_97, x_106);
 lean_dec(x_105);
 lean_dec(x_104);
 return x_107;
@@ -6543,7 +6673,7 @@ return x_98;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; 
@@ -6556,7 +6686,7 @@ x_6 = lean_ctor_get(x_1, 1);
 x_7 = l_Lean_Name_hash___override(x_2);
 x_8 = lean_uint64_to_usize(x_7);
 x_9 = 1;
-x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_5, x_8, x_9, x_2, x_3);
+x_10 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_5, x_8, x_9, x_2, x_3);
 x_11 = lean_unsigned_to_nat(1u);
 x_12 = lean_nat_add(x_6, x_11);
 lean_dec(x_6);
@@ -6575,7 +6705,7 @@ lean_dec(x_1);
 x_15 = l_Lean_Name_hash___override(x_2);
 x_16 = lean_uint64_to_usize(x_15);
 x_17 = 1;
-x_18 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_13, x_16, x_17, x_2, x_3);
+x_18 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_13, x_16, x_17, x_2, x_3);
 x_19 = lean_unsigned_to_nat(1u);
 x_20 = lean_nat_add(x_14, x_19);
 lean_dec(x_14);
@@ -6586,7 +6716,7 @@ return x_21;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(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_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
@@ -6663,140 +6793,6 @@ return x_33;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(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; uint8_t x_7; 
-x_6 = lean_array_get_size(x_1);
-x_7 = lean_nat_dec_lt(x_4, x_6);
-lean_dec(x_6);
-if (x_7 == 0)
-{
-lean_object* x_8; 
-lean_dec(x_4);
-x_8 = lean_box(0);
-return x_8;
-}
-else
-{
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_array_fget(x_1, x_4);
-x_10 = lean_name_eq(x_5, x_9);
-lean_dec(x_9);
-if (x_10 == 0)
-{
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_unsigned_to_nat(1u);
-x_12 = lean_nat_add(x_4, x_11);
-lean_dec(x_4);
-x_3 = lean_box(0);
-x_4 = x_12;
-goto _start;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_array_fget(x_2, x_4);
-lean_dec(x_4);
-x_15 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_15, 0, x_14);
-return x_15;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(lean_object* x_1, size_t x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-lean_object* x_4; size_t x_5; size_t x_6; size_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-lean_dec(x_1);
-x_5 = 5;
-x_6 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__8___closed__2;
-x_7 = lean_usize_land(x_2, x_6);
-x_8 = lean_usize_to_nat(x_7);
-x_9 = lean_box(2);
-x_10 = lean_array_get(x_9, x_4, x_8);
-lean_dec(x_8);
-lean_dec(x_4);
-switch (lean_obj_tag(x_10)) {
-case 0:
-{
-lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = lean_name_eq(x_3, x_11);
-lean_dec(x_11);
-if (x_13 == 0)
-{
-lean_object* x_14; 
-lean_dec(x_12);
-x_14 = lean_box(0);
-return x_14;
-}
-else
-{
-lean_object* x_15; 
-x_15 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_15, 0, x_12);
-return x_15;
-}
-}
-case 1:
-{
-lean_object* x_16; size_t x_17; 
-x_16 = lean_ctor_get(x_10, 0);
-lean_inc(x_16);
-lean_dec(x_10);
-x_17 = lean_usize_shift_right(x_2, x_5);
-x_1 = x_16;
-x_2 = x_17;
-goto _start;
-}
-default: 
-{
-lean_object* x_19; 
-x_19 = lean_box(0);
-return x_19;
-}
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_20 = lean_ctor_get(x_1, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_1, 1);
-lean_inc(x_21);
-lean_dec(x_1);
-x_22 = lean_unsigned_to_nat(0u);
-x_23 = l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(x_20, x_21, lean_box(0), x_22, x_3);
-lean_dec(x_21);
-lean_dec(x_20);
-return x_23;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; uint64_t x_4; size_t x_5; lean_object* x_6; 
-x_3 = lean_ctor_get(x_1, 0);
-lean_inc(x_3);
-lean_dec(x_1);
-x_4 = l_Lean_Name_hash___override(x_2);
-x_5 = lean_uint64_to_usize(x_4);
-x_6 = l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(x_3, x_5, x_2);
-lean_dec(x_2);
-return x_6;
-}
-}
 static lean_object* _init_l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10___closed__1() {
 _start:
 {
@@ -6971,7 +6967,7 @@ lean_ctor_set(x_17, 1, x_16);
 x_18 = lean_ctor_get(x_5, 5);
 lean_inc(x_18);
 lean_dec(x_5);
-x_19 = l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(x_18, x_1, x_2);
+x_19 = l_Lean_PersistentHashMap_insert___at_Lean_Compiler_LCNF_Simp_withInlining___spec__5(x_18, x_1, x_2);
 x_20 = lean_alloc_ctor(0, 6, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_13);
@@ -7021,7 +7017,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes(", consider removing the attribute `[inline]` from this declaration or increasing the limit using `set_option compiler.maxRecInline <num>`", 137);
+x_1 = lean_mk_string_from_bytes(", consider removing the attribute `[inlineIfReduce]` from this declaration or increasing the limit using `set_option compiler.maxRecInlineIfReduce <num>`", 153);
 return x_1;
 }
 }
@@ -7034,263 +7030,158 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes(", consider removing the attribute `[inlineIfReduce]` from this declaration or increasing the limit using `set_option compiler.maxRecInlineIfReduce <num>`", 153);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2(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; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
 lean_dec(x_4);
-x_12 = l_Lean_Expr_getAppFn(x_1);
-lean_dec(x_1);
-if (lean_obj_tag(x_12) == 4)
+x_12 = lean_ctor_get(x_5, 5);
+lean_inc(x_12);
+lean_inc(x_1);
+x_13 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__2(x_12, x_1);
+x_14 = lean_st_ref_get(x_10, x_11);
+if (lean_obj_tag(x_13) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_80; lean_object* x_81; 
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-lean_dec(x_12);
-x_80 = lean_ctor_get(x_5, 5);
-lean_inc(x_80);
-lean_inc(x_13);
-x_81 = l_Lean_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(x_80, x_13);
-if (lean_obj_tag(x_81) == 0)
-{
-lean_object* x_82; 
-x_82 = lean_unsigned_to_nat(0u);
-x_14 = x_82;
-goto block_79;
+lean_object* x_56; 
+x_56 = lean_unsigned_to_nat(0u);
+x_15 = x_56;
+goto block_55;
 }
 else
 {
-lean_object* x_83; 
-x_83 = lean_ctor_get(x_81, 0);
-lean_inc(x_83);
-lean_dec(x_81);
-x_14 = x_83;
-goto block_79;
+lean_object* x_57; 
+x_57 = lean_ctor_get(x_13, 0);
+lean_inc(x_57);
+lean_dec(x_13);
+x_15 = x_57;
+goto block_55;
 }
-block_79:
+block_55:
 {
-lean_object* x_15; lean_object* x_16; 
-x_15 = lean_unsigned_to_nat(1u);
-x_16 = lean_nat_add(x_14, x_15);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_16 = lean_ctor_get(x_14, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_14, 1);
+lean_inc(x_17);
 lean_dec(x_14);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_add(x_15, x_18);
+lean_dec(x_15);
+x_20 = lean_ctor_get(x_16, 0);
+lean_inc(x_20);
+lean_dec(x_16);
+x_21 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_17);
 if (x_3 == 0)
 {
-lean_object* x_17; lean_object* x_18; 
-x_17 = lean_box(0);
-x_18 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_13, x_16, x_2, x_17, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-return x_18;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; uint8_t x_24; 
-x_19 = lean_st_ref_get(x_10, x_11);
-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 = lean_ctor_get(x_20, 0);
-lean_inc(x_22);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
 lean_dec(x_20);
-x_23 = 3;
-lean_inc(x_13);
-x_24 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_22, x_23, x_13);
-if (x_24 == 0)
+x_22 = lean_ctor_get(x_21, 1);
+lean_inc(x_22);
+lean_dec(x_21);
+x_23 = lean_box(0);
+x_24 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_1, x_19, x_2, x_23, x_5, x_6, x_7, x_8, x_9, x_10, x_22);
+return x_24;
+}
+else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
-x_25 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_21);
-x_26 = lean_ctor_get(x_25, 0);
+lean_object* x_25; lean_object* x_26; uint8_t x_27; uint8_t x_28; 
+x_25 = lean_ctor_get(x_21, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_21, 1);
 lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
-lean_inc(x_27);
+lean_dec(x_21);
+x_27 = 3;
+lean_inc(x_1);
+x_28 = l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_hasInlineAttrCore(x_20, x_27, x_1);
+if (x_28 == 0)
+{
+lean_object* x_29; lean_object* x_30; 
 lean_dec(x_25);
-x_28 = lean_ctor_get(x_26, 1);
-lean_inc(x_28);
-lean_dec(x_26);
-x_29 = lean_nat_dec_lt(x_28, x_16);
-lean_dec(x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; lean_object* x_31; 
-x_30 = lean_box(0);
-x_31 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_13, x_16, x_2, x_30, x_5, x_6, x_7, x_8, x_9, x_10, x_27);
-return x_31;
+x_29 = lean_box(0);
+x_30 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_1, x_19, x_2, x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_26);
+return x_30;
 }
 else
 {
-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; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
-lean_dec(x_16);
+lean_object* x_31; uint8_t x_32; 
+x_31 = lean_ctor_get(x_25, 2);
+lean_inc(x_31);
+lean_dec(x_25);
+x_32 = lean_nat_dec_lt(x_31, x_19);
+lean_dec(x_31);
+if (x_32 == 0)
+{
+lean_object* x_33; lean_object* x_34; 
+x_33 = lean_box(0);
+x_34 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_1, x_19, x_2, x_33, x_5, x_6, x_7, x_8, x_9, x_10, x_26);
+return x_34;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+lean_dec(x_19);
 lean_dec(x_2);
-x_32 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_27);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_35, 0, x_13);
-x_36 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__2;
-x_37 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_35);
-x_38 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__4;
-x_39 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_39, 0, x_37);
-lean_ctor_set(x_39, 1, x_38);
-x_40 = lean_ctor_get(x_33, 1);
-lean_inc(x_40);
-lean_dec(x_33);
-x_41 = l_Nat_repr(x_40);
-x_42 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_42, 0, x_41);
-x_43 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_43, 0, x_42);
-x_44 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_44, 0, x_39);
-lean_ctor_set(x_44, 1, x_43);
-x_45 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6;
-x_46 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_46, 0, x_44);
-lean_ctor_set(x_46, 1, x_45);
-x_47 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_46, x_5, x_6, x_7, x_8, x_9, x_10, x_34);
+x_35 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_26);
+x_36 = lean_ctor_get(x_35, 0);
+lean_inc(x_36);
+x_37 = lean_ctor_get(x_35, 1);
+lean_inc(x_37);
+lean_dec(x_35);
+x_38 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_38, 0, x_1);
+x_39 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__2;
+x_40 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_38);
+x_41 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__4;
+x_42 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+x_43 = lean_ctor_get(x_36, 2);
+lean_inc(x_43);
+lean_dec(x_36);
+x_44 = l_Nat_repr(x_43);
+x_45 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_45, 0, x_44);
+x_46 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_46, 0, x_45);
+x_47 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_47, 0, x_42);
+lean_ctor_set(x_47, 1, x_46);
+x_48 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6;
+x_49 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+x_50 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(x_49, x_5, x_6, x_7, x_8, x_9, x_10, x_37);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-x_48 = !lean_is_exclusive(x_47);
-if (x_48 == 0)
+x_51 = !lean_is_exclusive(x_50);
+if (x_51 == 0)
 {
-return x_47;
+return x_50;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_47, 0);
-x_50 = lean_ctor_get(x_47, 1);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_47);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
-}
-}
-}
-else
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_52 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_21);
-x_53 = lean_ctor_get(x_52, 0);
+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);
-x_54 = lean_ctor_get(x_52, 1);
-lean_inc(x_54);
-lean_dec(x_52);
-x_55 = lean_ctor_get(x_53, 2);
-lean_inc(x_55);
-lean_dec(x_53);
-x_56 = lean_nat_dec_lt(x_55, x_16);
-lean_dec(x_55);
-if (x_56 == 0)
-{
-lean_object* x_57; lean_object* x_58; 
-x_57 = lean_box(0);
-x_58 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__1(x_13, x_16, x_2, x_57, x_5, x_6, x_7, x_8, x_9, x_10, x_54);
-return x_58;
-}
-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_74; uint8_t x_75; 
-lean_dec(x_16);
-lean_dec(x_2);
-x_59 = l_Lean_Compiler_LCNF_getConfig(x_7, x_8, x_9, x_10, x_54);
-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_62 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_62, 0, x_13);
-x_63 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__2;
-x_64 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_64, 0, x_63);
-lean_ctor_set(x_64, 1, x_62);
-x_65 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__4;
-x_66 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
-x_67 = lean_ctor_get(x_60, 2);
-lean_inc(x_67);
-lean_dec(x_60);
-x_68 = l_Nat_repr(x_67);
-x_69 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_69, 0, x_68);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-x_71 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_71, 0, x_66);
-lean_ctor_set(x_71, 1, x_70);
-x_72 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8;
-x_73 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-x_74 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_73, x_5, x_6, x_7, x_8, x_9, x_10, x_61);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-x_75 = !lean_is_exclusive(x_74);
-if (x_75 == 0)
-{
-return x_74;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_74, 0);
-x_77 = lean_ctor_get(x_74, 1);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_dec(x_74);
-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_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
-{
-lean_object* x_84; 
-lean_dec(x_12);
-x_84 = lean_apply_7(x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-return x_84;
-}
-}
 }
 static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__1() {
 _start:
@@ -7331,7 +7222,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("inlining ", 9);
+x_1 = lean_mk_string_from_bytes("", 0);
 return x_1;
 }
 }
@@ -7344,68 +7235,66 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("", 0);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withInlining___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_11 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__4;
-x_12 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_11, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_unbox(x_13);
-lean_dec(x_13);
-if (x_14 == 0)
+lean_object* x_11; 
+x_11 = l_Lean_Expr_getAppFn(x_1);
+lean_dec(x_1);
+if (lean_obj_tag(x_11) == 4)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_ctor_get(x_12, 1);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+lean_dec(x_11);
+x_13 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__4;
+x_14 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_withInlining___spec__1(x_13, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-lean_dec(x_12);
-x_16 = lean_box(0);
-x_17 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2(x_1, x_3, x_2, x_16, x_4, x_5, x_6, x_7, x_8, x_9, x_15);
-return x_17;
+x_16 = lean_unbox(x_15);
+lean_dec(x_15);
+if (x_16 == 0)
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_14, 1);
+lean_inc(x_17);
+lean_dec(x_14);
+x_18 = lean_box(0);
+x_19 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2(x_12, x_3, x_2, x_18, x_4, x_5, x_6, x_7, x_8, x_9, x_17);
+return x_19;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_18 = lean_ctor_get(x_12, 1);
-lean_inc(x_18);
-lean_dec(x_12);
-lean_inc(x_1);
-x_19 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_19, 0, x_1);
-x_20 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6;
-x_21 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set(x_21, 1, x_19);
-x_22 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8;
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_20 = lean_ctor_get(x_14, 1);
+lean_inc(x_20);
+lean_dec(x_14);
+lean_inc(x_12);
+x_21 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_21, 0, x_12);
+x_22 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6;
 x_23 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-x_24 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_11, x_23, x_4, x_5, x_6, x_7, x_8, x_9, x_18);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_24, 1);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_21);
+x_24 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_22);
+x_25 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10(x_13, x_24, x_4, x_5, x_6, x_7, x_8, x_9, x_20);
+x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
-lean_dec(x_24);
-x_27 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2(x_1, x_3, x_2, x_25, x_4, x_5, x_6, x_7, x_8, x_9, x_26);
-return x_27;
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
+lean_dec(x_25);
+x_28 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2(x_12, x_3, x_2, x_26, x_4, x_5, x_6, x_7, x_8, x_9, x_27);
+return x_28;
+}
+}
+else
+{
+lean_object* x_29; 
+lean_dec(x_11);
+x_29 = lean_apply_7(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_29;
 }
 }
 }
@@ -7431,19 +7320,41 @@ lean_dec(x_2);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4___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_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; lean_object* x_5; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_1, x_4, x_3);
+lean_dec(x_3);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7___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:
 {
 size_t x_7; lean_object* x_8; 
 x_7 = lean_unbox_usize(x_1);
 lean_dec(x_1);
-x_8 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__4(x_7, x_2, x_3, x_4, x_5, x_6);
+x_8 = l_Lean_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_Simp_withInlining___spec__7(x_7, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 size_t x_6; size_t x_7; lean_object* x_8; 
@@ -7451,15 +7362,15 @@ x_6 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_7 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_8 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__3(x_1, x_6, x_7, x_4, x_5);
+x_8 = l_Lean_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_1, x_6, x_7, x_4, x_5);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6___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_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9___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_9; 
-x_9 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__6(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_9 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
@@ -7469,28 +7380,6 @@ lean_dec(x_2);
 return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9___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_Lean_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__9(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_6;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-size_t x_4; lean_object* x_5; 
-x_4 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_5 = l_Lean_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Simp_withInlining___spec__8(x_1, x_4, x_3);
-lean_dec(x_3);
-return x_5;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_withInlining___spec__10___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:
 {
@@ -8022,7 +7911,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecD
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7;
+x_1 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__5;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -8129,7 +8018,7 @@ x_30 = l_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___rarg___close
 x_31 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_31, 0, x_30);
 lean_ctor_set(x_31, 1, x_29);
-x_32 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8;
+x_32 = l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6;
 x_33 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_33, 0, x_31);
 lean_ctor_set(x_33, 1, x_32);
@@ -8747,41 +8636,35 @@ x_9 = l_Lean_Compiler_LCNF_getConfig(x_4, x_5, x_6, x_7, x_8);
 x_10 = !lean_is_exclusive(x_9);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; 
+lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; 
 x_11 = lean_ctor_get(x_9, 0);
-x_12 = lean_ctor_get(x_1, 4);
+x_12 = lean_ctor_get(x_11, 0);
 lean_inc(x_12);
-lean_dec(x_1);
-x_13 = lean_ctor_get(x_11, 0);
-lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l_Lean_Compiler_LCNF_Code_sizeLe(x_12, x_13);
-lean_dec(x_13);
-x_15 = lean_box(x_14);
-lean_ctor_set(x_9, 0, x_15);
+x_13 = l_Lean_Compiler_LCNF_Code_sizeLe(x_1, x_12);
+lean_dec(x_12);
+x_14 = lean_box(x_13);
+lean_ctor_set(x_9, 0, x_14);
 return x_9;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
-x_16 = lean_ctor_get(x_9, 0);
-x_17 = lean_ctor_get(x_9, 1);
-lean_inc(x_17);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; 
+x_15 = lean_ctor_get(x_9, 0);
+x_16 = lean_ctor_get(x_9, 1);
 lean_inc(x_16);
+lean_inc(x_15);
 lean_dec(x_9);
-x_18 = lean_ctor_get(x_1, 4);
-lean_inc(x_18);
-lean_dec(x_1);
-x_19 = lean_ctor_get(x_16, 0);
-lean_inc(x_19);
-lean_dec(x_16);
-x_20 = l_Lean_Compiler_LCNF_Code_sizeLe(x_18, x_19);
-lean_dec(x_19);
-x_21 = lean_box(x_20);
-x_22 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_17);
-return x_22;
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = l_Lean_Compiler_LCNF_Code_sizeLe(x_1, x_17);
+lean_dec(x_17);
+x_19 = lean_box(x_18);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_16);
+return x_20;
 }
 }
 }
@@ -8812,40 +8695,43 @@ x_12 = lean_unbox(x_11);
 lean_dec(x_11);
 if (x_12 == 0)
 {
-lean_object* x_13; lean_object* x_14; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
 x_13 = lean_ctor_get(x_10, 1);
 lean_inc(x_13);
 lean_dec(x_10);
-x_14 = l_Lean_Compiler_LCNF_Simp_isSmall(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_13);
-return x_14;
+x_14 = lean_ctor_get(x_1, 4);
+lean_inc(x_14);
+lean_dec(x_1);
+x_15 = l_Lean_Compiler_LCNF_Simp_isSmall(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_13);
+return x_15;
 }
 else
 {
-uint8_t x_15; 
+uint8_t x_16; 
 lean_dec(x_1);
-x_15 = !lean_is_exclusive(x_10);
-if (x_15 == 0)
+x_16 = !lean_is_exclusive(x_10);
+if (x_16 == 0)
 {
-lean_object* x_16; uint8_t x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_10, 0);
-lean_dec(x_16);
-x_17 = 1;
-x_18 = lean_box(x_17);
-lean_ctor_set(x_10, 0, x_18);
+lean_object* x_17; uint8_t x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_10, 0);
+lean_dec(x_17);
+x_18 = 1;
+x_19 = lean_box(x_18);
+lean_ctor_set(x_10, 0, x_19);
 return x_10;
 }
 else
 {
-lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
-x_19 = lean_ctor_get(x_10, 1);
-lean_inc(x_19);
+lean_object* x_20; uint8_t x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_10, 1);
+lean_inc(x_20);
 lean_dec(x_10);
-x_20 = 1;
-x_21 = lean_box(x_20);
-x_22 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_19);
-return x_22;
+x_21 = 1;
+x_22 = lean_box(x_21);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_20);
+return x_23;
 }
 }
 }
@@ -11092,10 +10978,6 @@ l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__5 = _init_l_
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__5);
 l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__6);
-l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__7);
-l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___lambda__2___closed__8);
 l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__1);
 l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__2();
@@ -11108,10 +10990,6 @@ l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__5 = _init_l_Lean_Compile
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__5);
 l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__6);
-l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__7);
-l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8 = _init_l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_withInlining___rarg___closed__8);
 l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__1 = _init_l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__1();
 lean_mark_persistent(l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__1);
 l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__2 = _init_l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_withIncRecDepth_throwMaxRecDepth___spec__2___closed__2();
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c b/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
index bcd81de157..929987558a 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
@@ -50,7 +50,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_shouldSpecialize(lean_o
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_Collector_collectCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913_(lean_object*);
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__3___closed__10;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
@@ -186,6 +186,7 @@ static lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_expandCodeDecls_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_visitCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Specialize_Collector_collectFVar___closed__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__4(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*);
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_expandCodeDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -201,7 +202,6 @@ lean_object* l_Lean_PersistentArray_push___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_Collector_collectCode___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Decl_isTemplateLike(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_shouldSpecialize___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___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*);
 static lean_object* l_Lean_Compiler_LCNF_Specialize_findSpecCache_x3f___closed__1;
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__8___closed__2;
@@ -7649,7 +7649,7 @@ goto _start;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_mkSpecDecl_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; size_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; size_t 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; size_t x_38; lean_object* x_39; size_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+lean_object* x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; size_t x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; uint8_t x_30; lean_object* x_31; lean_object* x_32; size_t 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; size_t x_40; lean_object* x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
 x_14 = lean_array_get_size(x_3);
 x_15 = lean_usize_of_nat(x_14);
 lean_dec(x_14);
@@ -7675,159 +7675,296 @@ lean_inc(x_25);
 x_27 = l_Array_toSubarray___rarg(x_2, x_26, x_25);
 x_28 = lean_ctor_get(x_6, 3);
 lean_inc(x_28);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_18);
-x_30 = lean_array_get_size(x_28);
-x_31 = lean_usize_of_nat(x_30);
-x_32 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Specialize_mkSpecDecl_go___spec__1(x_1, x_6, x_28, x_31, x_16, x_29, x_8, x_9, x_10, x_11, x_12, x_24);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = lean_ctor_get(x_33, 1);
+x_29 = lean_ctor_get_uint8(x_6, sizeof(void*)*5);
+x_30 = lean_ctor_get_uint8(x_6, sizeof(void*)*5 + 1);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_27);
+lean_ctor_set(x_31, 1, x_18);
+x_32 = lean_array_get_size(x_28);
+x_33 = lean_usize_of_nat(x_32);
+x_34 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Specialize_mkSpecDecl_go___spec__1(x_1, x_6, x_28, x_33, x_16, x_31, x_8, x_9, x_10, x_11, x_12, x_24);
+x_35 = lean_ctor_get(x_34, 0);
 lean_inc(x_35);
-lean_dec(x_33);
-x_36 = l_Array_toSubarray___rarg(x_28, x_25, x_30);
-x_37 = lean_ctor_get(x_36, 2);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = lean_ctor_get(x_35, 1);
 lean_inc(x_37);
-x_38 = lean_usize_of_nat(x_37);
-lean_dec(x_37);
-x_39 = lean_ctor_get(x_36, 1);
+lean_dec(x_35);
+x_38 = l_Array_toSubarray___rarg(x_28, x_25, x_32);
+x_39 = lean_ctor_get(x_38, 2);
 lean_inc(x_39);
 x_40 = lean_usize_of_nat(x_39);
 lean_dec(x_39);
-x_41 = l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Specialize_mkSpecDecl_go___spec__2(x_1, x_6, x_36, x_38, x_40, x_35, x_8, x_9, x_10, x_11, x_12, x_34);
-lean_dec(x_36);
-x_42 = lean_ctor_get(x_41, 0);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
-lean_inc(x_43);
+x_41 = lean_ctor_get(x_38, 1);
+lean_inc(x_41);
+x_42 = lean_usize_of_nat(x_41);
 lean_dec(x_41);
-x_44 = l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(x_6, x_1);
-x_45 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_44, x_8, x_9, x_10, x_11, x_12, x_43);
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
-lean_inc(x_47);
-lean_dec(x_45);
-x_48 = l_Lean_Compiler_LCNF_attachCodeDecls(x_23, x_46);
+x_43 = l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Specialize_mkSpecDecl_go___spec__2(x_1, x_6, x_38, x_40, x_42, x_37, x_8, x_9, x_10, x_11, x_12, x_36);
+lean_dec(x_38);
+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_6);
+x_46 = l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(x_6, x_1);
+x_47 = !lean_is_exclusive(x_6);
+if (x_47 == 0)
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_48 = lean_ctor_get(x_6, 4);
+lean_dec(x_48);
+x_49 = lean_ctor_get(x_6, 3);
+lean_dec(x_49);
+x_50 = lean_ctor_get(x_6, 2);
+lean_dec(x_50);
+x_51 = lean_ctor_get(x_6, 1);
+lean_dec(x_51);
+x_52 = lean_ctor_get(x_6, 0);
+lean_dec(x_52);
+x_53 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_46, x_8, x_9, x_10, x_11, x_12, x_45);
+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_Lean_Compiler_LCNF_attachCodeDecls(x_23, x_54);
 lean_dec(x_23);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-lean_inc(x_48);
-x_49 = l_Lean_Compiler_LCNF_Code_inferType(x_48, x_9, x_10, x_11, x_12, x_47);
-if (lean_obj_tag(x_49) == 0)
+lean_inc(x_56);
+x_57 = l_Lean_Compiler_LCNF_Code_inferType(x_56, x_9, x_10, x_11, x_12, x_55);
+if (lean_obj_tag(x_57) == 0)
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-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);
-lean_inc(x_42);
-x_52 = l_Lean_Compiler_LCNF_mkForallParams(x_42, x_50, x_9, x_10, x_11, x_12, x_51);
-if (lean_obj_tag(x_52) == 0)
-{
-uint8_t x_53; 
-x_53 = !lean_is_exclusive(x_52);
-if (x_53 == 0)
-{
-lean_object* x_54; uint8_t x_55; lean_object* x_56; lean_object* x_57; 
-x_54 = lean_ctor_get(x_52, 0);
-x_55 = 0;
-x_56 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_56, 0, x_7);
-lean_ctor_set(x_56, 1, x_5);
-lean_ctor_set(x_56, 2, x_54);
-lean_ctor_set(x_56, 3, x_42);
-lean_ctor_set(x_56, 4, x_48);
-lean_ctor_set_uint8(x_56, sizeof(void*)*5, x_55);
-x_57 = l_Lean_Compiler_LCNF_Decl_setLevelParams(x_56);
-lean_ctor_set(x_52, 0, x_57);
-return x_52;
-}
-else
-{
-lean_object* x_58; lean_object* x_59; uint8_t x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_58 = lean_ctor_get(x_52, 0);
-x_59 = lean_ctor_get(x_52, 1);
-lean_inc(x_59);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
-lean_dec(x_52);
-x_60 = 0;
-x_61 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_61, 0, x_7);
-lean_ctor_set(x_61, 1, x_5);
-lean_ctor_set(x_61, 2, x_58);
-lean_ctor_set(x_61, 3, x_42);
-lean_ctor_set(x_61, 4, x_48);
-lean_ctor_set_uint8(x_61, sizeof(void*)*5, x_60);
-x_62 = l_Lean_Compiler_LCNF_Decl_setLevelParams(x_61);
-x_63 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_59);
-return x_63;
-}
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+lean_inc(x_44);
+x_60 = l_Lean_Compiler_LCNF_mkForallParams(x_44, x_58, x_9, x_10, x_11, x_12, x_59);
+if (lean_obj_tag(x_60) == 0)
+{
+uint8_t x_61; 
+x_61 = !lean_is_exclusive(x_60);
+if (x_61 == 0)
+{
+lean_object* x_62; lean_object* x_63; 
+x_62 = lean_ctor_get(x_60, 0);
+lean_ctor_set(x_6, 4, x_56);
+lean_ctor_set(x_6, 3, x_44);
+lean_ctor_set(x_6, 2, x_62);
+lean_ctor_set(x_6, 1, x_5);
+lean_ctor_set(x_6, 0, x_7);
+x_63 = l_Lean_Compiler_LCNF_Decl_setLevelParams(x_6);
+lean_ctor_set(x_60, 0, x_63);
+return x_60;
 }
 else
 {
-uint8_t x_64; 
-lean_dec(x_48);
-lean_dec(x_42);
-lean_dec(x_7);
-lean_dec(x_5);
-x_64 = !lean_is_exclusive(x_52);
-if (x_64 == 0)
-{
-return x_52;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_65 = lean_ctor_get(x_52, 0);
-x_66 = lean_ctor_get(x_52, 1);
-lean_inc(x_66);
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_64 = lean_ctor_get(x_60, 0);
+x_65 = lean_ctor_get(x_60, 1);
 lean_inc(x_65);
-lean_dec(x_52);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_66);
+lean_inc(x_64);
+lean_dec(x_60);
+lean_ctor_set(x_6, 4, x_56);
+lean_ctor_set(x_6, 3, x_44);
+lean_ctor_set(x_6, 2, x_64);
+lean_ctor_set(x_6, 1, x_5);
+lean_ctor_set(x_6, 0, x_7);
+x_66 = l_Lean_Compiler_LCNF_Decl_setLevelParams(x_6);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_65);
 return x_67;
 }
 }
-}
 else
 {
 uint8_t x_68; 
-lean_dec(x_48);
-lean_dec(x_42);
+lean_dec(x_56);
+lean_free_object(x_6);
+lean_dec(x_44);
+lean_dec(x_7);
+lean_dec(x_5);
+x_68 = !lean_is_exclusive(x_60);
+if (x_68 == 0)
+{
+return x_60;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_60, 0);
+x_70 = lean_ctor_get(x_60, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_60);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+}
+else
+{
+uint8_t x_72; 
+lean_dec(x_56);
+lean_free_object(x_6);
+lean_dec(x_44);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_7);
 lean_dec(x_5);
-x_68 = !lean_is_exclusive(x_49);
-if (x_68 == 0)
+x_72 = !lean_is_exclusive(x_57);
+if (x_72 == 0)
 {
-return x_49;
+return x_57;
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; 
-x_69 = lean_ctor_get(x_49, 0);
-x_70 = lean_ctor_get(x_49, 1);
-lean_inc(x_70);
-lean_inc(x_69);
-lean_dec(x_49);
-x_71 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_71, 0, x_69);
-lean_ctor_set(x_71, 1, x_70);
-return x_71;
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_57, 0);
+x_74 = lean_ctor_get(x_57, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_57);
+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_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+lean_dec(x_6);
+x_76 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_46, x_8, x_9, x_10, x_11, x_12, x_45);
+x_77 = lean_ctor_get(x_76, 0);
+lean_inc(x_77);
+x_78 = lean_ctor_get(x_76, 1);
+lean_inc(x_78);
+lean_dec(x_76);
+x_79 = l_Lean_Compiler_LCNF_attachCodeDecls(x_23, x_77);
+lean_dec(x_23);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_79);
+x_80 = l_Lean_Compiler_LCNF_Code_inferType(x_79, x_9, x_10, x_11, x_12, x_78);
+if (lean_obj_tag(x_80) == 0)
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_80, 1);
+lean_inc(x_82);
+lean_dec(x_80);
+lean_inc(x_44);
+x_83 = l_Lean_Compiler_LCNF_mkForallParams(x_44, x_81, x_9, x_10, x_11, x_12, x_82);
+if (lean_obj_tag(x_83) == 0)
+{
+lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_84 = lean_ctor_get(x_83, 0);
+lean_inc(x_84);
+x_85 = lean_ctor_get(x_83, 1);
+lean_inc(x_85);
+if (lean_is_exclusive(x_83)) {
+ lean_ctor_release(x_83, 0);
+ lean_ctor_release(x_83, 1);
+ x_86 = x_83;
+} else {
+ lean_dec_ref(x_83);
+ x_86 = lean_box(0);
+}
+x_87 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_87, 0, x_7);
+lean_ctor_set(x_87, 1, x_5);
+lean_ctor_set(x_87, 2, x_84);
+lean_ctor_set(x_87, 3, x_44);
+lean_ctor_set(x_87, 4, x_79);
+lean_ctor_set_uint8(x_87, sizeof(void*)*5, x_29);
+lean_ctor_set_uint8(x_87, sizeof(void*)*5 + 1, x_30);
+x_88 = l_Lean_Compiler_LCNF_Decl_setLevelParams(x_87);
+if (lean_is_scalar(x_86)) {
+ x_89 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_89 = x_86;
+}
+lean_ctor_set(x_89, 0, x_88);
+lean_ctor_set(x_89, 1, x_85);
+return x_89;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_dec(x_79);
+lean_dec(x_44);
+lean_dec(x_7);
+lean_dec(x_5);
+x_90 = lean_ctor_get(x_83, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_83, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_83)) {
+ lean_ctor_release(x_83, 0);
+ lean_ctor_release(x_83, 1);
+ x_92 = x_83;
+} else {
+ lean_dec_ref(x_83);
+ x_92 = lean_box(0);
+}
+if (lean_is_scalar(x_92)) {
+ x_93 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_93 = x_92;
+}
+lean_ctor_set(x_93, 0, x_90);
+lean_ctor_set(x_93, 1, x_91);
+return x_93;
+}
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+lean_dec(x_79);
+lean_dec(x_44);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_5);
+x_94 = lean_ctor_get(x_80, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_80, 1);
+lean_inc(x_95);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_96 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_96 = lean_box(0);
+}
+if (lean_is_scalar(x_96)) {
+ x_97 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_97 = x_96;
+}
+lean_ctor_set(x_97, 0, x_94);
+lean_ctor_set(x_97, 1, x_95);
+return x_97;
 }
 }
 }
@@ -8829,7 +8966,7 @@ lean_inc(x_10);
 x_30 = l_Lean_Compiler_LCNF_Decl_simp(x_27, x_29, x_10, x_11, x_12, x_13, x_28);
 if (lean_obj_tag(x_30) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+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_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
 x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
 x_32 = lean_ctor_get(x_30, 1);
@@ -8839,180 +8976,180 @@ x_33 = lean_ctor_get(x_31, 3);
 lean_inc(x_33);
 x_34 = lean_ctor_get(x_31, 4);
 lean_inc(x_34);
-x_60 = lean_ctor_get(x_31, 0);
-lean_inc(x_60);
-x_61 = lean_array_get_size(x_33);
-x_62 = lean_unsigned_to_nat(0u);
-x_63 = lean_nat_dec_lt(x_62, x_61);
-if (x_63 == 0)
+x_61 = lean_ctor_get(x_31, 0);
+lean_inc(x_61);
+x_62 = lean_array_get_size(x_33);
+x_63 = lean_unsigned_to_nat(0u);
+x_64 = lean_nat_dec_lt(x_63, x_62);
+if (x_64 == 0)
 {
-lean_object* x_64; lean_object* x_65; 
-lean_dec(x_61);
+lean_object* x_65; lean_object* x_66; 
+lean_dec(x_62);
 lean_inc(x_5);
-x_64 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_64, 0, x_5);
-lean_ctor_set(x_64, 1, x_5);
-lean_ctor_set(x_64, 2, x_60);
+x_65 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_65, 0, x_5);
+lean_ctor_set(x_65, 1, x_5);
+lean_ctor_set(x_65, 2, x_61);
 lean_inc(x_13);
 lean_inc(x_9);
-x_65 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_64, x_9, x_10, x_11, x_12, x_13, x_32);
-if (lean_obj_tag(x_65) == 0)
+x_66 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_65, x_9, x_10, x_11, x_12, x_13, x_32);
+if (lean_obj_tag(x_66) == 0)
 {
-lean_object* x_66; lean_object* x_67; 
-x_66 = lean_ctor_get(x_65, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_65, 1);
+lean_object* x_67; lean_object* x_68; 
+x_67 = lean_ctor_get(x_66, 0);
 lean_inc(x_67);
-lean_dec(x_65);
-x_35 = x_66;
-x_36 = x_67;
-goto block_59;
+x_68 = lean_ctor_get(x_66, 1);
+lean_inc(x_68);
+lean_dec(x_66);
+x_35 = x_67;
+x_36 = x_68;
+goto block_60;
 }
 else
 {
-uint8_t x_68; 
+uint8_t x_69; 
 lean_dec(x_33);
 lean_dec(x_31);
 lean_dec(x_13);
 lean_dec(x_9);
 lean_dec(x_4);
 lean_dec(x_3);
-x_68 = !lean_is_exclusive(x_65);
-if (x_68 == 0)
+x_69 = !lean_is_exclusive(x_66);
+if (x_69 == 0)
 {
-return x_65;
+return x_66;
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; 
-x_69 = lean_ctor_get(x_65, 0);
-x_70 = lean_ctor_get(x_65, 1);
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_66, 0);
+x_71 = lean_ctor_get(x_66, 1);
+lean_inc(x_71);
 lean_inc(x_70);
-lean_inc(x_69);
-lean_dec(x_65);
-x_71 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_71, 0, x_69);
-lean_ctor_set(x_71, 1, x_70);
-return x_71;
+lean_dec(x_66);
+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_72; 
-x_72 = lean_nat_dec_le(x_61, x_61);
-if (x_72 == 0)
+uint8_t x_73; 
+x_73 = lean_nat_dec_le(x_62, x_62);
+if (x_73 == 0)
 {
-lean_object* x_73; lean_object* x_74; 
-lean_dec(x_61);
+lean_object* x_74; lean_object* x_75; 
+lean_dec(x_62);
 lean_inc(x_5);
-x_73 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_73, 0, x_5);
-lean_ctor_set(x_73, 1, x_5);
-lean_ctor_set(x_73, 2, x_60);
+x_74 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_74, 0, x_5);
+lean_ctor_set(x_74, 1, x_5);
+lean_ctor_set(x_74, 2, x_61);
 lean_inc(x_13);
 lean_inc(x_9);
-x_74 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_73, x_9, x_10, x_11, x_12, x_13, x_32);
-if (lean_obj_tag(x_74) == 0)
+x_75 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_74, x_9, x_10, x_11, x_12, x_13, x_32);
+if (lean_obj_tag(x_75) == 0)
 {
-lean_object* x_75; lean_object* x_76; 
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
+lean_object* x_76; lean_object* x_77; 
+x_76 = lean_ctor_get(x_75, 0);
 lean_inc(x_76);
-lean_dec(x_74);
-x_35 = x_75;
-x_36 = x_76;
-goto block_59;
+x_77 = lean_ctor_get(x_75, 1);
+lean_inc(x_77);
+lean_dec(x_75);
+x_35 = x_76;
+x_36 = x_77;
+goto block_60;
 }
 else
 {
-uint8_t x_77; 
+uint8_t x_78; 
 lean_dec(x_33);
 lean_dec(x_31);
 lean_dec(x_13);
 lean_dec(x_9);
 lean_dec(x_4);
 lean_dec(x_3);
-x_77 = !lean_is_exclusive(x_74);
-if (x_77 == 0)
+x_78 = !lean_is_exclusive(x_75);
+if (x_78 == 0)
 {
-return x_74;
+return x_75;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_74, 0);
-x_79 = lean_ctor_get(x_74, 1);
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_75, 0);
+x_80 = lean_ctor_get(x_75, 1);
+lean_inc(x_80);
 lean_inc(x_79);
-lean_inc(x_78);
-lean_dec(x_74);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
-return x_80;
+lean_dec(x_75);
+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;
 }
 }
 }
 else
 {
-size_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_81 = lean_usize_of_nat(x_61);
-lean_dec(x_61);
+size_t x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_82 = lean_usize_of_nat(x_62);
+lean_dec(x_62);
 lean_inc(x_5);
-x_82 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__5___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__6(x_33, x_6, x_81, x_5);
-x_83 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_83, 0, x_82);
-lean_ctor_set(x_83, 1, x_5);
-lean_ctor_set(x_83, 2, x_60);
+x_83 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__5___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__6(x_33, x_6, x_82, x_5);
+x_84 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_84, 0, x_83);
+lean_ctor_set(x_84, 1, x_5);
+lean_ctor_set(x_84, 2, x_61);
 lean_inc(x_13);
 lean_inc(x_9);
-x_84 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_83, x_9, x_10, x_11, x_12, x_13, x_32);
-if (lean_obj_tag(x_84) == 0)
+x_85 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_34, x_84, x_9, x_10, x_11, x_12, x_13, x_32);
+if (lean_obj_tag(x_85) == 0)
 {
-lean_object* x_85; lean_object* x_86; 
-x_85 = lean_ctor_get(x_84, 0);
-lean_inc(x_85);
-x_86 = lean_ctor_get(x_84, 1);
+lean_object* x_86; lean_object* x_87; 
+x_86 = lean_ctor_get(x_85, 0);
 lean_inc(x_86);
-lean_dec(x_84);
-x_35 = x_85;
-x_36 = x_86;
-goto block_59;
+x_87 = lean_ctor_get(x_85, 1);
+lean_inc(x_87);
+lean_dec(x_85);
+x_35 = x_86;
+x_36 = x_87;
+goto block_60;
 }
 else
 {
-uint8_t x_87; 
+uint8_t x_88; 
 lean_dec(x_33);
 lean_dec(x_31);
 lean_dec(x_13);
 lean_dec(x_9);
 lean_dec(x_4);
 lean_dec(x_3);
-x_87 = !lean_is_exclusive(x_84);
-if (x_87 == 0)
+x_88 = !lean_is_exclusive(x_85);
+if (x_88 == 0)
 {
-return x_84;
+return x_85;
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_88 = lean_ctor_get(x_84, 0);
-x_89 = lean_ctor_get(x_84, 1);
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_85, 0);
+x_90 = lean_ctor_get(x_85, 1);
+lean_inc(x_90);
 lean_inc(x_89);
-lean_inc(x_88);
-lean_dec(x_84);
-x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_88);
-lean_ctor_set(x_90, 1, x_89);
-return x_90;
+lean_dec(x_85);
+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;
 }
 }
 }
 }
-block_59:
+block_60:
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t 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; uint8_t x_49; 
+lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
 x_37 = lean_ctor_get(x_31, 0);
 lean_inc(x_37);
 x_38 = lean_ctor_get(x_31, 1);
@@ -9020,62 +9157,64 @@ lean_inc(x_38);
 x_39 = lean_ctor_get(x_31, 2);
 lean_inc(x_39);
 x_40 = lean_ctor_get_uint8(x_31, sizeof(void*)*5);
+x_41 = lean_ctor_get_uint8(x_31, sizeof(void*)*5 + 1);
 lean_dec(x_31);
 lean_inc(x_37);
-x_41 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_41, 0, x_37);
-lean_ctor_set(x_41, 1, x_38);
-lean_ctor_set(x_41, 2, x_39);
-lean_ctor_set(x_41, 3, x_33);
-lean_ctor_set(x_41, 4, x_35);
-lean_ctor_set_uint8(x_41, sizeof(void*)*5, x_40);
-x_42 = lean_st_ref_get(x_13, x_36);
+x_42 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_42, 0, x_37);
+lean_ctor_set(x_42, 1, x_38);
+lean_ctor_set(x_42, 2, x_39);
+lean_ctor_set(x_42, 3, x_33);
+lean_ctor_set(x_42, 4, x_35);
+lean_ctor_set_uint8(x_42, sizeof(void*)*5, x_40);
+lean_ctor_set_uint8(x_42, sizeof(void*)*5 + 1, x_41);
+x_43 = lean_st_ref_get(x_13, x_36);
 lean_dec(x_13);
-x_43 = lean_ctor_get(x_42, 1);
-lean_inc(x_43);
-lean_dec(x_42);
-x_44 = lean_st_ref_take(x_9, x_43);
-x_45 = lean_ctor_get(x_44, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_44, 1);
+x_44 = lean_ctor_get(x_43, 1);
+lean_inc(x_44);
+lean_dec(x_43);
+x_45 = lean_st_ref_take(x_9, x_44);
+x_46 = lean_ctor_get(x_45, 0);
 lean_inc(x_46);
-lean_dec(x_44);
-x_47 = lean_array_push(x_45, x_41);
-x_48 = lean_st_ref_set(x_9, x_47, x_46);
+x_47 = lean_ctor_get(x_45, 1);
+lean_inc(x_47);
+lean_dec(x_45);
+x_48 = lean_array_push(x_46, x_42);
+x_49 = lean_st_ref_set(x_9, x_48, x_47);
 lean_dec(x_9);
-x_49 = !lean_is_exclusive(x_48);
-if (x_49 == 0)
+x_50 = !lean_is_exclusive(x_49);
+if (x_50 == 0)
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_50 = lean_ctor_get(x_48, 0);
-lean_dec(x_50);
-x_51 = l_Lean_Expr_const___override(x_37, x_3);
-x_52 = l_Lean_mkAppN(x_51, x_4);
-x_53 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_48, 0, x_53);
-return x_48;
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_51 = lean_ctor_get(x_49, 0);
+lean_dec(x_51);
+x_52 = l_Lean_Expr_const___override(x_37, x_3);
+x_53 = l_Lean_mkAppN(x_52, x_4);
+x_54 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_49, 0, x_54);
+return x_49;
 }
 else
 {
-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_48, 1);
-lean_inc(x_54);
-lean_dec(x_48);
-x_55 = l_Lean_Expr_const___override(x_37, x_3);
-x_56 = l_Lean_mkAppN(x_55, x_4);
-x_57 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_57, 0, x_56);
-x_58 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_55 = lean_ctor_get(x_49, 1);
+lean_inc(x_55);
+lean_dec(x_49);
+x_56 = l_Lean_Expr_const___override(x_37, x_3);
+x_57 = l_Lean_mkAppN(x_56, x_4);
+x_58 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_54);
-return x_58;
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_58);
+lean_ctor_set(x_59, 1, x_55);
+return x_59;
 }
 }
 }
 else
 {
-uint8_t x_91; 
+uint8_t x_92; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -9084,29 +9223,29 @@ lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_91 = !lean_is_exclusive(x_30);
-if (x_91 == 0)
+x_92 = !lean_is_exclusive(x_30);
+if (x_92 == 0)
 {
 return x_30;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_30, 0);
-x_93 = lean_ctor_get(x_30, 1);
+lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+x_93 = lean_ctor_get(x_30, 0);
+x_94 = lean_ctor_get(x_30, 1);
+lean_inc(x_94);
 lean_inc(x_93);
-lean_inc(x_92);
 lean_dec(x_30);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_92);
-lean_ctor_set(x_94, 1, x_93);
-return x_94;
+x_95 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_95, 0, x_93);
+lean_ctor_set(x_95, 1, x_94);
+return x_95;
 }
 }
 }
 else
 {
-uint8_t x_95; 
+uint8_t x_96; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -9115,29 +9254,29 @@ lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_95 = !lean_is_exclusive(x_26);
-if (x_95 == 0)
+x_96 = !lean_is_exclusive(x_26);
+if (x_96 == 0)
 {
 return x_26;
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_26, 0);
-x_97 = lean_ctor_get(x_26, 1);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_26, 0);
+x_98 = lean_ctor_get(x_26, 1);
+lean_inc(x_98);
 lean_inc(x_97);
-lean_inc(x_96);
 lean_dec(x_26);
-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;
+x_99 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_99, 0, x_97);
+lean_ctor_set(x_99, 1, x_98);
+return x_99;
 }
 }
 }
 else
 {
-uint8_t x_99; 
+uint8_t x_100; 
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -9146,23 +9285,23 @@ lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_99 = !lean_is_exclusive(x_20);
-if (x_99 == 0)
+x_100 = !lean_is_exclusive(x_20);
+if (x_100 == 0)
 {
 return x_20;
 }
 else
 {
-lean_object* x_100; lean_object* x_101; lean_object* x_102; 
-x_100 = lean_ctor_get(x_20, 0);
-x_101 = lean_ctor_get(x_20, 1);
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_20, 0);
+x_102 = lean_ctor_get(x_20, 1);
+lean_inc(x_102);
 lean_inc(x_101);
-lean_inc(x_100);
 lean_dec(x_20);
-x_102 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_102, 0, x_100);
-lean_ctor_set(x_102, 1, x_101);
-return x_102;
+x_103 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_103, 0, x_101);
+lean_ctor_set(x_103, 1, x_102);
+return x_103;
 }
 }
 }
@@ -9307,7 +9446,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Compiler_LCNF_Specialize_Collector_collectFVar___closed__1;
 x_2 = l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__3___closed__14;
-x_3 = lean_unsigned_to_nat(363u);
+x_3 = lean_unsigned_to_nat(365u);
 x_4 = lean_unsigned_to_nat(4u);
 x_5 = l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__3___closed__13;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9338,7 +9477,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Compiler_LCNF_Specialize_Collector_collectFVar___closed__1;
 x_2 = l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__3___closed__14;
-x_3 = lean_unsigned_to_nat(362u);
+x_3 = lean_unsigned_to_nat(364u);
 x_4 = lean_unsigned_to_nat(4u);
 x_5 = l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__3___closed__17;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13196,261 +13335,265 @@ return x_102;
 }
 else
 {
-lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; uint8_t x_115; 
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; uint8_t x_108; uint8_t x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; uint8_t x_116; 
 x_103 = lean_ctor_get(x_1, 0);
 x_104 = lean_ctor_get(x_1, 1);
 x_105 = lean_ctor_get(x_1, 2);
 x_106 = lean_ctor_get(x_1, 3);
 x_107 = lean_ctor_get(x_1, 4);
 x_108 = lean_ctor_get_uint8(x_1, sizeof(void*)*5);
+x_109 = lean_ctor_get_uint8(x_1, sizeof(void*)*5 + 1);
 lean_inc(x_107);
 lean_inc(x_106);
 lean_inc(x_105);
 lean_inc(x_104);
 lean_inc(x_103);
 lean_dec(x_1);
-x_109 = lean_ctor_get(x_2, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_2, 1);
+x_110 = lean_ctor_get(x_2, 0);
 lean_inc(x_110);
-x_111 = lean_ctor_get(x_2, 2);
+x_111 = lean_ctor_get(x_2, 1);
 lean_inc(x_111);
+x_112 = lean_ctor_get(x_2, 2);
+lean_inc(x_112);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
  lean_ctor_release(x_2, 1);
  lean_ctor_release(x_2, 2);
- x_112 = x_2;
+ x_113 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_112 = lean_box(0);
+ x_113 = lean_box(0);
 }
-x_113 = lean_array_get_size(x_106);
-x_114 = lean_unsigned_to_nat(0u);
-x_115 = lean_nat_dec_lt(x_114, x_113);
-if (x_115 == 0)
+x_114 = lean_array_get_size(x_106);
+x_115 = lean_unsigned_to_nat(0u);
+x_116 = lean_nat_dec_lt(x_115, x_114);
+if (x_116 == 0)
 {
-lean_object* x_116; lean_object* x_117; 
-lean_dec(x_113);
-if (lean_is_scalar(x_112)) {
- x_116 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_117; lean_object* x_118; 
+lean_dec(x_114);
+if (lean_is_scalar(x_113)) {
+ x_117 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_116 = x_112;
+ x_117 = x_113;
 }
-lean_ctor_set(x_116, 0, x_109);
-lean_ctor_set(x_116, 1, x_110);
-lean_ctor_set(x_116, 2, x_111);
-x_117 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_116, x_3, x_4, x_5, x_6, x_7, x_12);
-if (lean_obj_tag(x_117) == 0)
+lean_ctor_set(x_117, 0, x_110);
+lean_ctor_set(x_117, 1, x_111);
+lean_ctor_set(x_117, 2, x_112);
+x_118 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_117, x_3, x_4, x_5, x_6, x_7, x_12);
+if (lean_obj_tag(x_118) == 0)
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-x_118 = lean_ctor_get(x_117, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_117, 1);
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+x_119 = lean_ctor_get(x_118, 0);
 lean_inc(x_119);
-if (lean_is_exclusive(x_117)) {
- lean_ctor_release(x_117, 0);
- lean_ctor_release(x_117, 1);
- x_120 = x_117;
+x_120 = lean_ctor_get(x_118, 1);
+lean_inc(x_120);
+if (lean_is_exclusive(x_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_121 = x_118;
 } else {
- lean_dec_ref(x_117);
- x_120 = lean_box(0);
+ lean_dec_ref(x_118);
+ x_121 = lean_box(0);
 }
-x_121 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_121, 0, x_103);
-lean_ctor_set(x_121, 1, x_104);
-lean_ctor_set(x_121, 2, x_105);
-lean_ctor_set(x_121, 3, x_106);
-lean_ctor_set(x_121, 4, x_118);
-lean_ctor_set_uint8(x_121, sizeof(void*)*5, x_108);
-if (lean_is_scalar(x_120)) {
- x_122 = lean_alloc_ctor(0, 2, 0);
+x_122 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_122, 0, x_103);
+lean_ctor_set(x_122, 1, x_104);
+lean_ctor_set(x_122, 2, x_105);
+lean_ctor_set(x_122, 3, x_106);
+lean_ctor_set(x_122, 4, x_119);
+lean_ctor_set_uint8(x_122, sizeof(void*)*5, x_108);
+lean_ctor_set_uint8(x_122, sizeof(void*)*5 + 1, x_109);
+if (lean_is_scalar(x_121)) {
+ x_123 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_122 = x_120;
+ x_123 = x_121;
 }
-lean_ctor_set(x_122, 0, x_121);
-lean_ctor_set(x_122, 1, x_119);
-return x_122;
+lean_ctor_set(x_123, 0, x_122);
+lean_ctor_set(x_123, 1, x_120);
+return x_123;
 }
 else
 {
-lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
 lean_dec(x_106);
 lean_dec(x_105);
 lean_dec(x_104);
 lean_dec(x_103);
-x_123 = lean_ctor_get(x_117, 0);
-lean_inc(x_123);
-x_124 = lean_ctor_get(x_117, 1);
+x_124 = lean_ctor_get(x_118, 0);
 lean_inc(x_124);
-if (lean_is_exclusive(x_117)) {
- lean_ctor_release(x_117, 0);
- lean_ctor_release(x_117, 1);
- x_125 = x_117;
+x_125 = lean_ctor_get(x_118, 1);
+lean_inc(x_125);
+if (lean_is_exclusive(x_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_126 = x_118;
 } else {
- lean_dec_ref(x_117);
- x_125 = lean_box(0);
+ lean_dec_ref(x_118);
+ x_126 = lean_box(0);
 }
-if (lean_is_scalar(x_125)) {
- x_126 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_126)) {
+ x_127 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_126 = x_125;
+ x_127 = x_126;
 }
-lean_ctor_set(x_126, 0, x_123);
-lean_ctor_set(x_126, 1, x_124);
-return x_126;
+lean_ctor_set(x_127, 0, x_124);
+lean_ctor_set(x_127, 1, x_125);
+return x_127;
 }
 }
 else
 {
-uint8_t x_127; 
-x_127 = lean_nat_dec_le(x_113, x_113);
-if (x_127 == 0)
+uint8_t x_128; 
+x_128 = lean_nat_dec_le(x_114, x_114);
+if (x_128 == 0)
 {
-lean_object* x_128; lean_object* x_129; 
-lean_dec(x_113);
-if (lean_is_scalar(x_112)) {
- x_128 = lean_alloc_ctor(0, 3, 0);
+lean_object* x_129; lean_object* x_130; 
+lean_dec(x_114);
+if (lean_is_scalar(x_113)) {
+ x_129 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_128 = x_112;
+ x_129 = x_113;
 }
-lean_ctor_set(x_128, 0, x_109);
-lean_ctor_set(x_128, 1, x_110);
-lean_ctor_set(x_128, 2, x_111);
-x_129 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_128, x_3, x_4, x_5, x_6, x_7, x_12);
-if (lean_obj_tag(x_129) == 0)
+lean_ctor_set(x_129, 0, x_110);
+lean_ctor_set(x_129, 1, x_111);
+lean_ctor_set(x_129, 2, x_112);
+x_130 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_129, x_3, x_4, x_5, x_6, x_7, x_12);
+if (lean_obj_tag(x_130) == 0)
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
-x_130 = lean_ctor_get(x_129, 0);
-lean_inc(x_130);
-x_131 = lean_ctor_get(x_129, 1);
+lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+x_131 = lean_ctor_get(x_130, 0);
 lean_inc(x_131);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- lean_ctor_release(x_129, 1);
- x_132 = x_129;
+x_132 = lean_ctor_get(x_130, 1);
+lean_inc(x_132);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ lean_ctor_release(x_130, 1);
+ x_133 = x_130;
 } else {
- lean_dec_ref(x_129);
- x_132 = lean_box(0);
+ lean_dec_ref(x_130);
+ x_133 = lean_box(0);
 }
-x_133 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_133, 0, x_103);
-lean_ctor_set(x_133, 1, x_104);
-lean_ctor_set(x_133, 2, x_105);
-lean_ctor_set(x_133, 3, x_106);
-lean_ctor_set(x_133, 4, x_130);
-lean_ctor_set_uint8(x_133, sizeof(void*)*5, x_108);
-if (lean_is_scalar(x_132)) {
- x_134 = lean_alloc_ctor(0, 2, 0);
+x_134 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_134, 0, x_103);
+lean_ctor_set(x_134, 1, x_104);
+lean_ctor_set(x_134, 2, x_105);
+lean_ctor_set(x_134, 3, x_106);
+lean_ctor_set(x_134, 4, x_131);
+lean_ctor_set_uint8(x_134, sizeof(void*)*5, x_108);
+lean_ctor_set_uint8(x_134, sizeof(void*)*5 + 1, x_109);
+if (lean_is_scalar(x_133)) {
+ x_135 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_134 = x_132;
+ x_135 = x_133;
 }
-lean_ctor_set(x_134, 0, x_133);
-lean_ctor_set(x_134, 1, x_131);
-return x_134;
+lean_ctor_set(x_135, 0, x_134);
+lean_ctor_set(x_135, 1, x_132);
+return x_135;
 }
 else
 {
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
 lean_dec(x_106);
 lean_dec(x_105);
 lean_dec(x_104);
 lean_dec(x_103);
-x_135 = lean_ctor_get(x_129, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_129, 1);
+x_136 = lean_ctor_get(x_130, 0);
 lean_inc(x_136);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- lean_ctor_release(x_129, 1);
- x_137 = x_129;
+x_137 = lean_ctor_get(x_130, 1);
+lean_inc(x_137);
+if (lean_is_exclusive(x_130)) {
+ lean_ctor_release(x_130, 0);
+ lean_ctor_release(x_130, 1);
+ x_138 = x_130;
 } else {
- lean_dec_ref(x_129);
- x_137 = lean_box(0);
+ lean_dec_ref(x_130);
+ x_138 = lean_box(0);
 }
-if (lean_is_scalar(x_137)) {
- x_138 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_138)) {
+ x_139 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_138 = x_137;
+ x_139 = x_138;
 }
-lean_ctor_set(x_138, 0, x_135);
-lean_ctor_set(x_138, 1, x_136);
-return x_138;
+lean_ctor_set(x_139, 0, x_136);
+lean_ctor_set(x_139, 1, x_137);
+return x_139;
 }
 }
 else
 {
-size_t x_139; size_t x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_139 = 0;
-x_140 = lean_usize_of_nat(x_113);
-lean_dec(x_113);
-x_141 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_withParams___spec__1(x_106, x_139, x_140, x_109);
-if (lean_is_scalar(x_112)) {
- x_142 = lean_alloc_ctor(0, 3, 0);
+size_t x_140; size_t x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_140 = 0;
+x_141 = lean_usize_of_nat(x_114);
+lean_dec(x_114);
+x_142 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_withParams___spec__1(x_106, x_140, x_141, x_110);
+if (lean_is_scalar(x_113)) {
+ x_143 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_142 = x_112;
+ x_143 = x_113;
 }
-lean_ctor_set(x_142, 0, x_141);
-lean_ctor_set(x_142, 1, x_110);
-lean_ctor_set(x_142, 2, x_111);
-x_143 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_142, x_3, x_4, x_5, x_6, x_7, x_12);
-if (lean_obj_tag(x_143) == 0)
+lean_ctor_set(x_143, 0, x_142);
+lean_ctor_set(x_143, 1, x_111);
+lean_ctor_set(x_143, 2, x_112);
+x_144 = l_Lean_Compiler_LCNF_Specialize_visitCode(x_107, x_143, x_3, x_4, x_5, x_6, x_7, x_12);
+if (lean_obj_tag(x_144) == 0)
 {
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-x_144 = lean_ctor_get(x_143, 0);
-lean_inc(x_144);
-x_145 = lean_ctor_get(x_143, 1);
+lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; 
+x_145 = lean_ctor_get(x_144, 0);
 lean_inc(x_145);
-if (lean_is_exclusive(x_143)) {
- lean_ctor_release(x_143, 0);
- lean_ctor_release(x_143, 1);
- x_146 = x_143;
+x_146 = lean_ctor_get(x_144, 1);
+lean_inc(x_146);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ lean_ctor_release(x_144, 1);
+ x_147 = x_144;
 } else {
- lean_dec_ref(x_143);
- x_146 = lean_box(0);
+ lean_dec_ref(x_144);
+ x_147 = lean_box(0);
 }
-x_147 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_147, 0, x_103);
-lean_ctor_set(x_147, 1, x_104);
-lean_ctor_set(x_147, 2, x_105);
-lean_ctor_set(x_147, 3, x_106);
-lean_ctor_set(x_147, 4, x_144);
-lean_ctor_set_uint8(x_147, sizeof(void*)*5, x_108);
-if (lean_is_scalar(x_146)) {
- x_148 = lean_alloc_ctor(0, 2, 0);
+x_148 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_148, 0, x_103);
+lean_ctor_set(x_148, 1, x_104);
+lean_ctor_set(x_148, 2, x_105);
+lean_ctor_set(x_148, 3, x_106);
+lean_ctor_set(x_148, 4, x_145);
+lean_ctor_set_uint8(x_148, sizeof(void*)*5, x_108);
+lean_ctor_set_uint8(x_148, sizeof(void*)*5 + 1, x_109);
+if (lean_is_scalar(x_147)) {
+ x_149 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_148 = x_146;
+ x_149 = x_147;
 }
-lean_ctor_set(x_148, 0, x_147);
-lean_ctor_set(x_148, 1, x_145);
-return x_148;
+lean_ctor_set(x_149, 0, x_148);
+lean_ctor_set(x_149, 1, x_146);
+return x_149;
 }
 else
 {
-lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
+lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
 lean_dec(x_106);
 lean_dec(x_105);
 lean_dec(x_104);
 lean_dec(x_103);
-x_149 = lean_ctor_get(x_143, 0);
-lean_inc(x_149);
-x_150 = lean_ctor_get(x_143, 1);
+x_150 = lean_ctor_get(x_144, 0);
 lean_inc(x_150);
-if (lean_is_exclusive(x_143)) {
- lean_ctor_release(x_143, 0);
- lean_ctor_release(x_143, 1);
- x_151 = x_143;
+x_151 = lean_ctor_get(x_144, 1);
+lean_inc(x_151);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ lean_ctor_release(x_144, 1);
+ x_152 = x_144;
 } else {
- lean_dec_ref(x_143);
- x_151 = lean_box(0);
+ lean_dec_ref(x_144);
+ 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;
 }
 }
 }
@@ -13458,32 +13601,32 @@ return x_152;
 }
 else
 {
-uint8_t x_153; 
+uint8_t x_154; 
 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_153 = !lean_is_exclusive(x_9);
-if (x_153 == 0)
+x_154 = !lean_is_exclusive(x_9);
+if (x_154 == 0)
 {
-lean_object* x_154; 
-x_154 = lean_ctor_get(x_9, 0);
-lean_dec(x_154);
+lean_object* x_155; 
+x_155 = lean_ctor_get(x_9, 0);
+lean_dec(x_155);
 lean_ctor_set(x_9, 0, x_1);
 return x_9;
 }
 else
 {
-lean_object* x_155; lean_object* x_156; 
-x_155 = lean_ctor_get(x_9, 1);
-lean_inc(x_155);
+lean_object* x_156; lean_object* x_157; 
+x_156 = lean_ctor_get(x_9, 1);
+lean_inc(x_156);
 lean_dec(x_9);
-x_156 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_156, 0, x_1);
-lean_ctor_set(x_156, 1, x_155);
-return x_156;
+x_157 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_157, 0, x_1);
+lean_ctor_set(x_157, 1, x_156);
+return x_157;
 }
 }
 }
@@ -13859,7 +14002,7 @@ lean_dec(x_1);
 return x_7;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -13869,11 +14012,11 @@ x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)
@@ -14134,9 +14277,9 @@ l_Lean_Compiler_LCNF_specialize___closed__3 = _init_l_Lean_Compiler_LCNF_special
 lean_mark_persistent(l_Lean_Compiler_LCNF_specialize___closed__3);
 l_Lean_Compiler_LCNF_specialize = _init_l_Lean_Compiler_LCNF_specialize();
 lean_mark_persistent(l_Lean_Compiler_LCNF_specialize);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899____closed__1);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4899_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913____closed__1);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_4913_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Testing.c b/stage0/stdlib/Lean/Compiler/LCNF/Testing.c
index 38062804f2..1b18db87b6 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Testing.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Testing.c
@@ -58,7 +58,7 @@ lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Code_containsConst_goExpr___closed__2;
-uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636_(lean_object*, lean_object*);
+uint8_t l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646_(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Testing_assertNoFun___spec__3(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Testing_0__Lean_Compiler_LCNF_Testing_assertAfterTest___elambda__1___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Testing_InOutAssertionM_run___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2822,7 +2822,7 @@ else
 lean_object* x_10; lean_object* x_11; uint8_t x_12; 
 x_10 = lean_array_fget(x_4, x_6);
 x_11 = lean_array_fget(x_5, x_6);
-x_12 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3636_(x_10, x_11);
+x_12 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_beqDecl____x40_Lean_Compiler_LCNF_Basic___hyg_3646_(x_10, x_11);
 lean_dec(x_11);
 if (x_12 == 0)
 {
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/ToDecl.c b/stage0/stdlib/Lean/Compiler/LCNF/ToDecl.c
index 9b0de679aa..2b4f6e5768 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/ToDecl.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/ToDecl.c
@@ -34,6 +34,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_getMatcherInfo_x3f___at_Lean_Compiler_LCNF_
 static lean_object* l_Lean_Compiler_LCNF_inlineMatchers___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_lambdaTelescope___at___private_Lean_Compiler_LCNF_ToDecl_0__Lean_Compiler_LCNF_normalizeAlt___spec__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_inlineMatchers___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_ConstantInfo_isUnsafe(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_inlineMatchers___closed__9;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_toDecl___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
@@ -150,6 +151,7 @@ static lean_object* l_Lean_Compiler_LCNF_toDecl___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at___private_Lean_Compiler_LCNF_ToDecl_0__Lean_Compiler_LCNF_normalizeAlt___spec__1(lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_lambdaTelescopeImp___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withLetDeclImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_ConstantInfo_isPartial(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_inlineMatchers(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_Extension_getMatcherInfo_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_inlineMatchers___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2867,19 +2869,19 @@ x_7 = lean_is_unsafe_rec_name(x_1);
 if (lean_obj_tag(x_7) == 0)
 {
 x_8 = x_1;
-goto block_114;
+goto block_138;
 }
 else
 {
-lean_object* x_115; 
+lean_object* x_139; 
 lean_dec(x_1);
-x_115 = lean_ctor_get(x_7, 0);
-lean_inc(x_115);
+x_139 = lean_ctor_get(x_7, 0);
+lean_inc(x_139);
 lean_dec(x_7);
-x_8 = x_115;
-goto block_114;
+x_8 = x_139;
+goto block_138;
 }
-block_114:
+block_138:
 {
 lean_object* x_9; lean_object* x_10; 
 lean_inc(x_8);
@@ -3047,273 +3049,363 @@ lean_inc(x_2);
 x_62 = l_Lean_Compiler_LCNF_ToLCNF_toLCNF(x_56, x_2, x_3, x_4, x_5, x_61);
 if (lean_obj_tag(x_62) == 0)
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+lean_object* x_63; lean_object* x_64; uint8_t x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; lean_object* x_69; 
 x_63 = lean_ctor_get(x_62, 0);
 lean_inc(x_63);
 x_64 = lean_ctor_get(x_62, 1);
 lean_inc(x_64);
 lean_dec(x_62);
-x_65 = l_Lean_Compiler_LCNF_toDecl___closed__8;
+x_65 = l_Lean_ConstantInfo_isPartial(x_19);
+x_66 = l_Lean_Compiler_LCNF_toDecl___closed__8;
+if (x_65 == 0)
+{
+uint8_t x_84; 
+x_84 = l_Lean_ConstantInfo_isUnsafe(x_19);
+if (x_84 == 0)
+{
 if (lean_obj_tag(x_63) == 1)
 {
-lean_object* x_66; 
-x_66 = lean_ctor_get(x_63, 1);
-lean_inc(x_66);
-if (lean_obj_tag(x_66) == 5)
+lean_object* x_85; lean_object* x_86; uint8_t x_87; 
+x_85 = lean_ctor_get(x_63, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get(x_63, 1);
+lean_inc(x_86);
+x_87 = 1;
+x_67 = x_87;
+x_68 = x_85;
+x_69 = x_86;
+goto block_83;
+}
+else
 {
-lean_object* x_67; uint8_t 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_dec(x_66);
-x_67 = lean_ctor_get(x_63, 0);
-lean_inc(x_67);
-lean_dec(x_63);
-x_68 = 0;
-lean_inc(x_67);
-x_69 = l_Lean_Compiler_LCNF_eraseFunDecl(x_67, x_68, x_2, x_3, x_4, x_5, x_64);
-x_70 = lean_ctor_get(x_69, 1);
-lean_inc(x_70);
-lean_dec(x_69);
-x_71 = l_Lean_ConstantInfo_levelParams(x_19);
+lean_object* x_88; lean_object* x_89; uint8_t x_90; uint8_t x_91; lean_object* x_92; lean_object* x_93; 
+x_88 = l_Lean_ConstantInfo_levelParams(x_19);
 lean_dec(x_19);
-x_72 = lean_ctor_get(x_67, 2);
-lean_inc(x_72);
-x_73 = lean_ctor_get(x_67, 4);
-lean_inc(x_73);
-lean_dec(x_67);
-x_74 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_74, 0, x_8);
-lean_ctor_set(x_74, 1, x_71);
-lean_ctor_set(x_74, 2, x_37);
-lean_ctor_set(x_74, 3, x_72);
-lean_ctor_set(x_74, 4, x_73);
-lean_ctor_set_uint8(x_74, sizeof(void*)*5, x_68);
-x_75 = lean_apply_6(x_65, x_74, x_2, x_3, x_4, x_5, x_70);
-return x_75;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; uint8_t x_78; lean_object* x_79; lean_object* x_80; 
-lean_dec(x_66);
-x_76 = l_Lean_ConstantInfo_levelParams(x_19);
-lean_dec(x_19);
-x_77 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
-x_78 = 0;
-x_79 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_79, 0, x_8);
-lean_ctor_set(x_79, 1, x_76);
-lean_ctor_set(x_79, 2, x_37);
-lean_ctor_set(x_79, 3, x_77);
-lean_ctor_set(x_79, 4, x_63);
-lean_ctor_set_uint8(x_79, sizeof(void*)*5, x_78);
-x_80 = lean_apply_6(x_65, x_79, x_2, x_3, x_4, x_5, x_64);
-return x_80;
-}
-}
-else
-{
-lean_object* x_81; lean_object* x_82; uint8_t x_83; lean_object* x_84; lean_object* x_85; 
-x_81 = l_Lean_ConstantInfo_levelParams(x_19);
-lean_dec(x_19);
-x_82 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
-x_83 = 0;
-x_84 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_84, 0, x_8);
-lean_ctor_set(x_84, 1, x_81);
-lean_ctor_set(x_84, 2, x_37);
-lean_ctor_set(x_84, 3, x_82);
-lean_ctor_set(x_84, 4, x_63);
-lean_ctor_set_uint8(x_84, sizeof(void*)*5, x_83);
-x_85 = lean_apply_6(x_65, x_84, x_2, x_3, x_4, x_5, x_64);
-return x_85;
-}
-}
-else
-{
-uint8_t x_86; 
-lean_dec(x_37);
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_86 = !lean_is_exclusive(x_62);
-if (x_86 == 0)
-{
-return x_62;
-}
-else
-{
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_87 = lean_ctor_get(x_62, 0);
-x_88 = lean_ctor_get(x_62, 1);
-lean_inc(x_88);
-lean_inc(x_87);
-lean_dec(x_62);
-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
-{
-uint8_t x_90; 
-lean_dec(x_37);
-lean_dec(x_33);
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_90 = !lean_is_exclusive(x_55);
-if (x_90 == 0)
-{
-return x_55;
-}
-else
-{
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_91 = lean_ctor_get(x_55, 0);
-x_92 = lean_ctor_get(x_55, 1);
-lean_inc(x_92);
-lean_inc(x_91);
-lean_dec(x_55);
-x_93 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_93, 0, x_91);
-lean_ctor_set(x_93, 1, x_92);
+x_89 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
+x_90 = 0;
+x_91 = 1;
+x_92 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_92, 0, x_8);
+lean_ctor_set(x_92, 1, x_88);
+lean_ctor_set(x_92, 2, x_37);
+lean_ctor_set(x_92, 3, x_89);
+lean_ctor_set(x_92, 4, x_63);
+lean_ctor_set_uint8(x_92, sizeof(void*)*5, x_90);
+lean_ctor_set_uint8(x_92, sizeof(void*)*5 + 1, x_91);
+x_93 = lean_apply_6(x_66, x_92, x_2, x_3, x_4, x_5, x_64);
 return x_93;
 }
 }
-}
 else
 {
-uint8_t x_94; 
-lean_dec(x_37);
-lean_dec(x_33);
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_94 = !lean_is_exclusive(x_52);
-if (x_94 == 0)
+if (lean_obj_tag(x_63) == 1)
 {
-return x_52;
-}
-else
-{
-lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_95 = lean_ctor_get(x_52, 0);
-x_96 = lean_ctor_get(x_52, 1);
-lean_inc(x_96);
+lean_object* x_94; lean_object* x_95; uint8_t x_96; 
+x_94 = lean_ctor_get(x_63, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_63, 1);
 lean_inc(x_95);
-lean_dec(x_52);
-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;
-}
-}
+x_96 = 0;
+x_67 = x_96;
+x_68 = x_94;
+x_69 = x_95;
+goto block_83;
 }
 else
 {
-uint8_t x_98; 
-lean_dec(x_37);
-lean_dec(x_33);
+lean_object* x_97; lean_object* x_98; uint8_t x_99; lean_object* x_100; lean_object* x_101; 
+x_97 = l_Lean_ConstantInfo_levelParams(x_19);
 lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_98 = !lean_is_exclusive(x_49);
-if (x_98 == 0)
-{
-return x_49;
-}
-else
-{
-lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_99 = lean_ctor_get(x_49, 0);
-x_100 = lean_ctor_get(x_49, 1);
-lean_inc(x_100);
-lean_inc(x_99);
-lean_dec(x_49);
-x_101 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_101, 0, x_99);
-lean_ctor_set(x_101, 1, x_100);
+x_98 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
+x_99 = 0;
+x_100 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_100, 0, x_8);
+lean_ctor_set(x_100, 1, x_97);
+lean_ctor_set(x_100, 2, x_37);
+lean_ctor_set(x_100, 3, x_98);
+lean_ctor_set(x_100, 4, x_63);
+lean_ctor_set_uint8(x_100, sizeof(void*)*5, x_99);
+lean_ctor_set_uint8(x_100, sizeof(void*)*5 + 1, x_99);
+x_101 = lean_apply_6(x_66, x_100, x_2, x_3, x_4, x_5, x_64);
 return x_101;
 }
 }
 }
 else
 {
-uint8_t x_102; 
-lean_dec(x_37);
-lean_dec(x_33);
-lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_102 = !lean_is_exclusive(x_45);
-if (x_102 == 0)
+if (lean_obj_tag(x_63) == 1)
 {
-return x_45;
-}
-else
-{
-lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-x_103 = lean_ctor_get(x_45, 0);
-x_104 = lean_ctor_get(x_45, 1);
-lean_inc(x_104);
+lean_object* x_102; lean_object* x_103; uint8_t x_104; 
+x_102 = lean_ctor_get(x_63, 0);
+lean_inc(x_102);
+x_103 = lean_ctor_get(x_63, 1);
 lean_inc(x_103);
-lean_dec(x_45);
-x_105 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_105, 0, x_103);
-lean_ctor_set(x_105, 1, x_104);
-return x_105;
-}
-}
+x_104 = 0;
+x_67 = x_104;
+x_68 = x_102;
+x_69 = x_103;
+goto block_83;
 }
 else
 {
-uint8_t x_106; 
-lean_dec(x_37);
-lean_dec(x_33);
+lean_object* x_105; lean_object* x_106; uint8_t x_107; lean_object* x_108; lean_object* x_109; 
+x_105 = l_Lean_ConstantInfo_levelParams(x_19);
 lean_dec(x_19);
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_106 = !lean_is_exclusive(x_40);
-if (x_106 == 0)
+x_106 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
+x_107 = 0;
+x_108 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_108, 0, x_8);
+lean_ctor_set(x_108, 1, x_105);
+lean_ctor_set(x_108, 2, x_37);
+lean_ctor_set(x_108, 3, x_106);
+lean_ctor_set(x_108, 4, x_63);
+lean_ctor_set_uint8(x_108, sizeof(void*)*5, x_107);
+lean_ctor_set_uint8(x_108, sizeof(void*)*5 + 1, x_107);
+x_109 = lean_apply_6(x_66, x_108, x_2, x_3, x_4, x_5, x_64);
+return x_109;
+}
+}
+block_83:
 {
-return x_40;
+if (lean_obj_tag(x_69) == 5)
+{
+uint8_t x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+lean_dec(x_69);
+lean_dec(x_63);
+x_70 = 0;
+lean_inc(x_68);
+x_71 = l_Lean_Compiler_LCNF_eraseFunDecl(x_68, x_70, x_2, x_3, x_4, x_5, x_64);
+x_72 = lean_ctor_get(x_71, 1);
+lean_inc(x_72);
+lean_dec(x_71);
+x_73 = l_Lean_ConstantInfo_levelParams(x_19);
+lean_dec(x_19);
+x_74 = lean_ctor_get(x_68, 2);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_68, 4);
+lean_inc(x_75);
+lean_dec(x_68);
+x_76 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_76, 0, x_8);
+lean_ctor_set(x_76, 1, x_73);
+lean_ctor_set(x_76, 2, x_37);
+lean_ctor_set(x_76, 3, x_74);
+lean_ctor_set(x_76, 4, x_75);
+lean_ctor_set_uint8(x_76, sizeof(void*)*5, x_70);
+lean_ctor_set_uint8(x_76, sizeof(void*)*5 + 1, x_67);
+x_77 = lean_apply_6(x_66, x_76, x_2, x_3, x_4, x_5, x_72);
+return x_77;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_40, 0);
-x_108 = lean_ctor_get(x_40, 1);
-lean_inc(x_108);
-lean_inc(x_107);
-lean_dec(x_40);
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_107);
-lean_ctor_set(x_109, 1, x_108);
-return x_109;
+lean_object* x_78; lean_object* x_79; uint8_t x_80; lean_object* x_81; lean_object* x_82; 
+lean_dec(x_69);
+lean_dec(x_68);
+x_78 = l_Lean_ConstantInfo_levelParams(x_19);
+lean_dec(x_19);
+x_79 = l_Lean_Compiler_LCNF_inlineMatchers___lambda__2___closed__1;
+x_80 = 0;
+x_81 = lean_alloc_ctor(0, 5, 2);
+lean_ctor_set(x_81, 0, x_8);
+lean_ctor_set(x_81, 1, x_78);
+lean_ctor_set(x_81, 2, x_37);
+lean_ctor_set(x_81, 3, x_79);
+lean_ctor_set(x_81, 4, x_63);
+lean_ctor_set_uint8(x_81, sizeof(void*)*5, x_80);
+lean_ctor_set_uint8(x_81, sizeof(void*)*5 + 1, x_67);
+x_82 = lean_apply_6(x_66, x_81, x_2, x_3, x_4, x_5, x_64);
+return x_82;
 }
 }
 }
 else
 {
 uint8_t x_110; 
+lean_dec(x_37);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_110 = !lean_is_exclusive(x_62);
+if (x_110 == 0)
+{
+return x_62;
+}
+else
+{
+lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_111 = lean_ctor_get(x_62, 0);
+x_112 = lean_ctor_get(x_62, 1);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_dec(x_62);
+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;
+}
+}
+}
+else
+{
+uint8_t x_114; 
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_114 = !lean_is_exclusive(x_55);
+if (x_114 == 0)
+{
+return x_55;
+}
+else
+{
+lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_115 = lean_ctor_get(x_55, 0);
+x_116 = lean_ctor_get(x_55, 1);
+lean_inc(x_116);
+lean_inc(x_115);
+lean_dec(x_55);
+x_117 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_117, 0, x_115);
+lean_ctor_set(x_117, 1, x_116);
+return x_117;
+}
+}
+}
+else
+{
+uint8_t x_118; 
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_118 = !lean_is_exclusive(x_52);
+if (x_118 == 0)
+{
+return x_52;
+}
+else
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+x_119 = lean_ctor_get(x_52, 0);
+x_120 = lean_ctor_get(x_52, 1);
+lean_inc(x_120);
+lean_inc(x_119);
+lean_dec(x_52);
+x_121 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_121, 0, x_119);
+lean_ctor_set(x_121, 1, x_120);
+return x_121;
+}
+}
+}
+else
+{
+uint8_t x_122; 
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_122 = !lean_is_exclusive(x_49);
+if (x_122 == 0)
+{
+return x_49;
+}
+else
+{
+lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_123 = lean_ctor_get(x_49, 0);
+x_124 = lean_ctor_get(x_49, 1);
+lean_inc(x_124);
+lean_inc(x_123);
+lean_dec(x_49);
+x_125 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_125, 0, x_123);
+lean_ctor_set(x_125, 1, x_124);
+return x_125;
+}
+}
+}
+else
+{
+uint8_t x_126; 
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_126 = !lean_is_exclusive(x_45);
+if (x_126 == 0)
+{
+return x_45;
+}
+else
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+x_127 = lean_ctor_get(x_45, 0);
+x_128 = lean_ctor_get(x_45, 1);
+lean_inc(x_128);
+lean_inc(x_127);
+lean_dec(x_45);
+x_129 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_129, 0, x_127);
+lean_ctor_set(x_129, 1, x_128);
+return x_129;
+}
+}
+}
+else
+{
+uint8_t x_130; 
+lean_dec(x_37);
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_130 = !lean_is_exclusive(x_40);
+if (x_130 == 0)
+{
+return x_40;
+}
+else
+{
+lean_object* x_131; lean_object* x_132; lean_object* x_133; 
+x_131 = lean_ctor_get(x_40, 0);
+x_132 = lean_ctor_get(x_40, 1);
+lean_inc(x_132);
+lean_inc(x_131);
+lean_dec(x_40);
+x_133 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_133, 0, x_131);
+lean_ctor_set(x_133, 1, x_132);
+return x_133;
+}
+}
+}
+else
+{
+uint8_t x_134; 
 lean_dec(x_33);
 lean_dec(x_27);
 lean_dec(x_19);
@@ -3322,23 +3414,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_110 = !lean_is_exclusive(x_36);
-if (x_110 == 0)
+x_134 = !lean_is_exclusive(x_36);
+if (x_134 == 0)
 {
 return x_36;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_36, 0);
-x_112 = lean_ctor_get(x_36, 1);
-lean_inc(x_112);
-lean_inc(x_111);
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_135 = lean_ctor_get(x_36, 0);
+x_136 = lean_ctor_get(x_36, 1);
+lean_inc(x_136);
+lean_inc(x_135);
 lean_dec(x_36);
-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;
+x_137 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_137, 0, x_135);
+lean_ctor_set(x_137, 1, x_136);
+return x_137;
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Declaration.c b/stage0/stdlib/Lean/Declaration.c
index ceab554680..5b2e88288e 100644
--- a/stage0/stdlib/Lean/Declaration.c
+++ b/stage0/stdlib/Lean/Declaration.c
@@ -19,6 +19,7 @@ LEAN_EXPORT lean_object* l_Lean_Declaration_foldExprM(lean_object*, lean_object*
 LEAN_EXPORT lean_object* l_List_foldlM___at_Lean_Declaration_forExprM___spec__2___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ReducibilityHints_lt___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_ConstantInfo_isPartial___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_QuotKind_noConfusion___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_RecursorVal_getFirstIndexIdx(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_ReducibilityHints_isAbbrev(lean_object*);
@@ -207,6 +208,7 @@ LEAN_EXPORT lean_object* l_Lean_DefinitionVal_getSafetyEx___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_OpaqueVal_all___default___boxed(lean_object*);
 static lean_object* l_Lean_instReprDefinitionSafety___closed__1;
 LEAN_EXPORT lean_object* l_Lean_OpaqueVal_all___default(lean_object*);
+LEAN_EXPORT uint8_t l_Lean_ConstantInfo_isPartial(lean_object*);
 LEAN_EXPORT uint8_t lean_axiom_val_is_unsafe(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Declaration_foldExprM___at_Lean_Declaration_forExprM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_QuotKind_toCtorIdx___boxed(lean_object*);
@@ -2470,6 +2472,36 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+LEAN_EXPORT uint8_t l_Lean_ConstantInfo_isPartial(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 1)
+{
+lean_object* x_2; uint8_t x_3; uint8_t x_4; uint8_t x_5; 
+x_2 = lean_ctor_get(x_1, 0);
+x_3 = lean_ctor_get_uint8(x_2, sizeof(void*)*4);
+x_4 = 2;
+x_5 = l___private_Lean_Declaration_0__Lean_beqDefinitionSafety____x40_Lean_Declaration___hyg_278_(x_3, x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = 0;
+return x_6;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_ConstantInfo_isPartial___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_ConstantInfo_isPartial(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_ConstantInfo_name(lean_object* x_1) {
 _start:
 {
@@ -2657,7 +2689,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_ConstantInfo_value_x21___closed__1;
 x_2 = l_Lean_ConstantInfo_value_x21___closed__2;
-x_3 = lean_unsigned_to_nat(426u);
+x_3 = lean_unsigned_to_nat(430u);
 x_4 = lean_unsigned_to_nat(33u);
 x_5 = l_Lean_ConstantInfo_value_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Elab/App.c b/stage0/stdlib/Lean/Elab/App.c
index bcaf79bdfc..376e3fc536 100644
--- a/stage0/stdlib/Lean/Elab/App.c
+++ b/stage0/stdlib/Lean/Elab/App.c
@@ -34,7 +34,6 @@ LEAN_EXPORT lean_object* l_Lean_getRefPos___at___private_Lean_Elab_App_0__Lean_E
 static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_6568____lambda__1___closed__22;
 LEAN_EXPORT lean_object* l_Lean_MVarId_isAssigned___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_getArgExpectedType(lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1;
 static lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_resolveLValAux___lambda__3___closed__1;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_elabForall___spec__1___rarg(lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___spec__24(lean_object*, lean_object*, size_t, size_t);
@@ -116,7 +115,7 @@ lean_object* lean_array_uget(lean_object*, size_t);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___spec__34(lean_object*, lean_object*, size_t, size_t);
 uint8_t l_Lean_Expr_isProp(lean_object*);
 static lean_object* l_Lean_Elab_Term_ElabElim_finalize___closed__2;
-LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2___boxed(lean_object**);
 static lean_object* l_Lean_Elab_Term_elabAppArgs___lambda__3___closed__2;
 lean_object* l_Lean_Expr_bindingDomain_x21(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabApp___closed__4;
@@ -154,6 +153,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_isNextOutParamOfLocalInstanceAndResult___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___lambda__5___closed__3;
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_elabAppArgs___lambda__3___boxed(lean_object**);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_mkFreshBinderName___at_Lean_Elab_Term_ElabElim_mkMotive___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabExplicitUniv_declRange___closed__5;
@@ -893,7 +893,7 @@ LEAN_EXPORT lean_object* l_Lean_PersistentArray_anyMAux___at___private_Lean_Elab
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_instantiateForallAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_throwInvalidFieldNotation___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_throwInvalidNamedArg___rarg___closed__5;
-lean_object* l_Lean_Elab_Term_addTermInfo(lean_object*, 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* l_Lean_Elab_Term_addTermInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_ElabElim_finalize___lambda__5___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Term_elabExplicit___closed__1;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Elab_Term_elabAppArgs___spec__4___at_Lean_Elab_Term_elabAppArgs___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -974,7 +974,7 @@ uint8_t l_Lean_Expr_isFVar(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_mkProjAndCheck___closed__7;
 static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_5____closed__9;
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_6568_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_5_(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
@@ -1215,7 +1215,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_App_0
 lean_object* l_Lean_Elab_Term_ensureHasTypeAux(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_EXPORT lean_object* l_List_foldlM___at_Lean_Elab_Term_ElabElim_revertArgs___spec__15___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_MetavarContext_0__Lean_DependsOn_dep_visit___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___spec__27(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ElabElim_finalize___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_constName_x21(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_throwLValError(lean_object*);
@@ -35924,7 +35924,7 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
-x_27 = l_Lean_Elab_Term_addTermInfo(x_23, x_21, x_24, x_24, x_25, x_26, x_11, x_12, x_13, x_14, x_15, x_16, x_22);
+x_27 = l_Lean_Elab_Term_addTermInfo(x_23, x_21, x_24, x_24, x_25, x_26, x_26, x_11, x_12, x_13, x_14, x_15, x_16, x_22);
 if (lean_obj_tag(x_27) == 0)
 {
 lean_object* x_28; lean_object* x_29; uint8_t x_30; 
@@ -36163,7 +36163,7 @@ lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
-x_26 = l_Lean_Elab_Term_addTermInfo(x_22, x_20, x_23, x_23, x_24, x_25, x_11, x_12, x_13, x_14, x_15, x_16, x_21);
+x_26 = l_Lean_Elab_Term_addTermInfo(x_22, x_20, x_23, x_23, x_24, x_25, x_25, x_11, x_12, x_13, x_14, x_15, x_16, x_21);
 if (lean_obj_tag(x_26) == 0)
 {
 lean_object* x_27; lean_object* x_28; uint8_t x_29; 
@@ -36766,7 +36766,7 @@ lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_74 = l_Lean_Elab_Term_addTermInfo(x_70, x_68, x_71, x_71, x_72, x_73, x_10, x_11, x_12, x_13, x_14, x_15, x_69);
+x_74 = l_Lean_Elab_Term_addTermInfo(x_70, x_68, x_71, x_71, x_72, x_73, x_73, x_10, x_11, x_12, x_13, x_14, x_15, x_69);
 if (lean_obj_tag(x_74) == 0)
 {
 lean_object* x_75; lean_object* x_76; lean_object* x_77; 
@@ -36954,7 +36954,7 @@ lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_110 = l_Lean_Elab_Term_addTermInfo(x_106, x_105, x_107, x_107, x_108, x_109, x_10, x_11, x_12, x_13, x_14, x_15, x_101);
+x_110 = l_Lean_Elab_Term_addTermInfo(x_106, x_105, x_107, x_107, x_108, x_109, x_109, x_10, x_11, x_12, x_13, x_14, x_15, x_101);
 if (lean_obj_tag(x_110) == 0)
 {
 lean_object* x_111; lean_object* x_112; uint8_t x_113; 
@@ -37796,7 +37796,7 @@ lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_4);
 lean_inc(x_3);
-x_21 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_19, x_20, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
+x_21 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_19, x_20, x_20, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
 if (lean_obj_tag(x_21) == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
@@ -40088,92 +40088,146 @@ return x_37;
 }
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, uint8_t x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___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, uint8_t x_8, uint8_t x_9, uint8_t x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16, lean_object* x_17) {
 _start:
 {
-lean_object* x_17; 
+lean_object* x_18; uint8_t x_19; uint8_t x_20; lean_object* x_21; 
+x_18 = lean_box(0);
+x_19 = 0;
+x_20 = 1;
+lean_inc(x_16);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_5);
-x_17 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLVals(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_17) == 0)
-{
-if (x_8 == 0)
-{
-uint8_t x_18; 
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-x_18 = !lean_is_exclusive(x_17);
-if (x_18 == 0)
-{
-return x_17;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_17, 0);
-x_20 = lean_ctor_get(x_17, 1);
-lean_inc(x_20);
-lean_inc(x_19);
-lean_dec(x_17);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_19);
-lean_ctor_set(x_21, 1, x_20);
-return x_21;
-}
-}
-else
+lean_inc(x_4);
+lean_inc(x_3);
+x_21 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_18, x_19, x_20, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+if (lean_obj_tag(x_21) == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_17, 0);
+x_22 = lean_ctor_get(x_21, 0);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_17, 1);
+x_23 = lean_ctor_get(x_21, 1);
 lean_inc(x_23);
-lean_dec(x_17);
-x_24 = l_Lean_Elab_Term_ensureHasType(x_5, x_22, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_23);
-return x_24;
-}
-}
-else
+lean_dec(x_21);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_3);
+x_24 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLVals(x_22, x_5, x_6, x_7, x_3, x_8, x_9, x_11, x_12, x_13, x_14, x_15, x_16, x_23);
+if (lean_obj_tag(x_24) == 0)
+{
+if (x_10 == 0)
 {
 uint8_t x_25; 
+lean_dec(x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-x_25 = !lean_is_exclusive(x_17);
+lean_dec(x_4);
+lean_dec(x_3);
+x_25 = !lean_is_exclusive(x_24);
 if (x_25 == 0)
 {
-return x_17;
+return x_24;
 }
 else
 {
 lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_17, 0);
-x_27 = lean_ctor_get(x_17, 1);
+x_26 = lean_ctor_get(x_24, 0);
+x_27 = lean_ctor_get(x_24, 1);
 lean_inc(x_27);
 lean_inc(x_26);
-lean_dec(x_17);
-x_28 = lean_alloc_ctor(1, 2, 0);
+lean_dec(x_24);
+x_28 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_28, 0, x_26);
 lean_ctor_set(x_28, 1, x_27);
 return x_28;
 }
 }
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_24, 0);
+lean_inc(x_29);
+x_30 = lean_ctor_get(x_24, 1);
+lean_inc(x_30);
+lean_dec(x_24);
+x_31 = l_Lean_Elab_Term_ensureHasType(x_3, x_29, x_4, x_11, x_12, x_13, x_14, x_15, x_16, x_30);
+return x_31;
+}
+}
+else
+{
+uint8_t x_32; 
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_4);
+lean_dec(x_3);
+x_32 = !lean_is_exclusive(x_24);
+if (x_32 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_24, 0);
+x_34 = lean_ctor_get(x_24, 1);
+lean_inc(x_34);
+lean_inc(x_33);
+lean_dec(x_24);
+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_36; 
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_36 = !lean_is_exclusive(x_21);
+if (x_36 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_21, 0);
+x_38 = lean_ctor_get(x_21, 1);
+lean_inc(x_38);
+lean_inc(x_37);
+lean_dec(x_21);
+x_39 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_39, 0, x_37);
+lean_ctor_set(x_39, 1, x_38);
+return x_39;
+}
+}
 }
 }
 static lean_object* _init_l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__1() {
@@ -41286,132 +41340,82 @@ lean_inc(x_10);
 x_236 = l_Lean_Elab_Term_mkConst(x_233, x_235, x_10, x_11, x_12, x_13, x_14, x_15, x_234);
 if (lean_obj_tag(x_236) == 0)
 {
-lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; uint8_t x_241; lean_object* x_242; 
+lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
 x_237 = lean_ctor_get(x_236, 0);
 lean_inc(x_237);
 x_238 = lean_ctor_get(x_236, 1);
 lean_inc(x_238);
 lean_dec(x_236);
 x_239 = lean_box(0);
-x_240 = lean_box(0);
-x_241 = 0;
-lean_inc(x_15);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-x_242 = l_Lean_Elab_Term_addTermInfo(x_1, x_237, x_239, x_239, x_240, x_241, x_10, x_11, x_12, x_13, x_14, x_15, x_238);
-if (lean_obj_tag(x_242) == 0)
+x_240 = lean_box(x_6);
+x_241 = lean_box(x_7);
+x_242 = lean_box(x_8);
+x_243 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2___boxed), 17, 10);
+lean_closure_set(x_243, 0, x_1);
+lean_closure_set(x_243, 1, x_237);
+lean_closure_set(x_243, 2, x_5);
+lean_closure_set(x_243, 3, x_239);
+lean_closure_set(x_243, 4, x_2);
+lean_closure_set(x_243, 5, x_3);
+lean_closure_set(x_243, 6, x_4);
+lean_closure_set(x_243, 7, x_240);
+lean_closure_set(x_243, 8, x_241);
+lean_closure_set(x_243, 9, x_242);
+x_244 = l_Lean_Elab_Term_observing___rarg(x_243, x_10, x_11, x_12, x_13, x_14, x_15, x_238);
+if (lean_obj_tag(x_244) == 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_box(x_6);
-x_246 = lean_box(x_7);
-x_247 = lean_box(x_8);
-x_248 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2___boxed), 16, 9);
-lean_closure_set(x_248, 0, x_243);
-lean_closure_set(x_248, 1, x_2);
-lean_closure_set(x_248, 2, x_3);
-lean_closure_set(x_248, 3, x_4);
-lean_closure_set(x_248, 4, x_5);
-lean_closure_set(x_248, 5, x_245);
-lean_closure_set(x_248, 6, x_246);
-lean_closure_set(x_248, 7, x_247);
-lean_closure_set(x_248, 8, x_239);
-x_249 = l_Lean_Elab_Term_observing___rarg(x_248, x_10, x_11, x_12, x_13, x_14, x_15, x_244);
-if (lean_obj_tag(x_249) == 0)
+uint8_t x_245; 
+x_245 = !lean_is_exclusive(x_244);
+if (x_245 == 0)
 {
-uint8_t x_250; 
-x_250 = !lean_is_exclusive(x_249);
-if (x_250 == 0)
-{
-lean_object* x_251; lean_object* x_252; 
-x_251 = lean_ctor_get(x_249, 0);
-x_252 = lean_array_push(x_9, x_251);
-lean_ctor_set(x_249, 0, x_252);
-return x_249;
+lean_object* x_246; lean_object* x_247; 
+x_246 = lean_ctor_get(x_244, 0);
+x_247 = lean_array_push(x_9, x_246);
+lean_ctor_set(x_244, 0, x_247);
+return x_244;
 }
 else
 {
-lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; 
-x_253 = lean_ctor_get(x_249, 0);
-x_254 = lean_ctor_get(x_249, 1);
+lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
+x_248 = lean_ctor_get(x_244, 0);
+x_249 = lean_ctor_get(x_244, 1);
+lean_inc(x_249);
+lean_inc(x_248);
+lean_dec(x_244);
+x_250 = lean_array_push(x_9, x_248);
+x_251 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_251, 0, x_250);
+lean_ctor_set(x_251, 1, x_249);
+return x_251;
+}
+}
+else
+{
+uint8_t x_252; 
+lean_dec(x_9);
+x_252 = !lean_is_exclusive(x_244);
+if (x_252 == 0)
+{
+return x_244;
+}
+else
+{
+lean_object* x_253; lean_object* x_254; lean_object* x_255; 
+x_253 = lean_ctor_get(x_244, 0);
+x_254 = lean_ctor_get(x_244, 1);
 lean_inc(x_254);
 lean_inc(x_253);
-lean_dec(x_249);
-x_255 = lean_array_push(x_9, x_253);
-x_256 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_256, 0, x_255);
-lean_ctor_set(x_256, 1, x_254);
-return x_256;
-}
-}
-else
-{
-uint8_t x_257; 
-lean_dec(x_9);
-x_257 = !lean_is_exclusive(x_249);
-if (x_257 == 0)
-{
-return x_249;
-}
-else
-{
-lean_object* x_258; lean_object* x_259; lean_object* x_260; 
-x_258 = lean_ctor_get(x_249, 0);
-x_259 = lean_ctor_get(x_249, 1);
-lean_inc(x_259);
-lean_inc(x_258);
-lean_dec(x_249);
-x_260 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_260, 0, x_258);
-lean_ctor_set(x_260, 1, x_259);
-return x_260;
+lean_dec(x_244);
+x_255 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_255, 0, x_253);
+lean_ctor_set(x_255, 1, x_254);
+return x_255;
 }
 }
 }
 else
 {
-uint8_t x_261; 
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_261 = !lean_is_exclusive(x_242);
-if (x_261 == 0)
-{
-return x_242;
-}
-else
-{
-lean_object* x_262; lean_object* x_263; lean_object* x_264; 
-x_262 = lean_ctor_get(x_242, 0);
-x_263 = lean_ctor_get(x_242, 1);
-lean_inc(x_263);
-lean_inc(x_262);
-lean_dec(x_242);
-x_264 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_264, 0, x_262);
-lean_ctor_set(x_264, 1, x_263);
-return x_264;
-}
-}
-}
-else
-{
-uint8_t x_265; 
+uint8_t x_256; 
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -41424,29 +41428,29 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_265 = !lean_is_exclusive(x_236);
-if (x_265 == 0)
+x_256 = !lean_is_exclusive(x_236);
+if (x_256 == 0)
 {
 return x_236;
 }
 else
 {
-lean_object* x_266; lean_object* x_267; lean_object* x_268; 
-x_266 = lean_ctor_get(x_236, 0);
-x_267 = lean_ctor_get(x_236, 1);
-lean_inc(x_267);
-lean_inc(x_266);
+lean_object* x_257; lean_object* x_258; lean_object* x_259; 
+x_257 = lean_ctor_get(x_236, 0);
+x_258 = lean_ctor_get(x_236, 1);
+lean_inc(x_258);
+lean_inc(x_257);
 lean_dec(x_236);
-x_268 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_268, 0, x_266);
-lean_ctor_set(x_268, 1, x_267);
-return x_268;
+x_259 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_259, 0, x_257);
+lean_ctor_set(x_259, 1, x_258);
+return x_259;
 }
 }
 }
 else
 {
-uint8_t x_269; 
+uint8_t x_260; 
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -41459,23 +41463,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_269 = !lean_is_exclusive(x_232);
-if (x_269 == 0)
+x_260 = !lean_is_exclusive(x_232);
+if (x_260 == 0)
 {
 return x_232;
 }
 else
 {
-lean_object* x_270; lean_object* x_271; lean_object* x_272; 
-x_270 = lean_ctor_get(x_232, 0);
-x_271 = lean_ctor_get(x_232, 1);
-lean_inc(x_271);
-lean_inc(x_270);
+lean_object* x_261; lean_object* x_262; lean_object* x_263; 
+x_261 = lean_ctor_get(x_232, 0);
+x_262 = lean_ctor_get(x_232, 1);
+lean_inc(x_262);
+lean_inc(x_261);
 lean_dec(x_232);
-x_272 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_272, 0, x_270);
-lean_ctor_set(x_272, 1, x_271);
-return x_272;
+x_263 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_263, 0, x_261);
+lean_ctor_set(x_263, 1, x_262);
+return x_263;
 }
 }
 }
@@ -41483,39 +41487,39 @@ return x_272;
 }
 else
 {
-lean_object* x_273; lean_object* x_274; 
+lean_object* x_264; lean_object* x_265; 
 lean_dec(x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_273 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__18;
-x_274 = l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__1(x_273, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+x_264 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__18;
+x_265 = l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__1(x_264, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
-return x_274;
+return x_265;
 }
 }
 else
 {
-lean_object* x_275; lean_object* x_276; uint8_t x_277; 
-x_275 = lean_unsigned_to_nat(1u);
-x_276 = l_Lean_Syntax_getArg(x_1, x_275);
-lean_inc(x_276);
-x_277 = l_Lean_Syntax_isOfKind(x_276, x_26);
-if (x_277 == 0)
+lean_object* x_266; lean_object* x_267; uint8_t x_268; 
+x_266 = lean_unsigned_to_nat(1u);
+x_267 = l_Lean_Syntax_getArg(x_1, x_266);
+lean_inc(x_267);
+x_268 = l_Lean_Syntax_isOfKind(x_267, x_26);
+if (x_268 == 0)
 {
-uint8_t x_278; 
-lean_inc(x_276);
-x_278 = l_Lean_Syntax_isOfKind(x_276, x_28);
-if (x_278 == 0)
+uint8_t x_269; 
+lean_inc(x_267);
+x_269 = l_Lean_Syntax_isOfKind(x_267, x_28);
+if (x_269 == 0)
 {
-lean_object* x_279; 
-lean_dec(x_276);
+lean_object* x_270; 
+lean_dec(x_267);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -41528,303 +41532,303 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_279 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2___rarg(x_16);
-return x_279;
+x_270 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2___rarg(x_16);
+return x_270;
+}
+else
+{
+lean_object* x_271; lean_object* x_272; uint8_t x_273; 
+x_271 = lean_unsigned_to_nat(0u);
+x_272 = l_Lean_Syntax_getArg(x_267, x_271);
+lean_dec(x_267);
+x_273 = l_Lean_Syntax_isOfKind(x_272, x_26);
+if (x_273 == 0)
+{
+lean_object* x_274; 
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_274 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2___rarg(x_16);
+return x_274;
+}
+else
+{
+lean_object* x_275; uint8_t x_276; 
+x_275 = l_Lean_Syntax_getArg(x_1, x_266);
+lean_dec(x_1);
+x_276 = 1;
+x_1 = x_275;
+x_6 = x_276;
+goto _start;
+}
+}
+}
+else
+{
+uint8_t x_278; 
+lean_dec(x_1);
+x_278 = 1;
+x_1 = x_267;
+x_6 = x_278;
+goto _start;
+}
+}
 }
 else
 {
 lean_object* x_280; lean_object* x_281; uint8_t x_282; 
 x_280 = lean_unsigned_to_nat(0u);
-x_281 = l_Lean_Syntax_getArg(x_276, x_280);
-lean_dec(x_276);
+x_281 = l_Lean_Syntax_getArg(x_1, x_280);
+lean_inc(x_281);
 x_282 = l_Lean_Syntax_isOfKind(x_281, x_26);
 if (x_282 == 0)
 {
-lean_object* x_283; 
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_283 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2___rarg(x_16);
-return x_283;
-}
-else
-{
-lean_object* x_284; uint8_t x_285; 
-x_284 = l_Lean_Syntax_getArg(x_1, x_275);
-lean_dec(x_1);
-x_285 = 1;
-x_1 = x_284;
-x_6 = x_285;
-goto _start;
-}
-}
-}
-else
-{
-uint8_t x_287; 
-lean_dec(x_1);
-x_287 = 1;
-x_1 = x_276;
-x_6 = x_287;
-goto _start;
-}
-}
-}
-else
-{
-lean_object* x_289; lean_object* x_290; uint8_t x_291; 
-x_289 = lean_unsigned_to_nat(0u);
-x_290 = l_Lean_Syntax_getArg(x_1, x_289);
-lean_inc(x_290);
-x_291 = l_Lean_Syntax_isOfKind(x_290, x_26);
-if (x_291 == 0)
-{
-uint8_t x_292; uint8_t x_293; 
-lean_dec(x_290);
-x_292 = l_List_isEmpty___rarg(x_2);
+uint8_t x_283; uint8_t x_284; 
+lean_dec(x_281);
+x_283 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_384; 
-x_384 = 1;
-x_293 = x_384;
-goto block_383;
+uint8_t x_375; 
+x_375 = 1;
+x_284 = x_375;
+goto block_374;
 }
 else
 {
-uint8_t x_385; 
-x_385 = 0;
-x_293 = x_385;
-goto block_383;
+uint8_t x_376; 
+x_376 = 0;
+x_284 = x_376;
+goto block_374;
 }
-block_383:
+block_374:
 {
+if (x_283 == 0)
+{
+lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; 
+x_285 = lean_box(0);
+x_286 = lean_box(x_284);
+x_287 = lean_box(x_6);
+x_288 = lean_box(x_7);
+x_289 = lean_box(x_8);
+x_290 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_290, 0, x_1);
+lean_closure_set(x_290, 1, x_285);
+lean_closure_set(x_290, 2, x_286);
+lean_closure_set(x_290, 3, x_2);
+lean_closure_set(x_290, 4, x_3);
+lean_closure_set(x_290, 5, x_4);
+lean_closure_set(x_290, 6, x_5);
+lean_closure_set(x_290, 7, x_287);
+lean_closure_set(x_290, 8, x_288);
+lean_closure_set(x_290, 9, x_289);
+x_291 = l_Lean_Elab_Term_observing___rarg(x_290, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_291) == 0)
+{
+uint8_t x_292; 
+x_292 = !lean_is_exclusive(x_291);
 if (x_292 == 0)
 {
-lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; 
-x_294 = lean_box(0);
-x_295 = lean_box(x_293);
-x_296 = lean_box(x_6);
-x_297 = lean_box(x_7);
-x_298 = lean_box(x_8);
-x_299 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_299, 0, x_1);
-lean_closure_set(x_299, 1, x_294);
-lean_closure_set(x_299, 2, x_295);
-lean_closure_set(x_299, 3, x_2);
-lean_closure_set(x_299, 4, x_3);
-lean_closure_set(x_299, 5, x_4);
-lean_closure_set(x_299, 6, x_5);
-lean_closure_set(x_299, 7, x_296);
-lean_closure_set(x_299, 8, x_297);
-lean_closure_set(x_299, 9, x_298);
-x_300 = l_Lean_Elab_Term_observing___rarg(x_299, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_300) == 0)
-{
-uint8_t x_301; 
-x_301 = !lean_is_exclusive(x_300);
-if (x_301 == 0)
-{
-lean_object* x_302; lean_object* x_303; 
-x_302 = lean_ctor_get(x_300, 0);
-x_303 = lean_array_push(x_9, x_302);
-lean_ctor_set(x_300, 0, x_303);
-return x_300;
+lean_object* x_293; lean_object* x_294; 
+x_293 = lean_ctor_get(x_291, 0);
+x_294 = lean_array_push(x_9, x_293);
+lean_ctor_set(x_291, 0, x_294);
+return x_291;
 }
 else
 {
-lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; 
-x_304 = lean_ctor_get(x_300, 0);
-x_305 = lean_ctor_get(x_300, 1);
-lean_inc(x_305);
-lean_inc(x_304);
-lean_dec(x_300);
-x_306 = lean_array_push(x_9, x_304);
-x_307 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_307, 0, x_306);
-lean_ctor_set(x_307, 1, x_305);
-return x_307;
+lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; 
+x_295 = lean_ctor_get(x_291, 0);
+x_296 = lean_ctor_get(x_291, 1);
+lean_inc(x_296);
+lean_inc(x_295);
+lean_dec(x_291);
+x_297 = lean_array_push(x_9, x_295);
+x_298 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_298, 0, x_297);
+lean_ctor_set(x_298, 1, x_296);
+return x_298;
 }
 }
 else
 {
-uint8_t x_308; 
+uint8_t x_299; 
 lean_dec(x_9);
-x_308 = !lean_is_exclusive(x_300);
-if (x_308 == 0)
+x_299 = !lean_is_exclusive(x_291);
+if (x_299 == 0)
 {
-return x_300;
+return x_291;
 }
 else
 {
-lean_object* x_309; lean_object* x_310; lean_object* x_311; 
-x_309 = lean_ctor_get(x_300, 0);
-x_310 = lean_ctor_get(x_300, 1);
-lean_inc(x_310);
-lean_inc(x_309);
-lean_dec(x_300);
-x_311 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_311, 0, x_309);
-lean_ctor_set(x_311, 1, x_310);
-return x_311;
+lean_object* x_300; lean_object* x_301; lean_object* x_302; 
+x_300 = lean_ctor_get(x_291, 0);
+x_301 = lean_ctor_get(x_291, 1);
+lean_inc(x_301);
+lean_inc(x_300);
+lean_dec(x_291);
+x_302 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_302, 0, x_300);
+lean_ctor_set(x_302, 1, x_301);
+return x_302;
 }
 }
 }
 else
 {
-uint8_t x_312; 
-x_312 = l_Array_isEmpty___rarg(x_3);
-if (x_312 == 0)
+uint8_t x_303; 
+x_303 = l_Array_isEmpty___rarg(x_3);
+if (x_303 == 0)
 {
-lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; 
-x_313 = lean_box(0);
-x_314 = lean_box(x_293);
-x_315 = lean_box(x_6);
-x_316 = lean_box(x_7);
-x_317 = lean_box(x_8);
-x_318 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_318, 0, x_1);
-lean_closure_set(x_318, 1, x_313);
-lean_closure_set(x_318, 2, x_314);
-lean_closure_set(x_318, 3, x_2);
-lean_closure_set(x_318, 4, x_3);
-lean_closure_set(x_318, 5, x_4);
-lean_closure_set(x_318, 6, x_5);
-lean_closure_set(x_318, 7, x_315);
-lean_closure_set(x_318, 8, x_316);
-lean_closure_set(x_318, 9, x_317);
-x_319 = l_Lean_Elab_Term_observing___rarg(x_318, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_319) == 0)
+lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; 
+x_304 = lean_box(0);
+x_305 = lean_box(x_284);
+x_306 = lean_box(x_6);
+x_307 = lean_box(x_7);
+x_308 = lean_box(x_8);
+x_309 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_309, 0, x_1);
+lean_closure_set(x_309, 1, x_304);
+lean_closure_set(x_309, 2, x_305);
+lean_closure_set(x_309, 3, x_2);
+lean_closure_set(x_309, 4, x_3);
+lean_closure_set(x_309, 5, x_4);
+lean_closure_set(x_309, 6, x_5);
+lean_closure_set(x_309, 7, x_306);
+lean_closure_set(x_309, 8, x_307);
+lean_closure_set(x_309, 9, x_308);
+x_310 = l_Lean_Elab_Term_observing___rarg(x_309, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_310) == 0)
 {
-uint8_t x_320; 
-x_320 = !lean_is_exclusive(x_319);
-if (x_320 == 0)
+uint8_t x_311; 
+x_311 = !lean_is_exclusive(x_310);
+if (x_311 == 0)
 {
-lean_object* x_321; lean_object* x_322; 
-x_321 = lean_ctor_get(x_319, 0);
-x_322 = lean_array_push(x_9, x_321);
-lean_ctor_set(x_319, 0, x_322);
-return x_319;
+lean_object* x_312; lean_object* x_313; 
+x_312 = lean_ctor_get(x_310, 0);
+x_313 = lean_array_push(x_9, x_312);
+lean_ctor_set(x_310, 0, x_313);
+return x_310;
 }
 else
 {
-lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; 
-x_323 = lean_ctor_get(x_319, 0);
-x_324 = lean_ctor_get(x_319, 1);
-lean_inc(x_324);
-lean_inc(x_323);
-lean_dec(x_319);
-x_325 = lean_array_push(x_9, x_323);
-x_326 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_326, 0, x_325);
-lean_ctor_set(x_326, 1, x_324);
-return x_326;
+lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; 
+x_314 = lean_ctor_get(x_310, 0);
+x_315 = lean_ctor_get(x_310, 1);
+lean_inc(x_315);
+lean_inc(x_314);
+lean_dec(x_310);
+x_316 = lean_array_push(x_9, x_314);
+x_317 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_317, 0, x_316);
+lean_ctor_set(x_317, 1, x_315);
+return x_317;
 }
 }
 else
 {
-uint8_t x_327; 
+uint8_t x_318; 
 lean_dec(x_9);
-x_327 = !lean_is_exclusive(x_319);
-if (x_327 == 0)
+x_318 = !lean_is_exclusive(x_310);
+if (x_318 == 0)
 {
-return x_319;
+return x_310;
 }
 else
 {
-lean_object* x_328; lean_object* x_329; lean_object* x_330; 
-x_328 = lean_ctor_get(x_319, 0);
-x_329 = lean_ctor_get(x_319, 1);
-lean_inc(x_329);
-lean_inc(x_328);
-lean_dec(x_319);
-x_330 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_330, 0, x_328);
-lean_ctor_set(x_330, 1, x_329);
-return x_330;
+lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+x_319 = lean_ctor_get(x_310, 0);
+x_320 = lean_ctor_get(x_310, 1);
+lean_inc(x_320);
+lean_inc(x_319);
+lean_dec(x_310);
+x_321 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_321, 0, x_319);
+lean_ctor_set(x_321, 1, x_320);
+return x_321;
 }
 }
 }
 else
 {
-uint8_t x_331; 
-x_331 = l_Array_isEmpty___rarg(x_4);
-if (x_331 == 0)
+uint8_t x_322; 
+x_322 = l_Array_isEmpty___rarg(x_4);
+if (x_322 == 0)
 {
-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; 
-x_332 = lean_box(0);
-x_333 = lean_box(x_293);
-x_334 = lean_box(x_6);
-x_335 = lean_box(x_7);
-x_336 = lean_box(x_8);
-x_337 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_337, 0, x_1);
-lean_closure_set(x_337, 1, x_332);
-lean_closure_set(x_337, 2, x_333);
-lean_closure_set(x_337, 3, x_2);
-lean_closure_set(x_337, 4, x_3);
-lean_closure_set(x_337, 5, x_4);
-lean_closure_set(x_337, 6, x_5);
-lean_closure_set(x_337, 7, x_334);
-lean_closure_set(x_337, 8, x_335);
-lean_closure_set(x_337, 9, x_336);
-x_338 = l_Lean_Elab_Term_observing___rarg(x_337, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_338) == 0)
+lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; 
+x_323 = lean_box(0);
+x_324 = lean_box(x_284);
+x_325 = lean_box(x_6);
+x_326 = lean_box(x_7);
+x_327 = lean_box(x_8);
+x_328 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_328, 0, x_1);
+lean_closure_set(x_328, 1, x_323);
+lean_closure_set(x_328, 2, x_324);
+lean_closure_set(x_328, 3, x_2);
+lean_closure_set(x_328, 4, x_3);
+lean_closure_set(x_328, 5, x_4);
+lean_closure_set(x_328, 6, x_5);
+lean_closure_set(x_328, 7, x_325);
+lean_closure_set(x_328, 8, x_326);
+lean_closure_set(x_328, 9, x_327);
+x_329 = l_Lean_Elab_Term_observing___rarg(x_328, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_329) == 0)
 {
-uint8_t x_339; 
-x_339 = !lean_is_exclusive(x_338);
-if (x_339 == 0)
+uint8_t x_330; 
+x_330 = !lean_is_exclusive(x_329);
+if (x_330 == 0)
 {
-lean_object* x_340; lean_object* x_341; 
-x_340 = lean_ctor_get(x_338, 0);
-x_341 = lean_array_push(x_9, x_340);
-lean_ctor_set(x_338, 0, x_341);
-return x_338;
+lean_object* x_331; lean_object* x_332; 
+x_331 = lean_ctor_get(x_329, 0);
+x_332 = lean_array_push(x_9, x_331);
+lean_ctor_set(x_329, 0, x_332);
+return x_329;
 }
 else
 {
-lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; 
-x_342 = lean_ctor_get(x_338, 0);
-x_343 = lean_ctor_get(x_338, 1);
-lean_inc(x_343);
-lean_inc(x_342);
-lean_dec(x_338);
-x_344 = lean_array_push(x_9, x_342);
-x_345 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_345, 0, x_344);
-lean_ctor_set(x_345, 1, x_343);
-return x_345;
+lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; 
+x_333 = lean_ctor_get(x_329, 0);
+x_334 = lean_ctor_get(x_329, 1);
+lean_inc(x_334);
+lean_inc(x_333);
+lean_dec(x_329);
+x_335 = lean_array_push(x_9, x_333);
+x_336 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_336, 0, x_335);
+lean_ctor_set(x_336, 1, x_334);
+return x_336;
 }
 }
 else
 {
-uint8_t x_346; 
+uint8_t x_337; 
 lean_dec(x_9);
-x_346 = !lean_is_exclusive(x_338);
-if (x_346 == 0)
+x_337 = !lean_is_exclusive(x_329);
+if (x_337 == 0)
 {
-return x_338;
+return x_329;
 }
 else
 {
-lean_object* x_347; lean_object* x_348; lean_object* x_349; 
-x_347 = lean_ctor_get(x_338, 0);
-x_348 = lean_ctor_get(x_338, 1);
-lean_inc(x_348);
-lean_inc(x_347);
-lean_dec(x_338);
-x_349 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_349, 0, x_347);
-lean_ctor_set(x_349, 1, x_348);
-return x_349;
+lean_object* x_338; lean_object* x_339; lean_object* x_340; 
+x_338 = lean_ctor_get(x_329, 0);
+x_339 = lean_ctor_get(x_329, 1);
+lean_inc(x_339);
+lean_inc(x_338);
+lean_dec(x_329);
+x_340 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_340, 0, x_338);
+lean_ctor_set(x_340, 1, x_339);
+return x_340;
 }
 }
 }
@@ -41835,129 +41839,129 @@ lean_dec(x_3);
 lean_dec(x_2);
 if (x_8 == 0)
 {
-uint8_t x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; 
-x_350 = 1;
-x_351 = lean_box(x_350);
-x_352 = lean_box(x_350);
-x_353 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_353, 0, x_1);
-lean_closure_set(x_353, 1, x_5);
-lean_closure_set(x_353, 2, x_351);
-lean_closure_set(x_353, 3, x_352);
-x_354 = l_Lean_Elab_Term_observing___rarg(x_353, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_354) == 0)
+uint8_t x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; 
+x_341 = 1;
+x_342 = lean_box(x_341);
+x_343 = lean_box(x_341);
+x_344 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_344, 0, x_1);
+lean_closure_set(x_344, 1, x_5);
+lean_closure_set(x_344, 2, x_342);
+lean_closure_set(x_344, 3, x_343);
+x_345 = l_Lean_Elab_Term_observing___rarg(x_344, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_345) == 0)
 {
-uint8_t x_355; 
-x_355 = !lean_is_exclusive(x_354);
-if (x_355 == 0)
+uint8_t x_346; 
+x_346 = !lean_is_exclusive(x_345);
+if (x_346 == 0)
 {
-lean_object* x_356; lean_object* x_357; 
-x_356 = lean_ctor_get(x_354, 0);
-x_357 = lean_array_push(x_9, x_356);
-lean_ctor_set(x_354, 0, x_357);
-return x_354;
+lean_object* x_347; lean_object* x_348; 
+x_347 = lean_ctor_get(x_345, 0);
+x_348 = lean_array_push(x_9, x_347);
+lean_ctor_set(x_345, 0, x_348);
+return x_345;
 }
 else
 {
-lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; 
-x_358 = lean_ctor_get(x_354, 0);
-x_359 = lean_ctor_get(x_354, 1);
-lean_inc(x_359);
-lean_inc(x_358);
-lean_dec(x_354);
-x_360 = lean_array_push(x_9, x_358);
-x_361 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_361, 0, x_360);
-lean_ctor_set(x_361, 1, x_359);
-return x_361;
+lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; 
+x_349 = lean_ctor_get(x_345, 0);
+x_350 = lean_ctor_get(x_345, 1);
+lean_inc(x_350);
+lean_inc(x_349);
+lean_dec(x_345);
+x_351 = lean_array_push(x_9, x_349);
+x_352 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_352, 0, x_351);
+lean_ctor_set(x_352, 1, x_350);
+return x_352;
 }
 }
 else
 {
-uint8_t x_362; 
+uint8_t x_353; 
 lean_dec(x_9);
-x_362 = !lean_is_exclusive(x_354);
-if (x_362 == 0)
+x_353 = !lean_is_exclusive(x_345);
+if (x_353 == 0)
 {
-return x_354;
+return x_345;
 }
 else
 {
-lean_object* x_363; lean_object* x_364; lean_object* x_365; 
-x_363 = lean_ctor_get(x_354, 0);
-x_364 = lean_ctor_get(x_354, 1);
-lean_inc(x_364);
-lean_inc(x_363);
-lean_dec(x_354);
-x_365 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_365, 0, x_363);
-lean_ctor_set(x_365, 1, x_364);
-return x_365;
+lean_object* x_354; lean_object* x_355; lean_object* x_356; 
+x_354 = lean_ctor_get(x_345, 0);
+x_355 = lean_ctor_get(x_345, 1);
+lean_inc(x_355);
+lean_inc(x_354);
+lean_dec(x_345);
+x_356 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_356, 0, x_354);
+lean_ctor_set(x_356, 1, x_355);
+return x_356;
 }
 }
 }
 else
 {
-lean_object* x_366; uint8_t x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; 
-x_366 = lean_box(0);
-x_367 = 1;
-x_368 = lean_box(x_293);
-x_369 = lean_box(x_367);
-x_370 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_370, 0, x_1);
-lean_closure_set(x_370, 1, x_5);
-lean_closure_set(x_370, 2, x_368);
-lean_closure_set(x_370, 3, x_369);
-lean_closure_set(x_370, 4, x_366);
-x_371 = l_Lean_Elab_Term_observing___rarg(x_370, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_371) == 0)
+lean_object* x_357; uint8_t x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; 
+x_357 = lean_box(0);
+x_358 = 1;
+x_359 = lean_box(x_284);
+x_360 = lean_box(x_358);
+x_361 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_361, 0, x_1);
+lean_closure_set(x_361, 1, x_5);
+lean_closure_set(x_361, 2, x_359);
+lean_closure_set(x_361, 3, x_360);
+lean_closure_set(x_361, 4, x_357);
+x_362 = l_Lean_Elab_Term_observing___rarg(x_361, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_362) == 0)
 {
-uint8_t x_372; 
-x_372 = !lean_is_exclusive(x_371);
-if (x_372 == 0)
+uint8_t x_363; 
+x_363 = !lean_is_exclusive(x_362);
+if (x_363 == 0)
 {
-lean_object* x_373; lean_object* x_374; 
-x_373 = lean_ctor_get(x_371, 0);
-x_374 = lean_array_push(x_9, x_373);
-lean_ctor_set(x_371, 0, x_374);
-return x_371;
+lean_object* x_364; lean_object* x_365; 
+x_364 = lean_ctor_get(x_362, 0);
+x_365 = lean_array_push(x_9, x_364);
+lean_ctor_set(x_362, 0, x_365);
+return x_362;
 }
 else
 {
-lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; 
-x_375 = lean_ctor_get(x_371, 0);
-x_376 = lean_ctor_get(x_371, 1);
-lean_inc(x_376);
-lean_inc(x_375);
-lean_dec(x_371);
-x_377 = lean_array_push(x_9, x_375);
-x_378 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_378, 0, x_377);
-lean_ctor_set(x_378, 1, x_376);
-return x_378;
+lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; 
+x_366 = lean_ctor_get(x_362, 0);
+x_367 = lean_ctor_get(x_362, 1);
+lean_inc(x_367);
+lean_inc(x_366);
+lean_dec(x_362);
+x_368 = lean_array_push(x_9, x_366);
+x_369 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_369, 0, x_368);
+lean_ctor_set(x_369, 1, x_367);
+return x_369;
 }
 }
 else
 {
-uint8_t x_379; 
+uint8_t x_370; 
 lean_dec(x_9);
-x_379 = !lean_is_exclusive(x_371);
-if (x_379 == 0)
+x_370 = !lean_is_exclusive(x_362);
+if (x_370 == 0)
 {
-return x_371;
+return x_362;
 }
 else
 {
-lean_object* x_380; lean_object* x_381; lean_object* x_382; 
-x_380 = lean_ctor_get(x_371, 0);
-x_381 = lean_ctor_get(x_371, 1);
-lean_inc(x_381);
-lean_inc(x_380);
-lean_dec(x_371);
-x_382 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_382, 0, x_380);
-lean_ctor_set(x_382, 1, x_381);
-return x_382;
+lean_object* x_371; lean_object* x_372; lean_object* x_373; 
+x_371 = lean_ctor_get(x_362, 0);
+x_372 = lean_ctor_get(x_362, 1);
+lean_inc(x_372);
+lean_inc(x_371);
+lean_dec(x_362);
+x_373 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_373, 0, x_371);
+lean_ctor_set(x_373, 1, x_372);
+return x_373;
 }
 }
 }
@@ -41968,37 +41972,37 @@ return x_382;
 }
 else
 {
-lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; 
-x_386 = lean_unsigned_to_nat(2u);
-x_387 = l_Lean_Syntax_getArg(x_1, x_386);
+lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; lean_object* x_381; 
+x_377 = lean_unsigned_to_nat(2u);
+x_378 = l_Lean_Syntax_getArg(x_1, x_377);
 lean_dec(x_1);
-x_388 = l_Lean_Syntax_getArgs(x_387);
-lean_dec(x_387);
-x_389 = l_Lean_Syntax_TSepArray_getElems___rarg(x_388);
-lean_dec(x_388);
+x_379 = l_Lean_Syntax_getArgs(x_378);
+lean_dec(x_378);
+x_380 = l_Lean_Syntax_TSepArray_getElems___rarg(x_379);
+lean_dec(x_379);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_inc(x_13);
 lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
-x_390 = l_Lean_Elab_Term_elabExplicitUnivs(x_389, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-lean_dec(x_389);
-if (lean_obj_tag(x_390) == 0)
+x_381 = l_Lean_Elab_Term_elabExplicitUnivs(x_380, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_380);
+if (lean_obj_tag(x_381) == 0)
 {
-lean_object* x_391; lean_object* x_392; lean_object* x_393; 
-x_391 = lean_ctor_get(x_390, 0);
-lean_inc(x_391);
-x_392 = lean_ctor_get(x_390, 1);
-lean_inc(x_392);
-lean_dec(x_390);
-x_393 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId(x_290, x_391, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_392);
-return x_393;
+lean_object* x_382; lean_object* x_383; lean_object* x_384; 
+x_382 = lean_ctor_get(x_381, 0);
+lean_inc(x_382);
+x_383 = lean_ctor_get(x_381, 1);
+lean_inc(x_383);
+lean_dec(x_381);
+x_384 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId(x_281, x_382, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_383);
+return x_384;
 }
 else
 {
-uint8_t x_394; 
-lean_dec(x_290);
+uint8_t x_385; 
+lean_dec(x_281);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -42010,666 +42014,666 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_394 = !lean_is_exclusive(x_390);
-if (x_394 == 0)
+x_385 = !lean_is_exclusive(x_381);
+if (x_385 == 0)
 {
+return x_381;
+}
+else
+{
+lean_object* x_386; lean_object* x_387; lean_object* x_388; 
+x_386 = lean_ctor_get(x_381, 0);
+x_387 = lean_ctor_get(x_381, 1);
+lean_inc(x_387);
+lean_inc(x_386);
+lean_dec(x_381);
+x_388 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_388, 0, x_386);
+lean_ctor_set(x_388, 1, x_387);
+return x_388;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_389; lean_object* x_390; 
+x_389 = lean_box(0);
+x_390 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId(x_1, x_389, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 return x_390;
 }
-else
-{
-lean_object* x_395; lean_object* x_396; lean_object* x_397; 
-x_395 = lean_ctor_get(x_390, 0);
-x_396 = lean_ctor_get(x_390, 1);
-lean_inc(x_396);
-lean_inc(x_395);
-lean_dec(x_390);
-x_397 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_397, 0, x_395);
-lean_ctor_set(x_397, 1, x_396);
-return x_397;
-}
-}
-}
-}
 }
 else
 {
-lean_object* x_398; lean_object* x_399; 
-x_398 = lean_box(0);
-x_399 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId(x_1, x_398, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-return x_399;
-}
-}
-else
+lean_object* x_391; lean_object* x_392; lean_object* x_393; uint8_t x_394; 
+x_391 = lean_unsigned_to_nat(0u);
+x_392 = l_Lean_Syntax_getArg(x_1, x_391);
+x_393 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
+x_394 = l_Lean_Syntax_isOfKind(x_392, x_393);
+if (x_394 == 0)
 {
-lean_object* x_400; lean_object* x_401; lean_object* x_402; uint8_t x_403; 
-x_400 = lean_unsigned_to_nat(0u);
-x_401 = l_Lean_Syntax_getArg(x_1, x_400);
-x_402 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
-x_403 = l_Lean_Syntax_isOfKind(x_401, x_402);
-if (x_403 == 0)
-{
-uint8_t x_404; uint8_t x_405; 
-x_404 = l_List_isEmpty___rarg(x_2);
+uint8_t x_395; uint8_t x_396; 
+x_395 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_496; 
-x_496 = 1;
-x_405 = x_496;
-goto block_495;
+uint8_t x_487; 
+x_487 = 1;
+x_396 = x_487;
+goto block_486;
 }
 else
 {
-uint8_t x_497; 
-x_497 = 0;
-x_405 = x_497;
-goto block_495;
+uint8_t x_488; 
+x_488 = 0;
+x_396 = x_488;
+goto block_486;
 }
-block_495:
+block_486:
 {
+if (x_395 == 0)
+{
+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; 
+x_397 = lean_box(0);
+x_398 = lean_box(x_396);
+x_399 = lean_box(x_6);
+x_400 = lean_box(x_7);
+x_401 = lean_box(x_8);
+x_402 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_402, 0, x_1);
+lean_closure_set(x_402, 1, x_397);
+lean_closure_set(x_402, 2, x_398);
+lean_closure_set(x_402, 3, x_2);
+lean_closure_set(x_402, 4, x_3);
+lean_closure_set(x_402, 5, x_4);
+lean_closure_set(x_402, 6, x_5);
+lean_closure_set(x_402, 7, x_399);
+lean_closure_set(x_402, 8, x_400);
+lean_closure_set(x_402, 9, x_401);
+x_403 = l_Lean_Elab_Term_observing___rarg(x_402, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_403) == 0)
+{
+uint8_t x_404; 
+x_404 = !lean_is_exclusive(x_403);
 if (x_404 == 0)
 {
-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; 
-x_406 = lean_box(0);
-x_407 = lean_box(x_405);
-x_408 = lean_box(x_6);
-x_409 = lean_box(x_7);
-x_410 = lean_box(x_8);
-x_411 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_411, 0, x_1);
-lean_closure_set(x_411, 1, x_406);
-lean_closure_set(x_411, 2, x_407);
-lean_closure_set(x_411, 3, x_2);
-lean_closure_set(x_411, 4, x_3);
-lean_closure_set(x_411, 5, x_4);
-lean_closure_set(x_411, 6, x_5);
-lean_closure_set(x_411, 7, x_408);
-lean_closure_set(x_411, 8, x_409);
-lean_closure_set(x_411, 9, x_410);
-x_412 = l_Lean_Elab_Term_observing___rarg(x_411, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_412) == 0)
-{
-uint8_t x_413; 
-x_413 = !lean_is_exclusive(x_412);
-if (x_413 == 0)
-{
-lean_object* x_414; lean_object* x_415; 
-x_414 = lean_ctor_get(x_412, 0);
-x_415 = lean_array_push(x_9, x_414);
-lean_ctor_set(x_412, 0, x_415);
-return x_412;
+lean_object* x_405; lean_object* x_406; 
+x_405 = lean_ctor_get(x_403, 0);
+x_406 = lean_array_push(x_9, x_405);
+lean_ctor_set(x_403, 0, x_406);
+return x_403;
 }
 else
 {
-lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; 
-x_416 = lean_ctor_get(x_412, 0);
-x_417 = lean_ctor_get(x_412, 1);
-lean_inc(x_417);
-lean_inc(x_416);
-lean_dec(x_412);
-x_418 = lean_array_push(x_9, x_416);
-x_419 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_419, 0, x_418);
-lean_ctor_set(x_419, 1, x_417);
-return x_419;
+lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; 
+x_407 = lean_ctor_get(x_403, 0);
+x_408 = lean_ctor_get(x_403, 1);
+lean_inc(x_408);
+lean_inc(x_407);
+lean_dec(x_403);
+x_409 = lean_array_push(x_9, x_407);
+x_410 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_410, 0, x_409);
+lean_ctor_set(x_410, 1, x_408);
+return x_410;
 }
 }
 else
 {
-uint8_t x_420; 
+uint8_t x_411; 
 lean_dec(x_9);
-x_420 = !lean_is_exclusive(x_412);
-if (x_420 == 0)
+x_411 = !lean_is_exclusive(x_403);
+if (x_411 == 0)
 {
-return x_412;
+return x_403;
 }
 else
 {
-lean_object* x_421; lean_object* x_422; lean_object* x_423; 
-x_421 = lean_ctor_get(x_412, 0);
-x_422 = lean_ctor_get(x_412, 1);
-lean_inc(x_422);
-lean_inc(x_421);
-lean_dec(x_412);
-x_423 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_423, 0, x_421);
-lean_ctor_set(x_423, 1, x_422);
-return x_423;
+lean_object* x_412; lean_object* x_413; lean_object* x_414; 
+x_412 = lean_ctor_get(x_403, 0);
+x_413 = lean_ctor_get(x_403, 1);
+lean_inc(x_413);
+lean_inc(x_412);
+lean_dec(x_403);
+x_414 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_414, 0, x_412);
+lean_ctor_set(x_414, 1, x_413);
+return x_414;
 }
 }
 }
 else
 {
-uint8_t x_424; 
-x_424 = l_Array_isEmpty___rarg(x_3);
-if (x_424 == 0)
+uint8_t x_415; 
+x_415 = l_Array_isEmpty___rarg(x_3);
+if (x_415 == 0)
 {
-lean_object* x_425; lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; lean_object* x_430; lean_object* x_431; 
-x_425 = lean_box(0);
-x_426 = lean_box(x_405);
-x_427 = lean_box(x_6);
-x_428 = lean_box(x_7);
-x_429 = lean_box(x_8);
-x_430 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_430, 0, x_1);
-lean_closure_set(x_430, 1, x_425);
-lean_closure_set(x_430, 2, x_426);
-lean_closure_set(x_430, 3, x_2);
-lean_closure_set(x_430, 4, x_3);
-lean_closure_set(x_430, 5, x_4);
-lean_closure_set(x_430, 6, x_5);
-lean_closure_set(x_430, 7, x_427);
-lean_closure_set(x_430, 8, x_428);
-lean_closure_set(x_430, 9, x_429);
-x_431 = l_Lean_Elab_Term_observing___rarg(x_430, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_431) == 0)
+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; 
+x_416 = lean_box(0);
+x_417 = lean_box(x_396);
+x_418 = lean_box(x_6);
+x_419 = lean_box(x_7);
+x_420 = lean_box(x_8);
+x_421 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_421, 0, x_1);
+lean_closure_set(x_421, 1, x_416);
+lean_closure_set(x_421, 2, x_417);
+lean_closure_set(x_421, 3, x_2);
+lean_closure_set(x_421, 4, x_3);
+lean_closure_set(x_421, 5, x_4);
+lean_closure_set(x_421, 6, x_5);
+lean_closure_set(x_421, 7, x_418);
+lean_closure_set(x_421, 8, x_419);
+lean_closure_set(x_421, 9, x_420);
+x_422 = l_Lean_Elab_Term_observing___rarg(x_421, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_422) == 0)
 {
-uint8_t x_432; 
-x_432 = !lean_is_exclusive(x_431);
-if (x_432 == 0)
+uint8_t x_423; 
+x_423 = !lean_is_exclusive(x_422);
+if (x_423 == 0)
 {
-lean_object* x_433; lean_object* x_434; 
-x_433 = lean_ctor_get(x_431, 0);
-x_434 = lean_array_push(x_9, x_433);
-lean_ctor_set(x_431, 0, x_434);
-return x_431;
+lean_object* x_424; lean_object* x_425; 
+x_424 = lean_ctor_get(x_422, 0);
+x_425 = lean_array_push(x_9, x_424);
+lean_ctor_set(x_422, 0, x_425);
+return x_422;
 }
 else
 {
-lean_object* x_435; lean_object* x_436; lean_object* x_437; lean_object* x_438; 
-x_435 = lean_ctor_get(x_431, 0);
-x_436 = lean_ctor_get(x_431, 1);
-lean_inc(x_436);
-lean_inc(x_435);
-lean_dec(x_431);
-x_437 = lean_array_push(x_9, x_435);
-x_438 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_438, 0, x_437);
-lean_ctor_set(x_438, 1, x_436);
-return x_438;
+lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; 
+x_426 = lean_ctor_get(x_422, 0);
+x_427 = lean_ctor_get(x_422, 1);
+lean_inc(x_427);
+lean_inc(x_426);
+lean_dec(x_422);
+x_428 = lean_array_push(x_9, x_426);
+x_429 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_429, 0, x_428);
+lean_ctor_set(x_429, 1, x_427);
+return x_429;
 }
 }
 else
 {
-uint8_t x_439; 
+uint8_t x_430; 
 lean_dec(x_9);
-x_439 = !lean_is_exclusive(x_431);
-if (x_439 == 0)
+x_430 = !lean_is_exclusive(x_422);
+if (x_430 == 0)
 {
-return x_431;
+return x_422;
 }
 else
 {
-lean_object* x_440; lean_object* x_441; lean_object* x_442; 
-x_440 = lean_ctor_get(x_431, 0);
-x_441 = lean_ctor_get(x_431, 1);
-lean_inc(x_441);
-lean_inc(x_440);
-lean_dec(x_431);
-x_442 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_442, 0, x_440);
-lean_ctor_set(x_442, 1, x_441);
-return x_442;
+lean_object* x_431; lean_object* x_432; lean_object* x_433; 
+x_431 = lean_ctor_get(x_422, 0);
+x_432 = lean_ctor_get(x_422, 1);
+lean_inc(x_432);
+lean_inc(x_431);
+lean_dec(x_422);
+x_433 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_433, 0, x_431);
+lean_ctor_set(x_433, 1, x_432);
+return x_433;
 }
 }
 }
 else
 {
-uint8_t x_443; 
-x_443 = l_Array_isEmpty___rarg(x_4);
-if (x_443 == 0)
+uint8_t x_434; 
+x_434 = l_Array_isEmpty___rarg(x_4);
+if (x_434 == 0)
 {
-lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; lean_object* x_448; lean_object* x_449; lean_object* x_450; 
-x_444 = lean_box(0);
-x_445 = lean_box(x_405);
-x_446 = lean_box(x_6);
-x_447 = lean_box(x_7);
-x_448 = lean_box(x_8);
-x_449 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_449, 0, x_1);
-lean_closure_set(x_449, 1, x_444);
-lean_closure_set(x_449, 2, x_445);
-lean_closure_set(x_449, 3, x_2);
-lean_closure_set(x_449, 4, x_3);
-lean_closure_set(x_449, 5, x_4);
-lean_closure_set(x_449, 6, x_5);
-lean_closure_set(x_449, 7, x_446);
-lean_closure_set(x_449, 8, x_447);
-lean_closure_set(x_449, 9, x_448);
-x_450 = l_Lean_Elab_Term_observing___rarg(x_449, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_450) == 0)
+lean_object* x_435; lean_object* x_436; lean_object* x_437; lean_object* x_438; lean_object* x_439; lean_object* x_440; lean_object* x_441; 
+x_435 = lean_box(0);
+x_436 = lean_box(x_396);
+x_437 = lean_box(x_6);
+x_438 = lean_box(x_7);
+x_439 = lean_box(x_8);
+x_440 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_440, 0, x_1);
+lean_closure_set(x_440, 1, x_435);
+lean_closure_set(x_440, 2, x_436);
+lean_closure_set(x_440, 3, x_2);
+lean_closure_set(x_440, 4, x_3);
+lean_closure_set(x_440, 5, x_4);
+lean_closure_set(x_440, 6, x_5);
+lean_closure_set(x_440, 7, x_437);
+lean_closure_set(x_440, 8, x_438);
+lean_closure_set(x_440, 9, x_439);
+x_441 = l_Lean_Elab_Term_observing___rarg(x_440, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_441) == 0)
 {
-uint8_t x_451; 
-x_451 = !lean_is_exclusive(x_450);
-if (x_451 == 0)
+uint8_t x_442; 
+x_442 = !lean_is_exclusive(x_441);
+if (x_442 == 0)
 {
-lean_object* x_452; lean_object* x_453; 
-x_452 = lean_ctor_get(x_450, 0);
-x_453 = lean_array_push(x_9, x_452);
-lean_ctor_set(x_450, 0, x_453);
-return x_450;
+lean_object* x_443; lean_object* x_444; 
+x_443 = lean_ctor_get(x_441, 0);
+x_444 = lean_array_push(x_9, x_443);
+lean_ctor_set(x_441, 0, x_444);
+return x_441;
 }
 else
 {
-lean_object* x_454; lean_object* x_455; lean_object* x_456; lean_object* x_457; 
-x_454 = lean_ctor_get(x_450, 0);
-x_455 = lean_ctor_get(x_450, 1);
-lean_inc(x_455);
-lean_inc(x_454);
-lean_dec(x_450);
-x_456 = lean_array_push(x_9, x_454);
-x_457 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_457, 0, x_456);
-lean_ctor_set(x_457, 1, x_455);
-return x_457;
+lean_object* x_445; lean_object* x_446; lean_object* x_447; lean_object* x_448; 
+x_445 = lean_ctor_get(x_441, 0);
+x_446 = lean_ctor_get(x_441, 1);
+lean_inc(x_446);
+lean_inc(x_445);
+lean_dec(x_441);
+x_447 = lean_array_push(x_9, x_445);
+x_448 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_448, 0, x_447);
+lean_ctor_set(x_448, 1, x_446);
+return x_448;
 }
 }
 else
 {
+uint8_t x_449; 
+lean_dec(x_9);
+x_449 = !lean_is_exclusive(x_441);
+if (x_449 == 0)
+{
+return x_441;
+}
+else
+{
+lean_object* x_450; lean_object* x_451; lean_object* x_452; 
+x_450 = lean_ctor_get(x_441, 0);
+x_451 = lean_ctor_get(x_441, 1);
+lean_inc(x_451);
+lean_inc(x_450);
+lean_dec(x_441);
+x_452 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_452, 0, x_450);
+lean_ctor_set(x_452, 1, x_451);
+return x_452;
+}
+}
+}
+else
+{
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (x_8 == 0)
+{
+uint8_t x_453; lean_object* x_454; lean_object* x_455; lean_object* x_456; lean_object* x_457; 
+x_453 = 1;
+x_454 = lean_box(x_453);
+x_455 = lean_box(x_453);
+x_456 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_456, 0, x_1);
+lean_closure_set(x_456, 1, x_5);
+lean_closure_set(x_456, 2, x_454);
+lean_closure_set(x_456, 3, x_455);
+x_457 = l_Lean_Elab_Term_observing___rarg(x_456, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_457) == 0)
+{
 uint8_t x_458; 
-lean_dec(x_9);
-x_458 = !lean_is_exclusive(x_450);
+x_458 = !lean_is_exclusive(x_457);
 if (x_458 == 0)
 {
-return x_450;
+lean_object* x_459; lean_object* x_460; 
+x_459 = lean_ctor_get(x_457, 0);
+x_460 = lean_array_push(x_9, x_459);
+lean_ctor_set(x_457, 0, x_460);
+return x_457;
 }
 else
 {
-lean_object* x_459; lean_object* x_460; lean_object* x_461; 
-x_459 = lean_ctor_get(x_450, 0);
-x_460 = lean_ctor_get(x_450, 1);
-lean_inc(x_460);
-lean_inc(x_459);
-lean_dec(x_450);
-x_461 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_461, 0, x_459);
-lean_ctor_set(x_461, 1, x_460);
-return x_461;
-}
+lean_object* x_461; lean_object* x_462; lean_object* x_463; lean_object* x_464; 
+x_461 = lean_ctor_get(x_457, 0);
+x_462 = lean_ctor_get(x_457, 1);
+lean_inc(x_462);
+lean_inc(x_461);
+lean_dec(x_457);
+x_463 = lean_array_push(x_9, x_461);
+x_464 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_464, 0, x_463);
+lean_ctor_set(x_464, 1, x_462);
+return x_464;
 }
 }
 else
 {
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-if (x_8 == 0)
-{
-uint8_t x_462; lean_object* x_463; lean_object* x_464; lean_object* x_465; lean_object* x_466; 
-x_462 = 1;
-x_463 = lean_box(x_462);
-x_464 = lean_box(x_462);
-x_465 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_465, 0, x_1);
-lean_closure_set(x_465, 1, x_5);
-lean_closure_set(x_465, 2, x_463);
-lean_closure_set(x_465, 3, x_464);
-x_466 = l_Lean_Elab_Term_observing___rarg(x_465, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_466) == 0)
-{
-uint8_t x_467; 
-x_467 = !lean_is_exclusive(x_466);
-if (x_467 == 0)
-{
-lean_object* x_468; lean_object* x_469; 
-x_468 = lean_ctor_get(x_466, 0);
-x_469 = lean_array_push(x_9, x_468);
-lean_ctor_set(x_466, 0, x_469);
-return x_466;
-}
-else
-{
-lean_object* x_470; lean_object* x_471; lean_object* x_472; lean_object* x_473; 
-x_470 = lean_ctor_get(x_466, 0);
-x_471 = lean_ctor_get(x_466, 1);
-lean_inc(x_471);
-lean_inc(x_470);
-lean_dec(x_466);
-x_472 = lean_array_push(x_9, x_470);
-x_473 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_473, 0, x_472);
-lean_ctor_set(x_473, 1, x_471);
-return x_473;
-}
-}
-else
-{
-uint8_t x_474; 
+uint8_t x_465; 
 lean_dec(x_9);
-x_474 = !lean_is_exclusive(x_466);
-if (x_474 == 0)
+x_465 = !lean_is_exclusive(x_457);
+if (x_465 == 0)
 {
-return x_466;
+return x_457;
 }
 else
 {
-lean_object* x_475; lean_object* x_476; lean_object* x_477; 
-x_475 = lean_ctor_get(x_466, 0);
-x_476 = lean_ctor_get(x_466, 1);
-lean_inc(x_476);
-lean_inc(x_475);
-lean_dec(x_466);
-x_477 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_477, 0, x_475);
-lean_ctor_set(x_477, 1, x_476);
-return x_477;
+lean_object* x_466; lean_object* x_467; lean_object* x_468; 
+x_466 = lean_ctor_get(x_457, 0);
+x_467 = lean_ctor_get(x_457, 1);
+lean_inc(x_467);
+lean_inc(x_466);
+lean_dec(x_457);
+x_468 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_468, 0, x_466);
+lean_ctor_set(x_468, 1, x_467);
+return x_468;
 }
 }
 }
 else
 {
-lean_object* x_478; uint8_t x_479; lean_object* x_480; lean_object* x_481; lean_object* x_482; lean_object* x_483; 
-x_478 = lean_box(0);
-x_479 = 1;
-x_480 = lean_box(x_405);
-x_481 = lean_box(x_479);
-x_482 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_482, 0, x_1);
-lean_closure_set(x_482, 1, x_5);
-lean_closure_set(x_482, 2, x_480);
-lean_closure_set(x_482, 3, x_481);
-lean_closure_set(x_482, 4, x_478);
-x_483 = l_Lean_Elab_Term_observing___rarg(x_482, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_483) == 0)
+lean_object* x_469; uint8_t x_470; lean_object* x_471; lean_object* x_472; lean_object* x_473; lean_object* x_474; 
+x_469 = lean_box(0);
+x_470 = 1;
+x_471 = lean_box(x_396);
+x_472 = lean_box(x_470);
+x_473 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_473, 0, x_1);
+lean_closure_set(x_473, 1, x_5);
+lean_closure_set(x_473, 2, x_471);
+lean_closure_set(x_473, 3, x_472);
+lean_closure_set(x_473, 4, x_469);
+x_474 = l_Lean_Elab_Term_observing___rarg(x_473, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_474) == 0)
 {
-uint8_t x_484; 
-x_484 = !lean_is_exclusive(x_483);
-if (x_484 == 0)
+uint8_t x_475; 
+x_475 = !lean_is_exclusive(x_474);
+if (x_475 == 0)
 {
-lean_object* x_485; lean_object* x_486; 
-x_485 = lean_ctor_get(x_483, 0);
-x_486 = lean_array_push(x_9, x_485);
-lean_ctor_set(x_483, 0, x_486);
-return x_483;
+lean_object* x_476; lean_object* x_477; 
+x_476 = lean_ctor_get(x_474, 0);
+x_477 = lean_array_push(x_9, x_476);
+lean_ctor_set(x_474, 0, x_477);
+return x_474;
 }
 else
 {
-lean_object* x_487; lean_object* x_488; lean_object* x_489; lean_object* x_490; 
-x_487 = lean_ctor_get(x_483, 0);
-x_488 = lean_ctor_get(x_483, 1);
-lean_inc(x_488);
-lean_inc(x_487);
-lean_dec(x_483);
-x_489 = lean_array_push(x_9, x_487);
-x_490 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_490, 0, x_489);
-lean_ctor_set(x_490, 1, x_488);
-return x_490;
+lean_object* x_478; lean_object* x_479; lean_object* x_480; lean_object* x_481; 
+x_478 = lean_ctor_get(x_474, 0);
+x_479 = lean_ctor_get(x_474, 1);
+lean_inc(x_479);
+lean_inc(x_478);
+lean_dec(x_474);
+x_480 = lean_array_push(x_9, x_478);
+x_481 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_481, 0, x_480);
+lean_ctor_set(x_481, 1, x_479);
+return x_481;
 }
 }
 else
 {
-uint8_t x_491; 
+uint8_t x_482; 
 lean_dec(x_9);
-x_491 = !lean_is_exclusive(x_483);
+x_482 = !lean_is_exclusive(x_474);
+if (x_482 == 0)
+{
+return x_474;
+}
+else
+{
+lean_object* x_483; lean_object* x_484; lean_object* x_485; 
+x_483 = lean_ctor_get(x_474, 0);
+x_484 = lean_ctor_get(x_474, 1);
+lean_inc(x_484);
+lean_inc(x_483);
+lean_dec(x_474);
+x_485 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_485, 0, x_483);
+lean_ctor_set(x_485, 1, x_484);
+return x_485;
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_489; lean_object* x_490; uint8_t x_491; 
+x_489 = lean_unsigned_to_nat(2u);
+x_490 = l_Lean_Syntax_getArg(x_1, x_489);
+x_491 = l_Lean_Syntax_matchesNull(x_490, x_391);
 if (x_491 == 0)
 {
-return x_483;
-}
-else
-{
-lean_object* x_492; lean_object* x_493; lean_object* x_494; 
-x_492 = lean_ctor_get(x_483, 0);
-x_493 = lean_ctor_get(x_483, 1);
-lean_inc(x_493);
-lean_inc(x_492);
-lean_dec(x_483);
-x_494 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_494, 0, x_492);
-lean_ctor_set(x_494, 1, x_493);
-return x_494;
-}
-}
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_498; lean_object* x_499; uint8_t x_500; 
-x_498 = lean_unsigned_to_nat(2u);
-x_499 = l_Lean_Syntax_getArg(x_1, x_498);
-x_500 = l_Lean_Syntax_matchesNull(x_499, x_400);
-if (x_500 == 0)
-{
-uint8_t x_501; uint8_t x_502; 
-x_501 = l_List_isEmpty___rarg(x_2);
+uint8_t x_492; uint8_t x_493; 
+x_492 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_593; 
-x_593 = 1;
-x_502 = x_593;
-goto block_592;
+uint8_t x_584; 
+x_584 = 1;
+x_493 = x_584;
+goto block_583;
 }
 else
 {
-uint8_t x_594; 
-x_594 = 0;
-x_502 = x_594;
-goto block_592;
+uint8_t x_585; 
+x_585 = 0;
+x_493 = x_585;
+goto block_583;
 }
-block_592:
+block_583:
 {
+if (x_492 == 0)
+{
+lean_object* x_494; lean_object* x_495; lean_object* x_496; lean_object* x_497; lean_object* x_498; lean_object* x_499; lean_object* x_500; 
+x_494 = lean_box(0);
+x_495 = lean_box(x_493);
+x_496 = lean_box(x_6);
+x_497 = lean_box(x_7);
+x_498 = lean_box(x_8);
+x_499 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_499, 0, x_1);
+lean_closure_set(x_499, 1, x_494);
+lean_closure_set(x_499, 2, x_495);
+lean_closure_set(x_499, 3, x_2);
+lean_closure_set(x_499, 4, x_3);
+lean_closure_set(x_499, 5, x_4);
+lean_closure_set(x_499, 6, x_5);
+lean_closure_set(x_499, 7, x_496);
+lean_closure_set(x_499, 8, x_497);
+lean_closure_set(x_499, 9, x_498);
+x_500 = l_Lean_Elab_Term_observing___rarg(x_499, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_500) == 0)
+{
+uint8_t x_501; 
+x_501 = !lean_is_exclusive(x_500);
 if (x_501 == 0)
 {
-lean_object* x_503; lean_object* x_504; lean_object* x_505; lean_object* x_506; lean_object* x_507; lean_object* x_508; lean_object* x_509; 
-x_503 = lean_box(0);
-x_504 = lean_box(x_502);
-x_505 = lean_box(x_6);
-x_506 = lean_box(x_7);
-x_507 = lean_box(x_8);
-x_508 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_508, 0, x_1);
-lean_closure_set(x_508, 1, x_503);
-lean_closure_set(x_508, 2, x_504);
-lean_closure_set(x_508, 3, x_2);
-lean_closure_set(x_508, 4, x_3);
-lean_closure_set(x_508, 5, x_4);
-lean_closure_set(x_508, 6, x_5);
-lean_closure_set(x_508, 7, x_505);
-lean_closure_set(x_508, 8, x_506);
-lean_closure_set(x_508, 9, x_507);
-x_509 = l_Lean_Elab_Term_observing___rarg(x_508, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_509) == 0)
-{
-uint8_t x_510; 
-x_510 = !lean_is_exclusive(x_509);
-if (x_510 == 0)
-{
-lean_object* x_511; lean_object* x_512; 
-x_511 = lean_ctor_get(x_509, 0);
-x_512 = lean_array_push(x_9, x_511);
-lean_ctor_set(x_509, 0, x_512);
-return x_509;
+lean_object* x_502; lean_object* x_503; 
+x_502 = lean_ctor_get(x_500, 0);
+x_503 = lean_array_push(x_9, x_502);
+lean_ctor_set(x_500, 0, x_503);
+return x_500;
 }
 else
 {
-lean_object* x_513; lean_object* x_514; lean_object* x_515; lean_object* x_516; 
-x_513 = lean_ctor_get(x_509, 0);
-x_514 = lean_ctor_get(x_509, 1);
-lean_inc(x_514);
-lean_inc(x_513);
-lean_dec(x_509);
-x_515 = lean_array_push(x_9, x_513);
-x_516 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_516, 0, x_515);
-lean_ctor_set(x_516, 1, x_514);
-return x_516;
+lean_object* x_504; lean_object* x_505; lean_object* x_506; lean_object* x_507; 
+x_504 = lean_ctor_get(x_500, 0);
+x_505 = lean_ctor_get(x_500, 1);
+lean_inc(x_505);
+lean_inc(x_504);
+lean_dec(x_500);
+x_506 = lean_array_push(x_9, x_504);
+x_507 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_507, 0, x_506);
+lean_ctor_set(x_507, 1, x_505);
+return x_507;
 }
 }
 else
 {
-uint8_t x_517; 
+uint8_t x_508; 
 lean_dec(x_9);
-x_517 = !lean_is_exclusive(x_509);
-if (x_517 == 0)
+x_508 = !lean_is_exclusive(x_500);
+if (x_508 == 0)
 {
-return x_509;
+return x_500;
 }
 else
 {
-lean_object* x_518; lean_object* x_519; lean_object* x_520; 
-x_518 = lean_ctor_get(x_509, 0);
-x_519 = lean_ctor_get(x_509, 1);
-lean_inc(x_519);
-lean_inc(x_518);
-lean_dec(x_509);
-x_520 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_520, 0, x_518);
-lean_ctor_set(x_520, 1, x_519);
-return x_520;
+lean_object* x_509; lean_object* x_510; lean_object* x_511; 
+x_509 = lean_ctor_get(x_500, 0);
+x_510 = lean_ctor_get(x_500, 1);
+lean_inc(x_510);
+lean_inc(x_509);
+lean_dec(x_500);
+x_511 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_511, 0, x_509);
+lean_ctor_set(x_511, 1, x_510);
+return x_511;
 }
 }
 }
 else
 {
-uint8_t x_521; 
-x_521 = l_Array_isEmpty___rarg(x_3);
-if (x_521 == 0)
+uint8_t x_512; 
+x_512 = l_Array_isEmpty___rarg(x_3);
+if (x_512 == 0)
 {
-lean_object* x_522; lean_object* x_523; lean_object* x_524; lean_object* x_525; lean_object* x_526; lean_object* x_527; lean_object* x_528; 
-x_522 = lean_box(0);
-x_523 = lean_box(x_502);
-x_524 = lean_box(x_6);
-x_525 = lean_box(x_7);
-x_526 = lean_box(x_8);
-x_527 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_527, 0, x_1);
-lean_closure_set(x_527, 1, x_522);
-lean_closure_set(x_527, 2, x_523);
-lean_closure_set(x_527, 3, x_2);
-lean_closure_set(x_527, 4, x_3);
-lean_closure_set(x_527, 5, x_4);
-lean_closure_set(x_527, 6, x_5);
-lean_closure_set(x_527, 7, x_524);
-lean_closure_set(x_527, 8, x_525);
-lean_closure_set(x_527, 9, x_526);
-x_528 = l_Lean_Elab_Term_observing___rarg(x_527, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_528) == 0)
+lean_object* x_513; lean_object* x_514; lean_object* x_515; lean_object* x_516; lean_object* x_517; lean_object* x_518; lean_object* x_519; 
+x_513 = lean_box(0);
+x_514 = lean_box(x_493);
+x_515 = lean_box(x_6);
+x_516 = lean_box(x_7);
+x_517 = lean_box(x_8);
+x_518 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_518, 0, x_1);
+lean_closure_set(x_518, 1, x_513);
+lean_closure_set(x_518, 2, x_514);
+lean_closure_set(x_518, 3, x_2);
+lean_closure_set(x_518, 4, x_3);
+lean_closure_set(x_518, 5, x_4);
+lean_closure_set(x_518, 6, x_5);
+lean_closure_set(x_518, 7, x_515);
+lean_closure_set(x_518, 8, x_516);
+lean_closure_set(x_518, 9, x_517);
+x_519 = l_Lean_Elab_Term_observing___rarg(x_518, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_519) == 0)
 {
-uint8_t x_529; 
-x_529 = !lean_is_exclusive(x_528);
-if (x_529 == 0)
+uint8_t x_520; 
+x_520 = !lean_is_exclusive(x_519);
+if (x_520 == 0)
 {
-lean_object* x_530; lean_object* x_531; 
-x_530 = lean_ctor_get(x_528, 0);
-x_531 = lean_array_push(x_9, x_530);
-lean_ctor_set(x_528, 0, x_531);
-return x_528;
+lean_object* x_521; lean_object* x_522; 
+x_521 = lean_ctor_get(x_519, 0);
+x_522 = lean_array_push(x_9, x_521);
+lean_ctor_set(x_519, 0, x_522);
+return x_519;
 }
 else
 {
-lean_object* x_532; lean_object* x_533; lean_object* x_534; lean_object* x_535; 
-x_532 = lean_ctor_get(x_528, 0);
-x_533 = lean_ctor_get(x_528, 1);
-lean_inc(x_533);
-lean_inc(x_532);
-lean_dec(x_528);
-x_534 = lean_array_push(x_9, x_532);
-x_535 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_535, 0, x_534);
-lean_ctor_set(x_535, 1, x_533);
-return x_535;
+lean_object* x_523; lean_object* x_524; lean_object* x_525; lean_object* x_526; 
+x_523 = lean_ctor_get(x_519, 0);
+x_524 = lean_ctor_get(x_519, 1);
+lean_inc(x_524);
+lean_inc(x_523);
+lean_dec(x_519);
+x_525 = lean_array_push(x_9, x_523);
+x_526 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_526, 0, x_525);
+lean_ctor_set(x_526, 1, x_524);
+return x_526;
 }
 }
 else
 {
-uint8_t x_536; 
+uint8_t x_527; 
 lean_dec(x_9);
-x_536 = !lean_is_exclusive(x_528);
-if (x_536 == 0)
+x_527 = !lean_is_exclusive(x_519);
+if (x_527 == 0)
 {
-return x_528;
+return x_519;
 }
 else
 {
-lean_object* x_537; lean_object* x_538; lean_object* x_539; 
-x_537 = lean_ctor_get(x_528, 0);
-x_538 = lean_ctor_get(x_528, 1);
-lean_inc(x_538);
-lean_inc(x_537);
-lean_dec(x_528);
-x_539 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_539, 0, x_537);
-lean_ctor_set(x_539, 1, x_538);
-return x_539;
+lean_object* x_528; lean_object* x_529; lean_object* x_530; 
+x_528 = lean_ctor_get(x_519, 0);
+x_529 = lean_ctor_get(x_519, 1);
+lean_inc(x_529);
+lean_inc(x_528);
+lean_dec(x_519);
+x_530 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_530, 0, x_528);
+lean_ctor_set(x_530, 1, x_529);
+return x_530;
 }
 }
 }
 else
 {
-uint8_t x_540; 
-x_540 = l_Array_isEmpty___rarg(x_4);
-if (x_540 == 0)
+uint8_t x_531; 
+x_531 = l_Array_isEmpty___rarg(x_4);
+if (x_531 == 0)
 {
-lean_object* x_541; lean_object* x_542; lean_object* x_543; lean_object* x_544; lean_object* x_545; lean_object* x_546; lean_object* x_547; 
-x_541 = lean_box(0);
-x_542 = lean_box(x_502);
-x_543 = lean_box(x_6);
-x_544 = lean_box(x_7);
-x_545 = lean_box(x_8);
-x_546 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_546, 0, x_1);
-lean_closure_set(x_546, 1, x_541);
-lean_closure_set(x_546, 2, x_542);
-lean_closure_set(x_546, 3, x_2);
-lean_closure_set(x_546, 4, x_3);
-lean_closure_set(x_546, 5, x_4);
-lean_closure_set(x_546, 6, x_5);
-lean_closure_set(x_546, 7, x_543);
-lean_closure_set(x_546, 8, x_544);
-lean_closure_set(x_546, 9, x_545);
-x_547 = l_Lean_Elab_Term_observing___rarg(x_546, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_547) == 0)
+lean_object* x_532; lean_object* x_533; lean_object* x_534; lean_object* x_535; lean_object* x_536; lean_object* x_537; lean_object* x_538; 
+x_532 = lean_box(0);
+x_533 = lean_box(x_493);
+x_534 = lean_box(x_6);
+x_535 = lean_box(x_7);
+x_536 = lean_box(x_8);
+x_537 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_537, 0, x_1);
+lean_closure_set(x_537, 1, x_532);
+lean_closure_set(x_537, 2, x_533);
+lean_closure_set(x_537, 3, x_2);
+lean_closure_set(x_537, 4, x_3);
+lean_closure_set(x_537, 5, x_4);
+lean_closure_set(x_537, 6, x_5);
+lean_closure_set(x_537, 7, x_534);
+lean_closure_set(x_537, 8, x_535);
+lean_closure_set(x_537, 9, x_536);
+x_538 = l_Lean_Elab_Term_observing___rarg(x_537, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_538) == 0)
 {
-uint8_t x_548; 
-x_548 = !lean_is_exclusive(x_547);
-if (x_548 == 0)
+uint8_t x_539; 
+x_539 = !lean_is_exclusive(x_538);
+if (x_539 == 0)
 {
-lean_object* x_549; lean_object* x_550; 
-x_549 = lean_ctor_get(x_547, 0);
-x_550 = lean_array_push(x_9, x_549);
-lean_ctor_set(x_547, 0, x_550);
-return x_547;
+lean_object* x_540; lean_object* x_541; 
+x_540 = lean_ctor_get(x_538, 0);
+x_541 = lean_array_push(x_9, x_540);
+lean_ctor_set(x_538, 0, x_541);
+return x_538;
 }
 else
 {
-lean_object* x_551; lean_object* x_552; lean_object* x_553; lean_object* x_554; 
-x_551 = lean_ctor_get(x_547, 0);
-x_552 = lean_ctor_get(x_547, 1);
-lean_inc(x_552);
-lean_inc(x_551);
-lean_dec(x_547);
-x_553 = lean_array_push(x_9, x_551);
-x_554 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_554, 0, x_553);
-lean_ctor_set(x_554, 1, x_552);
-return x_554;
+lean_object* x_542; lean_object* x_543; lean_object* x_544; lean_object* x_545; 
+x_542 = lean_ctor_get(x_538, 0);
+x_543 = lean_ctor_get(x_538, 1);
+lean_inc(x_543);
+lean_inc(x_542);
+lean_dec(x_538);
+x_544 = lean_array_push(x_9, x_542);
+x_545 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_545, 0, x_544);
+lean_ctor_set(x_545, 1, x_543);
+return x_545;
 }
 }
 else
 {
-uint8_t x_555; 
+uint8_t x_546; 
 lean_dec(x_9);
-x_555 = !lean_is_exclusive(x_547);
-if (x_555 == 0)
+x_546 = !lean_is_exclusive(x_538);
+if (x_546 == 0)
 {
-return x_547;
+return x_538;
 }
 else
 {
-lean_object* x_556; lean_object* x_557; lean_object* x_558; 
-x_556 = lean_ctor_get(x_547, 0);
-x_557 = lean_ctor_get(x_547, 1);
-lean_inc(x_557);
-lean_inc(x_556);
-lean_dec(x_547);
-x_558 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_558, 0, x_556);
-lean_ctor_set(x_558, 1, x_557);
-return x_558;
+lean_object* x_547; lean_object* x_548; lean_object* x_549; 
+x_547 = lean_ctor_get(x_538, 0);
+x_548 = lean_ctor_get(x_538, 1);
+lean_inc(x_548);
+lean_inc(x_547);
+lean_dec(x_538);
+x_549 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_549, 0, x_547);
+lean_ctor_set(x_549, 1, x_548);
+return x_549;
 }
 }
 }
@@ -42680,934 +42684,934 @@ lean_dec(x_3);
 lean_dec(x_2);
 if (x_8 == 0)
 {
-uint8_t x_559; lean_object* x_560; lean_object* x_561; lean_object* x_562; lean_object* x_563; 
-x_559 = 1;
-x_560 = lean_box(x_559);
-x_561 = lean_box(x_559);
-x_562 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_562, 0, x_1);
-lean_closure_set(x_562, 1, x_5);
-lean_closure_set(x_562, 2, x_560);
-lean_closure_set(x_562, 3, x_561);
-x_563 = l_Lean_Elab_Term_observing___rarg(x_562, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_563) == 0)
+uint8_t x_550; lean_object* x_551; lean_object* x_552; lean_object* x_553; lean_object* x_554; 
+x_550 = 1;
+x_551 = lean_box(x_550);
+x_552 = lean_box(x_550);
+x_553 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_553, 0, x_1);
+lean_closure_set(x_553, 1, x_5);
+lean_closure_set(x_553, 2, x_551);
+lean_closure_set(x_553, 3, x_552);
+x_554 = l_Lean_Elab_Term_observing___rarg(x_553, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_554) == 0)
 {
-uint8_t x_564; 
-x_564 = !lean_is_exclusive(x_563);
-if (x_564 == 0)
+uint8_t x_555; 
+x_555 = !lean_is_exclusive(x_554);
+if (x_555 == 0)
 {
-lean_object* x_565; lean_object* x_566; 
-x_565 = lean_ctor_get(x_563, 0);
-x_566 = lean_array_push(x_9, x_565);
-lean_ctor_set(x_563, 0, x_566);
-return x_563;
+lean_object* x_556; lean_object* x_557; 
+x_556 = lean_ctor_get(x_554, 0);
+x_557 = lean_array_push(x_9, x_556);
+lean_ctor_set(x_554, 0, x_557);
+return x_554;
 }
 else
 {
-lean_object* x_567; lean_object* x_568; lean_object* x_569; lean_object* x_570; 
-x_567 = lean_ctor_get(x_563, 0);
-x_568 = lean_ctor_get(x_563, 1);
-lean_inc(x_568);
-lean_inc(x_567);
-lean_dec(x_563);
-x_569 = lean_array_push(x_9, x_567);
-x_570 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_570, 0, x_569);
-lean_ctor_set(x_570, 1, x_568);
-return x_570;
+lean_object* x_558; lean_object* x_559; lean_object* x_560; lean_object* x_561; 
+x_558 = lean_ctor_get(x_554, 0);
+x_559 = lean_ctor_get(x_554, 1);
+lean_inc(x_559);
+lean_inc(x_558);
+lean_dec(x_554);
+x_560 = lean_array_push(x_9, x_558);
+x_561 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_561, 0, x_560);
+lean_ctor_set(x_561, 1, x_559);
+return x_561;
 }
 }
 else
 {
-uint8_t x_571; 
+uint8_t x_562; 
 lean_dec(x_9);
-x_571 = !lean_is_exclusive(x_563);
-if (x_571 == 0)
+x_562 = !lean_is_exclusive(x_554);
+if (x_562 == 0)
 {
-return x_563;
+return x_554;
 }
 else
 {
-lean_object* x_572; lean_object* x_573; lean_object* x_574; 
-x_572 = lean_ctor_get(x_563, 0);
-x_573 = lean_ctor_get(x_563, 1);
-lean_inc(x_573);
-lean_inc(x_572);
-lean_dec(x_563);
-x_574 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_574, 0, x_572);
-lean_ctor_set(x_574, 1, x_573);
-return x_574;
+lean_object* x_563; lean_object* x_564; lean_object* x_565; 
+x_563 = lean_ctor_get(x_554, 0);
+x_564 = lean_ctor_get(x_554, 1);
+lean_inc(x_564);
+lean_inc(x_563);
+lean_dec(x_554);
+x_565 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_565, 0, x_563);
+lean_ctor_set(x_565, 1, x_564);
+return x_565;
 }
 }
 }
 else
 {
-lean_object* x_575; uint8_t x_576; lean_object* x_577; lean_object* x_578; lean_object* x_579; lean_object* x_580; 
-x_575 = lean_box(0);
-x_576 = 1;
-x_577 = lean_box(x_502);
-x_578 = lean_box(x_576);
-x_579 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_579, 0, x_1);
-lean_closure_set(x_579, 1, x_5);
-lean_closure_set(x_579, 2, x_577);
-lean_closure_set(x_579, 3, x_578);
-lean_closure_set(x_579, 4, x_575);
-x_580 = l_Lean_Elab_Term_observing___rarg(x_579, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_580) == 0)
+lean_object* x_566; uint8_t x_567; lean_object* x_568; lean_object* x_569; lean_object* x_570; lean_object* x_571; 
+x_566 = lean_box(0);
+x_567 = 1;
+x_568 = lean_box(x_493);
+x_569 = lean_box(x_567);
+x_570 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_570, 0, x_1);
+lean_closure_set(x_570, 1, x_5);
+lean_closure_set(x_570, 2, x_568);
+lean_closure_set(x_570, 3, x_569);
+lean_closure_set(x_570, 4, x_566);
+x_571 = l_Lean_Elab_Term_observing___rarg(x_570, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_571) == 0)
 {
-uint8_t x_581; 
-x_581 = !lean_is_exclusive(x_580);
-if (x_581 == 0)
+uint8_t x_572; 
+x_572 = !lean_is_exclusive(x_571);
+if (x_572 == 0)
 {
-lean_object* x_582; lean_object* x_583; 
-x_582 = lean_ctor_get(x_580, 0);
-x_583 = lean_array_push(x_9, x_582);
-lean_ctor_set(x_580, 0, x_583);
-return x_580;
+lean_object* x_573; lean_object* x_574; 
+x_573 = lean_ctor_get(x_571, 0);
+x_574 = lean_array_push(x_9, x_573);
+lean_ctor_set(x_571, 0, x_574);
+return x_571;
 }
 else
 {
-lean_object* x_584; lean_object* x_585; lean_object* x_586; lean_object* x_587; 
-x_584 = lean_ctor_get(x_580, 0);
-x_585 = lean_ctor_get(x_580, 1);
-lean_inc(x_585);
-lean_inc(x_584);
-lean_dec(x_580);
-x_586 = lean_array_push(x_9, x_584);
-x_587 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_587, 0, x_586);
-lean_ctor_set(x_587, 1, x_585);
+lean_object* x_575; lean_object* x_576; lean_object* x_577; lean_object* x_578; 
+x_575 = lean_ctor_get(x_571, 0);
+x_576 = lean_ctor_get(x_571, 1);
+lean_inc(x_576);
+lean_inc(x_575);
+lean_dec(x_571);
+x_577 = lean_array_push(x_9, x_575);
+x_578 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_578, 0, x_577);
+lean_ctor_set(x_578, 1, x_576);
+return x_578;
+}
+}
+else
+{
+uint8_t x_579; 
+lean_dec(x_9);
+x_579 = !lean_is_exclusive(x_571);
+if (x_579 == 0)
+{
+return x_571;
+}
+else
+{
+lean_object* x_580; lean_object* x_581; lean_object* x_582; 
+x_580 = lean_ctor_get(x_571, 0);
+x_581 = lean_ctor_get(x_571, 1);
+lean_inc(x_581);
+lean_inc(x_580);
+lean_dec(x_571);
+x_582 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_582, 0, x_580);
+lean_ctor_set(x_582, 1, x_581);
+return x_582;
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_586; lean_object* x_587; 
+lean_dec(x_9);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_586 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__20;
+x_587 = l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__1(x_586, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_15);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_12);
+lean_dec(x_11);
 return x_587;
 }
 }
-else
-{
-uint8_t x_588; 
-lean_dec(x_9);
-x_588 = !lean_is_exclusive(x_580);
-if (x_588 == 0)
-{
-return x_580;
-}
-else
-{
-lean_object* x_589; lean_object* x_590; lean_object* x_591; 
-x_589 = lean_ctor_get(x_580, 0);
-x_590 = lean_ctor_get(x_580, 1);
-lean_inc(x_590);
-lean_inc(x_589);
-lean_dec(x_580);
-x_591 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_591, 0, x_589);
-lean_ctor_set(x_591, 1, x_590);
-return x_591;
-}
-}
-}
-}
-}
-}
 }
 }
 else
 {
-lean_object* x_595; lean_object* x_596; 
-lean_dec(x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_595 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__20;
-x_596 = l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__1(x_595, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-return x_596;
-}
-}
-}
-}
-else
+lean_object* x_588; lean_object* x_589; lean_object* x_590; lean_object* x_591; lean_object* x_592; uint8_t x_593; 
+x_588 = lean_unsigned_to_nat(0u);
+x_589 = l_Lean_Syntax_getArg(x_1, x_588);
+x_590 = lean_unsigned_to_nat(2u);
+x_591 = l_Lean_Syntax_getArg(x_1, x_590);
+x_592 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__22;
+lean_inc(x_591);
+x_593 = l_Lean_Syntax_isOfKind(x_591, x_592);
+if (x_593 == 0)
 {
-lean_object* x_597; lean_object* x_598; lean_object* x_599; lean_object* x_600; lean_object* x_601; uint8_t x_602; 
-x_597 = lean_unsigned_to_nat(0u);
-x_598 = l_Lean_Syntax_getArg(x_1, x_597);
-x_599 = lean_unsigned_to_nat(2u);
-x_600 = l_Lean_Syntax_getArg(x_1, x_599);
-x_601 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__22;
-lean_inc(x_600);
-x_602 = l_Lean_Syntax_isOfKind(x_600, x_601);
-if (x_602 == 0)
+lean_object* x_594; uint8_t x_595; 
+x_594 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
+lean_inc(x_591);
+x_595 = l_Lean_Syntax_isOfKind(x_591, x_594);
+if (x_595 == 0)
 {
-lean_object* x_603; uint8_t x_604; 
-x_603 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
-lean_inc(x_600);
-x_604 = l_Lean_Syntax_isOfKind(x_600, x_603);
-if (x_604 == 0)
-{
-uint8_t x_605; uint8_t x_606; 
-lean_dec(x_600);
-lean_dec(x_598);
-x_605 = l_List_isEmpty___rarg(x_2);
+uint8_t x_596; uint8_t x_597; 
+lean_dec(x_591);
+lean_dec(x_589);
+x_596 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_697; 
-x_697 = 1;
-x_606 = x_697;
-goto block_696;
+uint8_t x_688; 
+x_688 = 1;
+x_597 = x_688;
+goto block_687;
 }
 else
 {
-uint8_t x_698; 
-x_698 = 0;
-x_606 = x_698;
-goto block_696;
+uint8_t x_689; 
+x_689 = 0;
+x_597 = x_689;
+goto block_687;
 }
-block_696:
+block_687:
 {
+if (x_596 == 0)
+{
+lean_object* x_598; lean_object* x_599; lean_object* x_600; lean_object* x_601; lean_object* x_602; lean_object* x_603; lean_object* x_604; 
+x_598 = lean_box(0);
+x_599 = lean_box(x_597);
+x_600 = lean_box(x_6);
+x_601 = lean_box(x_7);
+x_602 = lean_box(x_8);
+x_603 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_603, 0, x_1);
+lean_closure_set(x_603, 1, x_598);
+lean_closure_set(x_603, 2, x_599);
+lean_closure_set(x_603, 3, x_2);
+lean_closure_set(x_603, 4, x_3);
+lean_closure_set(x_603, 5, x_4);
+lean_closure_set(x_603, 6, x_5);
+lean_closure_set(x_603, 7, x_600);
+lean_closure_set(x_603, 8, x_601);
+lean_closure_set(x_603, 9, x_602);
+x_604 = l_Lean_Elab_Term_observing___rarg(x_603, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_604) == 0)
+{
+uint8_t x_605; 
+x_605 = !lean_is_exclusive(x_604);
 if (x_605 == 0)
 {
-lean_object* x_607; lean_object* x_608; lean_object* x_609; lean_object* x_610; lean_object* x_611; lean_object* x_612; lean_object* x_613; 
-x_607 = lean_box(0);
-x_608 = lean_box(x_606);
-x_609 = lean_box(x_6);
-x_610 = lean_box(x_7);
-x_611 = lean_box(x_8);
-x_612 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_612, 0, x_1);
-lean_closure_set(x_612, 1, x_607);
-lean_closure_set(x_612, 2, x_608);
-lean_closure_set(x_612, 3, x_2);
-lean_closure_set(x_612, 4, x_3);
-lean_closure_set(x_612, 5, x_4);
-lean_closure_set(x_612, 6, x_5);
-lean_closure_set(x_612, 7, x_609);
-lean_closure_set(x_612, 8, x_610);
-lean_closure_set(x_612, 9, x_611);
-x_613 = l_Lean_Elab_Term_observing___rarg(x_612, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_613) == 0)
-{
-uint8_t x_614; 
-x_614 = !lean_is_exclusive(x_613);
-if (x_614 == 0)
-{
-lean_object* x_615; lean_object* x_616; 
-x_615 = lean_ctor_get(x_613, 0);
-x_616 = lean_array_push(x_9, x_615);
-lean_ctor_set(x_613, 0, x_616);
-return x_613;
+lean_object* x_606; lean_object* x_607; 
+x_606 = lean_ctor_get(x_604, 0);
+x_607 = lean_array_push(x_9, x_606);
+lean_ctor_set(x_604, 0, x_607);
+return x_604;
 }
 else
 {
-lean_object* x_617; lean_object* x_618; lean_object* x_619; lean_object* x_620; 
-x_617 = lean_ctor_get(x_613, 0);
-x_618 = lean_ctor_get(x_613, 1);
-lean_inc(x_618);
-lean_inc(x_617);
-lean_dec(x_613);
-x_619 = lean_array_push(x_9, x_617);
-x_620 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_620, 0, x_619);
-lean_ctor_set(x_620, 1, x_618);
-return x_620;
+lean_object* x_608; lean_object* x_609; lean_object* x_610; lean_object* x_611; 
+x_608 = lean_ctor_get(x_604, 0);
+x_609 = lean_ctor_get(x_604, 1);
+lean_inc(x_609);
+lean_inc(x_608);
+lean_dec(x_604);
+x_610 = lean_array_push(x_9, x_608);
+x_611 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_611, 0, x_610);
+lean_ctor_set(x_611, 1, x_609);
+return x_611;
 }
 }
 else
 {
-uint8_t x_621; 
+uint8_t x_612; 
 lean_dec(x_9);
-x_621 = !lean_is_exclusive(x_613);
-if (x_621 == 0)
+x_612 = !lean_is_exclusive(x_604);
+if (x_612 == 0)
 {
-return x_613;
+return x_604;
 }
 else
 {
-lean_object* x_622; lean_object* x_623; lean_object* x_624; 
-x_622 = lean_ctor_get(x_613, 0);
-x_623 = lean_ctor_get(x_613, 1);
-lean_inc(x_623);
-lean_inc(x_622);
-lean_dec(x_613);
-x_624 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_624, 0, x_622);
-lean_ctor_set(x_624, 1, x_623);
-return x_624;
+lean_object* x_613; lean_object* x_614; lean_object* x_615; 
+x_613 = lean_ctor_get(x_604, 0);
+x_614 = lean_ctor_get(x_604, 1);
+lean_inc(x_614);
+lean_inc(x_613);
+lean_dec(x_604);
+x_615 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_615, 0, x_613);
+lean_ctor_set(x_615, 1, x_614);
+return x_615;
 }
 }
 }
 else
 {
-uint8_t x_625; 
-x_625 = l_Array_isEmpty___rarg(x_3);
-if (x_625 == 0)
+uint8_t x_616; 
+x_616 = l_Array_isEmpty___rarg(x_3);
+if (x_616 == 0)
 {
-lean_object* x_626; lean_object* x_627; lean_object* x_628; lean_object* x_629; lean_object* x_630; lean_object* x_631; lean_object* x_632; 
-x_626 = lean_box(0);
-x_627 = lean_box(x_606);
-x_628 = lean_box(x_6);
-x_629 = lean_box(x_7);
-x_630 = lean_box(x_8);
-x_631 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_631, 0, x_1);
-lean_closure_set(x_631, 1, x_626);
-lean_closure_set(x_631, 2, x_627);
-lean_closure_set(x_631, 3, x_2);
-lean_closure_set(x_631, 4, x_3);
-lean_closure_set(x_631, 5, x_4);
-lean_closure_set(x_631, 6, x_5);
-lean_closure_set(x_631, 7, x_628);
-lean_closure_set(x_631, 8, x_629);
-lean_closure_set(x_631, 9, x_630);
-x_632 = l_Lean_Elab_Term_observing___rarg(x_631, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_632) == 0)
+lean_object* x_617; lean_object* x_618; lean_object* x_619; lean_object* x_620; lean_object* x_621; lean_object* x_622; lean_object* x_623; 
+x_617 = lean_box(0);
+x_618 = lean_box(x_597);
+x_619 = lean_box(x_6);
+x_620 = lean_box(x_7);
+x_621 = lean_box(x_8);
+x_622 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_622, 0, x_1);
+lean_closure_set(x_622, 1, x_617);
+lean_closure_set(x_622, 2, x_618);
+lean_closure_set(x_622, 3, x_2);
+lean_closure_set(x_622, 4, x_3);
+lean_closure_set(x_622, 5, x_4);
+lean_closure_set(x_622, 6, x_5);
+lean_closure_set(x_622, 7, x_619);
+lean_closure_set(x_622, 8, x_620);
+lean_closure_set(x_622, 9, x_621);
+x_623 = l_Lean_Elab_Term_observing___rarg(x_622, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_623) == 0)
 {
-uint8_t x_633; 
-x_633 = !lean_is_exclusive(x_632);
-if (x_633 == 0)
+uint8_t x_624; 
+x_624 = !lean_is_exclusive(x_623);
+if (x_624 == 0)
 {
-lean_object* x_634; lean_object* x_635; 
-x_634 = lean_ctor_get(x_632, 0);
-x_635 = lean_array_push(x_9, x_634);
-lean_ctor_set(x_632, 0, x_635);
-return x_632;
+lean_object* x_625; lean_object* x_626; 
+x_625 = lean_ctor_get(x_623, 0);
+x_626 = lean_array_push(x_9, x_625);
+lean_ctor_set(x_623, 0, x_626);
+return x_623;
 }
 else
 {
-lean_object* x_636; lean_object* x_637; lean_object* x_638; lean_object* x_639; 
-x_636 = lean_ctor_get(x_632, 0);
-x_637 = lean_ctor_get(x_632, 1);
-lean_inc(x_637);
-lean_inc(x_636);
-lean_dec(x_632);
-x_638 = lean_array_push(x_9, x_636);
-x_639 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_639, 0, x_638);
-lean_ctor_set(x_639, 1, x_637);
-return x_639;
+lean_object* x_627; lean_object* x_628; lean_object* x_629; lean_object* x_630; 
+x_627 = lean_ctor_get(x_623, 0);
+x_628 = lean_ctor_get(x_623, 1);
+lean_inc(x_628);
+lean_inc(x_627);
+lean_dec(x_623);
+x_629 = lean_array_push(x_9, x_627);
+x_630 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_630, 0, x_629);
+lean_ctor_set(x_630, 1, x_628);
+return x_630;
 }
 }
 else
 {
-uint8_t x_640; 
+uint8_t x_631; 
 lean_dec(x_9);
-x_640 = !lean_is_exclusive(x_632);
-if (x_640 == 0)
+x_631 = !lean_is_exclusive(x_623);
+if (x_631 == 0)
 {
-return x_632;
+return x_623;
 }
 else
 {
-lean_object* x_641; lean_object* x_642; lean_object* x_643; 
-x_641 = lean_ctor_get(x_632, 0);
-x_642 = lean_ctor_get(x_632, 1);
-lean_inc(x_642);
-lean_inc(x_641);
-lean_dec(x_632);
-x_643 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_643, 0, x_641);
-lean_ctor_set(x_643, 1, x_642);
-return x_643;
+lean_object* x_632; lean_object* x_633; lean_object* x_634; 
+x_632 = lean_ctor_get(x_623, 0);
+x_633 = lean_ctor_get(x_623, 1);
+lean_inc(x_633);
+lean_inc(x_632);
+lean_dec(x_623);
+x_634 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_634, 0, x_632);
+lean_ctor_set(x_634, 1, x_633);
+return x_634;
 }
 }
 }
 else
 {
-uint8_t x_644; 
-x_644 = l_Array_isEmpty___rarg(x_4);
-if (x_644 == 0)
+uint8_t x_635; 
+x_635 = l_Array_isEmpty___rarg(x_4);
+if (x_635 == 0)
 {
-lean_object* x_645; lean_object* x_646; lean_object* x_647; lean_object* x_648; lean_object* x_649; lean_object* x_650; lean_object* x_651; 
-x_645 = lean_box(0);
-x_646 = lean_box(x_606);
-x_647 = lean_box(x_6);
-x_648 = lean_box(x_7);
-x_649 = lean_box(x_8);
-x_650 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_650, 0, x_1);
-lean_closure_set(x_650, 1, x_645);
-lean_closure_set(x_650, 2, x_646);
-lean_closure_set(x_650, 3, x_2);
-lean_closure_set(x_650, 4, x_3);
-lean_closure_set(x_650, 5, x_4);
-lean_closure_set(x_650, 6, x_5);
-lean_closure_set(x_650, 7, x_647);
-lean_closure_set(x_650, 8, x_648);
-lean_closure_set(x_650, 9, x_649);
-x_651 = l_Lean_Elab_Term_observing___rarg(x_650, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_651) == 0)
+lean_object* x_636; lean_object* x_637; lean_object* x_638; lean_object* x_639; lean_object* x_640; lean_object* x_641; lean_object* x_642; 
+x_636 = lean_box(0);
+x_637 = lean_box(x_597);
+x_638 = lean_box(x_6);
+x_639 = lean_box(x_7);
+x_640 = lean_box(x_8);
+x_641 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_641, 0, x_1);
+lean_closure_set(x_641, 1, x_636);
+lean_closure_set(x_641, 2, x_637);
+lean_closure_set(x_641, 3, x_2);
+lean_closure_set(x_641, 4, x_3);
+lean_closure_set(x_641, 5, x_4);
+lean_closure_set(x_641, 6, x_5);
+lean_closure_set(x_641, 7, x_638);
+lean_closure_set(x_641, 8, x_639);
+lean_closure_set(x_641, 9, x_640);
+x_642 = l_Lean_Elab_Term_observing___rarg(x_641, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_642) == 0)
 {
-uint8_t x_652; 
-x_652 = !lean_is_exclusive(x_651);
-if (x_652 == 0)
+uint8_t x_643; 
+x_643 = !lean_is_exclusive(x_642);
+if (x_643 == 0)
 {
-lean_object* x_653; lean_object* x_654; 
-x_653 = lean_ctor_get(x_651, 0);
-x_654 = lean_array_push(x_9, x_653);
-lean_ctor_set(x_651, 0, x_654);
-return x_651;
+lean_object* x_644; lean_object* x_645; 
+x_644 = lean_ctor_get(x_642, 0);
+x_645 = lean_array_push(x_9, x_644);
+lean_ctor_set(x_642, 0, x_645);
+return x_642;
 }
 else
 {
-lean_object* x_655; lean_object* x_656; lean_object* x_657; lean_object* x_658; 
-x_655 = lean_ctor_get(x_651, 0);
-x_656 = lean_ctor_get(x_651, 1);
-lean_inc(x_656);
-lean_inc(x_655);
-lean_dec(x_651);
-x_657 = lean_array_push(x_9, x_655);
-x_658 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_658, 0, x_657);
-lean_ctor_set(x_658, 1, x_656);
-return x_658;
+lean_object* x_646; lean_object* x_647; lean_object* x_648; lean_object* x_649; 
+x_646 = lean_ctor_get(x_642, 0);
+x_647 = lean_ctor_get(x_642, 1);
+lean_inc(x_647);
+lean_inc(x_646);
+lean_dec(x_642);
+x_648 = lean_array_push(x_9, x_646);
+x_649 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_649, 0, x_648);
+lean_ctor_set(x_649, 1, x_647);
+return x_649;
 }
 }
 else
 {
+uint8_t x_650; 
+lean_dec(x_9);
+x_650 = !lean_is_exclusive(x_642);
+if (x_650 == 0)
+{
+return x_642;
+}
+else
+{
+lean_object* x_651; lean_object* x_652; lean_object* x_653; 
+x_651 = lean_ctor_get(x_642, 0);
+x_652 = lean_ctor_get(x_642, 1);
+lean_inc(x_652);
+lean_inc(x_651);
+lean_dec(x_642);
+x_653 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_653, 0, x_651);
+lean_ctor_set(x_653, 1, x_652);
+return x_653;
+}
+}
+}
+else
+{
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (x_8 == 0)
+{
+uint8_t x_654; lean_object* x_655; lean_object* x_656; lean_object* x_657; lean_object* x_658; 
+x_654 = 1;
+x_655 = lean_box(x_654);
+x_656 = lean_box(x_654);
+x_657 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_657, 0, x_1);
+lean_closure_set(x_657, 1, x_5);
+lean_closure_set(x_657, 2, x_655);
+lean_closure_set(x_657, 3, x_656);
+x_658 = l_Lean_Elab_Term_observing___rarg(x_657, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_658) == 0)
+{
 uint8_t x_659; 
-lean_dec(x_9);
-x_659 = !lean_is_exclusive(x_651);
+x_659 = !lean_is_exclusive(x_658);
 if (x_659 == 0)
 {
-return x_651;
+lean_object* x_660; lean_object* x_661; 
+x_660 = lean_ctor_get(x_658, 0);
+x_661 = lean_array_push(x_9, x_660);
+lean_ctor_set(x_658, 0, x_661);
+return x_658;
 }
 else
 {
-lean_object* x_660; lean_object* x_661; lean_object* x_662; 
-x_660 = lean_ctor_get(x_651, 0);
-x_661 = lean_ctor_get(x_651, 1);
-lean_inc(x_661);
-lean_inc(x_660);
-lean_dec(x_651);
-x_662 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_662, 0, x_660);
-lean_ctor_set(x_662, 1, x_661);
-return x_662;
-}
+lean_object* x_662; lean_object* x_663; lean_object* x_664; lean_object* x_665; 
+x_662 = lean_ctor_get(x_658, 0);
+x_663 = lean_ctor_get(x_658, 1);
+lean_inc(x_663);
+lean_inc(x_662);
+lean_dec(x_658);
+x_664 = lean_array_push(x_9, x_662);
+x_665 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_665, 0, x_664);
+lean_ctor_set(x_665, 1, x_663);
+return x_665;
 }
 }
 else
 {
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-if (x_8 == 0)
-{
-uint8_t x_663; lean_object* x_664; lean_object* x_665; lean_object* x_666; lean_object* x_667; 
-x_663 = 1;
-x_664 = lean_box(x_663);
-x_665 = lean_box(x_663);
-x_666 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_666, 0, x_1);
-lean_closure_set(x_666, 1, x_5);
-lean_closure_set(x_666, 2, x_664);
-lean_closure_set(x_666, 3, x_665);
-x_667 = l_Lean_Elab_Term_observing___rarg(x_666, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_667) == 0)
-{
-uint8_t x_668; 
-x_668 = !lean_is_exclusive(x_667);
-if (x_668 == 0)
-{
-lean_object* x_669; lean_object* x_670; 
-x_669 = lean_ctor_get(x_667, 0);
-x_670 = lean_array_push(x_9, x_669);
-lean_ctor_set(x_667, 0, x_670);
-return x_667;
-}
-else
-{
-lean_object* x_671; lean_object* x_672; lean_object* x_673; lean_object* x_674; 
-x_671 = lean_ctor_get(x_667, 0);
-x_672 = lean_ctor_get(x_667, 1);
-lean_inc(x_672);
-lean_inc(x_671);
-lean_dec(x_667);
-x_673 = lean_array_push(x_9, x_671);
-x_674 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_674, 0, x_673);
-lean_ctor_set(x_674, 1, x_672);
-return x_674;
-}
-}
-else
-{
-uint8_t x_675; 
+uint8_t x_666; 
 lean_dec(x_9);
-x_675 = !lean_is_exclusive(x_667);
-if (x_675 == 0)
+x_666 = !lean_is_exclusive(x_658);
+if (x_666 == 0)
 {
-return x_667;
+return x_658;
 }
 else
 {
-lean_object* x_676; lean_object* x_677; lean_object* x_678; 
-x_676 = lean_ctor_get(x_667, 0);
-x_677 = lean_ctor_get(x_667, 1);
-lean_inc(x_677);
-lean_inc(x_676);
-lean_dec(x_667);
-x_678 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_678, 0, x_676);
-lean_ctor_set(x_678, 1, x_677);
-return x_678;
+lean_object* x_667; lean_object* x_668; lean_object* x_669; 
+x_667 = lean_ctor_get(x_658, 0);
+x_668 = lean_ctor_get(x_658, 1);
+lean_inc(x_668);
+lean_inc(x_667);
+lean_dec(x_658);
+x_669 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_669, 0, x_667);
+lean_ctor_set(x_669, 1, x_668);
+return x_669;
 }
 }
 }
 else
 {
-lean_object* x_679; uint8_t x_680; lean_object* x_681; lean_object* x_682; lean_object* x_683; lean_object* x_684; 
-x_679 = lean_box(0);
-x_680 = 1;
-x_681 = lean_box(x_606);
-x_682 = lean_box(x_680);
-x_683 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_683, 0, x_1);
-lean_closure_set(x_683, 1, x_5);
-lean_closure_set(x_683, 2, x_681);
-lean_closure_set(x_683, 3, x_682);
-lean_closure_set(x_683, 4, x_679);
-x_684 = l_Lean_Elab_Term_observing___rarg(x_683, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_684) == 0)
+lean_object* x_670; uint8_t x_671; lean_object* x_672; lean_object* x_673; lean_object* x_674; lean_object* x_675; 
+x_670 = lean_box(0);
+x_671 = 1;
+x_672 = lean_box(x_597);
+x_673 = lean_box(x_671);
+x_674 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_674, 0, x_1);
+lean_closure_set(x_674, 1, x_5);
+lean_closure_set(x_674, 2, x_672);
+lean_closure_set(x_674, 3, x_673);
+lean_closure_set(x_674, 4, x_670);
+x_675 = l_Lean_Elab_Term_observing___rarg(x_674, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_675) == 0)
 {
-uint8_t x_685; 
-x_685 = !lean_is_exclusive(x_684);
-if (x_685 == 0)
+uint8_t x_676; 
+x_676 = !lean_is_exclusive(x_675);
+if (x_676 == 0)
 {
-lean_object* x_686; lean_object* x_687; 
-x_686 = lean_ctor_get(x_684, 0);
-x_687 = lean_array_push(x_9, x_686);
-lean_ctor_set(x_684, 0, x_687);
-return x_684;
+lean_object* x_677; lean_object* x_678; 
+x_677 = lean_ctor_get(x_675, 0);
+x_678 = lean_array_push(x_9, x_677);
+lean_ctor_set(x_675, 0, x_678);
+return x_675;
 }
 else
 {
-lean_object* x_688; lean_object* x_689; lean_object* x_690; lean_object* x_691; 
-x_688 = lean_ctor_get(x_684, 0);
-x_689 = lean_ctor_get(x_684, 1);
-lean_inc(x_689);
-lean_inc(x_688);
-lean_dec(x_684);
-x_690 = lean_array_push(x_9, x_688);
-x_691 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_691, 0, x_690);
-lean_ctor_set(x_691, 1, x_689);
-return x_691;
+lean_object* x_679; lean_object* x_680; lean_object* x_681; lean_object* x_682; 
+x_679 = lean_ctor_get(x_675, 0);
+x_680 = lean_ctor_get(x_675, 1);
+lean_inc(x_680);
+lean_inc(x_679);
+lean_dec(x_675);
+x_681 = lean_array_push(x_9, x_679);
+x_682 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_682, 0, x_681);
+lean_ctor_set(x_682, 1, x_680);
+return x_682;
 }
 }
 else
 {
-uint8_t x_692; 
+uint8_t x_683; 
 lean_dec(x_9);
-x_692 = !lean_is_exclusive(x_684);
+x_683 = !lean_is_exclusive(x_675);
+if (x_683 == 0)
+{
+return x_675;
+}
+else
+{
+lean_object* x_684; lean_object* x_685; lean_object* x_686; 
+x_684 = lean_ctor_get(x_675, 0);
+x_685 = lean_ctor_get(x_675, 1);
+lean_inc(x_685);
+lean_inc(x_684);
+lean_dec(x_675);
+x_686 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_686, 0, x_684);
+lean_ctor_set(x_686, 1, x_685);
+return x_686;
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_690; lean_object* x_691; uint8_t x_692; 
+x_690 = lean_unsigned_to_nat(3u);
+x_691 = l_Lean_Syntax_getArg(x_1, x_690);
+x_692 = l_Lean_Syntax_matchesNull(x_691, x_588);
 if (x_692 == 0)
 {
-return x_684;
-}
-else
-{
-lean_object* x_693; lean_object* x_694; lean_object* x_695; 
-x_693 = lean_ctor_get(x_684, 0);
-x_694 = lean_ctor_get(x_684, 1);
-lean_inc(x_694);
-lean_inc(x_693);
-lean_dec(x_684);
-x_695 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_695, 0, x_693);
-lean_ctor_set(x_695, 1, x_694);
-return x_695;
-}
-}
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_699; lean_object* x_700; uint8_t x_701; 
-x_699 = lean_unsigned_to_nat(3u);
-x_700 = l_Lean_Syntax_getArg(x_1, x_699);
-x_701 = l_Lean_Syntax_matchesNull(x_700, x_597);
-if (x_701 == 0)
-{
-uint8_t x_702; uint8_t x_703; 
-lean_dec(x_600);
-lean_dec(x_598);
-x_702 = l_List_isEmpty___rarg(x_2);
+uint8_t x_693; uint8_t x_694; 
+lean_dec(x_591);
+lean_dec(x_589);
+x_693 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_794; 
-x_794 = 1;
-x_703 = x_794;
-goto block_793;
+uint8_t x_785; 
+x_785 = 1;
+x_694 = x_785;
+goto block_784;
 }
 else
 {
-uint8_t x_795; 
-x_795 = 0;
-x_703 = x_795;
-goto block_793;
+uint8_t x_786; 
+x_786 = 0;
+x_694 = x_786;
+goto block_784;
 }
-block_793:
+block_784:
 {
+if (x_693 == 0)
+{
+lean_object* x_695; lean_object* x_696; lean_object* x_697; lean_object* x_698; lean_object* x_699; lean_object* x_700; lean_object* x_701; 
+x_695 = lean_box(0);
+x_696 = lean_box(x_694);
+x_697 = lean_box(x_6);
+x_698 = lean_box(x_7);
+x_699 = lean_box(x_8);
+x_700 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_700, 0, x_1);
+lean_closure_set(x_700, 1, x_695);
+lean_closure_set(x_700, 2, x_696);
+lean_closure_set(x_700, 3, x_2);
+lean_closure_set(x_700, 4, x_3);
+lean_closure_set(x_700, 5, x_4);
+lean_closure_set(x_700, 6, x_5);
+lean_closure_set(x_700, 7, x_697);
+lean_closure_set(x_700, 8, x_698);
+lean_closure_set(x_700, 9, x_699);
+x_701 = l_Lean_Elab_Term_observing___rarg(x_700, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_701) == 0)
+{
+uint8_t x_702; 
+x_702 = !lean_is_exclusive(x_701);
 if (x_702 == 0)
 {
-lean_object* x_704; lean_object* x_705; lean_object* x_706; lean_object* x_707; lean_object* x_708; lean_object* x_709; lean_object* x_710; 
-x_704 = lean_box(0);
-x_705 = lean_box(x_703);
-x_706 = lean_box(x_6);
-x_707 = lean_box(x_7);
-x_708 = lean_box(x_8);
-x_709 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_709, 0, x_1);
-lean_closure_set(x_709, 1, x_704);
-lean_closure_set(x_709, 2, x_705);
-lean_closure_set(x_709, 3, x_2);
-lean_closure_set(x_709, 4, x_3);
-lean_closure_set(x_709, 5, x_4);
-lean_closure_set(x_709, 6, x_5);
-lean_closure_set(x_709, 7, x_706);
-lean_closure_set(x_709, 8, x_707);
-lean_closure_set(x_709, 9, x_708);
-x_710 = l_Lean_Elab_Term_observing___rarg(x_709, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_710) == 0)
-{
-uint8_t x_711; 
-x_711 = !lean_is_exclusive(x_710);
-if (x_711 == 0)
-{
-lean_object* x_712; lean_object* x_713; 
-x_712 = lean_ctor_get(x_710, 0);
-x_713 = lean_array_push(x_9, x_712);
-lean_ctor_set(x_710, 0, x_713);
-return x_710;
+lean_object* x_703; lean_object* x_704; 
+x_703 = lean_ctor_get(x_701, 0);
+x_704 = lean_array_push(x_9, x_703);
+lean_ctor_set(x_701, 0, x_704);
+return x_701;
 }
 else
 {
-lean_object* x_714; lean_object* x_715; lean_object* x_716; lean_object* x_717; 
-x_714 = lean_ctor_get(x_710, 0);
-x_715 = lean_ctor_get(x_710, 1);
-lean_inc(x_715);
-lean_inc(x_714);
-lean_dec(x_710);
-x_716 = lean_array_push(x_9, x_714);
-x_717 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_717, 0, x_716);
-lean_ctor_set(x_717, 1, x_715);
-return x_717;
+lean_object* x_705; lean_object* x_706; lean_object* x_707; lean_object* x_708; 
+x_705 = lean_ctor_get(x_701, 0);
+x_706 = lean_ctor_get(x_701, 1);
+lean_inc(x_706);
+lean_inc(x_705);
+lean_dec(x_701);
+x_707 = lean_array_push(x_9, x_705);
+x_708 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_708, 0, x_707);
+lean_ctor_set(x_708, 1, x_706);
+return x_708;
 }
 }
 else
 {
-uint8_t x_718; 
+uint8_t x_709; 
 lean_dec(x_9);
-x_718 = !lean_is_exclusive(x_710);
-if (x_718 == 0)
+x_709 = !lean_is_exclusive(x_701);
+if (x_709 == 0)
 {
-return x_710;
+return x_701;
 }
 else
 {
-lean_object* x_719; lean_object* x_720; lean_object* x_721; 
-x_719 = lean_ctor_get(x_710, 0);
-x_720 = lean_ctor_get(x_710, 1);
-lean_inc(x_720);
-lean_inc(x_719);
-lean_dec(x_710);
-x_721 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_721, 0, x_719);
-lean_ctor_set(x_721, 1, x_720);
-return x_721;
+lean_object* x_710; lean_object* x_711; lean_object* x_712; 
+x_710 = lean_ctor_get(x_701, 0);
+x_711 = lean_ctor_get(x_701, 1);
+lean_inc(x_711);
+lean_inc(x_710);
+lean_dec(x_701);
+x_712 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_712, 0, x_710);
+lean_ctor_set(x_712, 1, x_711);
+return x_712;
 }
 }
 }
 else
 {
-uint8_t x_722; 
-x_722 = l_Array_isEmpty___rarg(x_3);
-if (x_722 == 0)
+uint8_t x_713; 
+x_713 = l_Array_isEmpty___rarg(x_3);
+if (x_713 == 0)
 {
-lean_object* x_723; lean_object* x_724; lean_object* x_725; lean_object* x_726; lean_object* x_727; lean_object* x_728; lean_object* x_729; 
-x_723 = lean_box(0);
-x_724 = lean_box(x_703);
-x_725 = lean_box(x_6);
-x_726 = lean_box(x_7);
-x_727 = lean_box(x_8);
-x_728 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_728, 0, x_1);
-lean_closure_set(x_728, 1, x_723);
-lean_closure_set(x_728, 2, x_724);
-lean_closure_set(x_728, 3, x_2);
-lean_closure_set(x_728, 4, x_3);
-lean_closure_set(x_728, 5, x_4);
-lean_closure_set(x_728, 6, x_5);
-lean_closure_set(x_728, 7, x_725);
-lean_closure_set(x_728, 8, x_726);
-lean_closure_set(x_728, 9, x_727);
-x_729 = l_Lean_Elab_Term_observing___rarg(x_728, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_729) == 0)
+lean_object* x_714; lean_object* x_715; lean_object* x_716; lean_object* x_717; lean_object* x_718; lean_object* x_719; lean_object* x_720; 
+x_714 = lean_box(0);
+x_715 = lean_box(x_694);
+x_716 = lean_box(x_6);
+x_717 = lean_box(x_7);
+x_718 = lean_box(x_8);
+x_719 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_719, 0, x_1);
+lean_closure_set(x_719, 1, x_714);
+lean_closure_set(x_719, 2, x_715);
+lean_closure_set(x_719, 3, x_2);
+lean_closure_set(x_719, 4, x_3);
+lean_closure_set(x_719, 5, x_4);
+lean_closure_set(x_719, 6, x_5);
+lean_closure_set(x_719, 7, x_716);
+lean_closure_set(x_719, 8, x_717);
+lean_closure_set(x_719, 9, x_718);
+x_720 = l_Lean_Elab_Term_observing___rarg(x_719, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_720) == 0)
 {
-uint8_t x_730; 
-x_730 = !lean_is_exclusive(x_729);
-if (x_730 == 0)
+uint8_t x_721; 
+x_721 = !lean_is_exclusive(x_720);
+if (x_721 == 0)
 {
-lean_object* x_731; lean_object* x_732; 
-x_731 = lean_ctor_get(x_729, 0);
-x_732 = lean_array_push(x_9, x_731);
-lean_ctor_set(x_729, 0, x_732);
-return x_729;
+lean_object* x_722; lean_object* x_723; 
+x_722 = lean_ctor_get(x_720, 0);
+x_723 = lean_array_push(x_9, x_722);
+lean_ctor_set(x_720, 0, x_723);
+return x_720;
 }
 else
 {
-lean_object* x_733; lean_object* x_734; lean_object* x_735; lean_object* x_736; 
-x_733 = lean_ctor_get(x_729, 0);
-x_734 = lean_ctor_get(x_729, 1);
-lean_inc(x_734);
-lean_inc(x_733);
-lean_dec(x_729);
-x_735 = lean_array_push(x_9, x_733);
-x_736 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_736, 0, x_735);
-lean_ctor_set(x_736, 1, x_734);
-return x_736;
+lean_object* x_724; lean_object* x_725; lean_object* x_726; lean_object* x_727; 
+x_724 = lean_ctor_get(x_720, 0);
+x_725 = lean_ctor_get(x_720, 1);
+lean_inc(x_725);
+lean_inc(x_724);
+lean_dec(x_720);
+x_726 = lean_array_push(x_9, x_724);
+x_727 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_727, 0, x_726);
+lean_ctor_set(x_727, 1, x_725);
+return x_727;
 }
 }
 else
 {
-uint8_t x_737; 
+uint8_t x_728; 
 lean_dec(x_9);
-x_737 = !lean_is_exclusive(x_729);
-if (x_737 == 0)
+x_728 = !lean_is_exclusive(x_720);
+if (x_728 == 0)
 {
-return x_729;
+return x_720;
 }
 else
 {
-lean_object* x_738; lean_object* x_739; lean_object* x_740; 
-x_738 = lean_ctor_get(x_729, 0);
-x_739 = lean_ctor_get(x_729, 1);
-lean_inc(x_739);
-lean_inc(x_738);
-lean_dec(x_729);
-x_740 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_740, 0, x_738);
-lean_ctor_set(x_740, 1, x_739);
-return x_740;
+lean_object* x_729; lean_object* x_730; lean_object* x_731; 
+x_729 = lean_ctor_get(x_720, 0);
+x_730 = lean_ctor_get(x_720, 1);
+lean_inc(x_730);
+lean_inc(x_729);
+lean_dec(x_720);
+x_731 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_731, 0, x_729);
+lean_ctor_set(x_731, 1, x_730);
+return x_731;
 }
 }
 }
 else
 {
-uint8_t x_741; 
-x_741 = l_Array_isEmpty___rarg(x_4);
-if (x_741 == 0)
+uint8_t x_732; 
+x_732 = l_Array_isEmpty___rarg(x_4);
+if (x_732 == 0)
 {
-lean_object* x_742; lean_object* x_743; lean_object* x_744; lean_object* x_745; lean_object* x_746; lean_object* x_747; lean_object* x_748; 
-x_742 = lean_box(0);
-x_743 = lean_box(x_703);
-x_744 = lean_box(x_6);
-x_745 = lean_box(x_7);
-x_746 = lean_box(x_8);
-x_747 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_747, 0, x_1);
-lean_closure_set(x_747, 1, x_742);
-lean_closure_set(x_747, 2, x_743);
-lean_closure_set(x_747, 3, x_2);
-lean_closure_set(x_747, 4, x_3);
-lean_closure_set(x_747, 5, x_4);
-lean_closure_set(x_747, 6, x_5);
-lean_closure_set(x_747, 7, x_744);
-lean_closure_set(x_747, 8, x_745);
-lean_closure_set(x_747, 9, x_746);
-x_748 = l_Lean_Elab_Term_observing___rarg(x_747, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_748) == 0)
+lean_object* x_733; lean_object* x_734; lean_object* x_735; lean_object* x_736; lean_object* x_737; lean_object* x_738; lean_object* x_739; 
+x_733 = lean_box(0);
+x_734 = lean_box(x_694);
+x_735 = lean_box(x_6);
+x_736 = lean_box(x_7);
+x_737 = lean_box(x_8);
+x_738 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_738, 0, x_1);
+lean_closure_set(x_738, 1, x_733);
+lean_closure_set(x_738, 2, x_734);
+lean_closure_set(x_738, 3, x_2);
+lean_closure_set(x_738, 4, x_3);
+lean_closure_set(x_738, 5, x_4);
+lean_closure_set(x_738, 6, x_5);
+lean_closure_set(x_738, 7, x_735);
+lean_closure_set(x_738, 8, x_736);
+lean_closure_set(x_738, 9, x_737);
+x_739 = l_Lean_Elab_Term_observing___rarg(x_738, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_739) == 0)
 {
-uint8_t x_749; 
-x_749 = !lean_is_exclusive(x_748);
-if (x_749 == 0)
+uint8_t x_740; 
+x_740 = !lean_is_exclusive(x_739);
+if (x_740 == 0)
 {
-lean_object* x_750; lean_object* x_751; 
-x_750 = lean_ctor_get(x_748, 0);
-x_751 = lean_array_push(x_9, x_750);
-lean_ctor_set(x_748, 0, x_751);
-return x_748;
+lean_object* x_741; lean_object* x_742; 
+x_741 = lean_ctor_get(x_739, 0);
+x_742 = lean_array_push(x_9, x_741);
+lean_ctor_set(x_739, 0, x_742);
+return x_739;
 }
 else
 {
-lean_object* x_752; lean_object* x_753; lean_object* x_754; lean_object* x_755; 
-x_752 = lean_ctor_get(x_748, 0);
-x_753 = lean_ctor_get(x_748, 1);
-lean_inc(x_753);
-lean_inc(x_752);
-lean_dec(x_748);
-x_754 = lean_array_push(x_9, x_752);
-x_755 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_755, 0, x_754);
-lean_ctor_set(x_755, 1, x_753);
-return x_755;
+lean_object* x_743; lean_object* x_744; lean_object* x_745; lean_object* x_746; 
+x_743 = lean_ctor_get(x_739, 0);
+x_744 = lean_ctor_get(x_739, 1);
+lean_inc(x_744);
+lean_inc(x_743);
+lean_dec(x_739);
+x_745 = lean_array_push(x_9, x_743);
+x_746 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_746, 0, x_745);
+lean_ctor_set(x_746, 1, x_744);
+return x_746;
 }
 }
 else
 {
+uint8_t x_747; 
+lean_dec(x_9);
+x_747 = !lean_is_exclusive(x_739);
+if (x_747 == 0)
+{
+return x_739;
+}
+else
+{
+lean_object* x_748; lean_object* x_749; lean_object* x_750; 
+x_748 = lean_ctor_get(x_739, 0);
+x_749 = lean_ctor_get(x_739, 1);
+lean_inc(x_749);
+lean_inc(x_748);
+lean_dec(x_739);
+x_750 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_750, 0, x_748);
+lean_ctor_set(x_750, 1, x_749);
+return x_750;
+}
+}
+}
+else
+{
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (x_8 == 0)
+{
+uint8_t x_751; lean_object* x_752; lean_object* x_753; lean_object* x_754; lean_object* x_755; 
+x_751 = 1;
+x_752 = lean_box(x_751);
+x_753 = lean_box(x_751);
+x_754 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_754, 0, x_1);
+lean_closure_set(x_754, 1, x_5);
+lean_closure_set(x_754, 2, x_752);
+lean_closure_set(x_754, 3, x_753);
+x_755 = l_Lean_Elab_Term_observing___rarg(x_754, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_755) == 0)
+{
 uint8_t x_756; 
-lean_dec(x_9);
-x_756 = !lean_is_exclusive(x_748);
+x_756 = !lean_is_exclusive(x_755);
 if (x_756 == 0)
 {
-return x_748;
+lean_object* x_757; lean_object* x_758; 
+x_757 = lean_ctor_get(x_755, 0);
+x_758 = lean_array_push(x_9, x_757);
+lean_ctor_set(x_755, 0, x_758);
+return x_755;
 }
 else
 {
-lean_object* x_757; lean_object* x_758; lean_object* x_759; 
-x_757 = lean_ctor_get(x_748, 0);
-x_758 = lean_ctor_get(x_748, 1);
-lean_inc(x_758);
-lean_inc(x_757);
-lean_dec(x_748);
-x_759 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_759, 0, x_757);
-lean_ctor_set(x_759, 1, x_758);
-return x_759;
-}
+lean_object* x_759; lean_object* x_760; lean_object* x_761; lean_object* x_762; 
+x_759 = lean_ctor_get(x_755, 0);
+x_760 = lean_ctor_get(x_755, 1);
+lean_inc(x_760);
+lean_inc(x_759);
+lean_dec(x_755);
+x_761 = lean_array_push(x_9, x_759);
+x_762 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_762, 0, x_761);
+lean_ctor_set(x_762, 1, x_760);
+return x_762;
 }
 }
 else
 {
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-if (x_8 == 0)
-{
-uint8_t x_760; lean_object* x_761; lean_object* x_762; lean_object* x_763; lean_object* x_764; 
-x_760 = 1;
-x_761 = lean_box(x_760);
-x_762 = lean_box(x_760);
-x_763 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_763, 0, x_1);
-lean_closure_set(x_763, 1, x_5);
-lean_closure_set(x_763, 2, x_761);
-lean_closure_set(x_763, 3, x_762);
-x_764 = l_Lean_Elab_Term_observing___rarg(x_763, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_764) == 0)
-{
-uint8_t x_765; 
-x_765 = !lean_is_exclusive(x_764);
-if (x_765 == 0)
-{
-lean_object* x_766; lean_object* x_767; 
-x_766 = lean_ctor_get(x_764, 0);
-x_767 = lean_array_push(x_9, x_766);
-lean_ctor_set(x_764, 0, x_767);
-return x_764;
-}
-else
-{
-lean_object* x_768; lean_object* x_769; lean_object* x_770; lean_object* x_771; 
-x_768 = lean_ctor_get(x_764, 0);
-x_769 = lean_ctor_get(x_764, 1);
-lean_inc(x_769);
-lean_inc(x_768);
-lean_dec(x_764);
-x_770 = lean_array_push(x_9, x_768);
-x_771 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_771, 0, x_770);
-lean_ctor_set(x_771, 1, x_769);
-return x_771;
-}
-}
-else
-{
-uint8_t x_772; 
+uint8_t x_763; 
 lean_dec(x_9);
-x_772 = !lean_is_exclusive(x_764);
-if (x_772 == 0)
+x_763 = !lean_is_exclusive(x_755);
+if (x_763 == 0)
 {
-return x_764;
+return x_755;
 }
 else
 {
-lean_object* x_773; lean_object* x_774; lean_object* x_775; 
-x_773 = lean_ctor_get(x_764, 0);
-x_774 = lean_ctor_get(x_764, 1);
-lean_inc(x_774);
-lean_inc(x_773);
-lean_dec(x_764);
-x_775 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_775, 0, x_773);
-lean_ctor_set(x_775, 1, x_774);
-return x_775;
+lean_object* x_764; lean_object* x_765; lean_object* x_766; 
+x_764 = lean_ctor_get(x_755, 0);
+x_765 = lean_ctor_get(x_755, 1);
+lean_inc(x_765);
+lean_inc(x_764);
+lean_dec(x_755);
+x_766 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_766, 0, x_764);
+lean_ctor_set(x_766, 1, x_765);
+return x_766;
 }
 }
 }
 else
 {
-lean_object* x_776; uint8_t x_777; lean_object* x_778; lean_object* x_779; lean_object* x_780; lean_object* x_781; 
-x_776 = lean_box(0);
-x_777 = 1;
-x_778 = lean_box(x_703);
-x_779 = lean_box(x_777);
-x_780 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_780, 0, x_1);
-lean_closure_set(x_780, 1, x_5);
-lean_closure_set(x_780, 2, x_778);
-lean_closure_set(x_780, 3, x_779);
-lean_closure_set(x_780, 4, x_776);
-x_781 = l_Lean_Elab_Term_observing___rarg(x_780, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_781) == 0)
+lean_object* x_767; uint8_t x_768; lean_object* x_769; lean_object* x_770; lean_object* x_771; lean_object* x_772; 
+x_767 = lean_box(0);
+x_768 = 1;
+x_769 = lean_box(x_694);
+x_770 = lean_box(x_768);
+x_771 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_771, 0, x_1);
+lean_closure_set(x_771, 1, x_5);
+lean_closure_set(x_771, 2, x_769);
+lean_closure_set(x_771, 3, x_770);
+lean_closure_set(x_771, 4, x_767);
+x_772 = l_Lean_Elab_Term_observing___rarg(x_771, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_772) == 0)
 {
-uint8_t x_782; 
-x_782 = !lean_is_exclusive(x_781);
-if (x_782 == 0)
+uint8_t x_773; 
+x_773 = !lean_is_exclusive(x_772);
+if (x_773 == 0)
 {
-lean_object* x_783; lean_object* x_784; 
-x_783 = lean_ctor_get(x_781, 0);
-x_784 = lean_array_push(x_9, x_783);
-lean_ctor_set(x_781, 0, x_784);
-return x_781;
+lean_object* x_774; lean_object* x_775; 
+x_774 = lean_ctor_get(x_772, 0);
+x_775 = lean_array_push(x_9, x_774);
+lean_ctor_set(x_772, 0, x_775);
+return x_772;
 }
 else
 {
-lean_object* x_785; lean_object* x_786; lean_object* x_787; lean_object* x_788; 
-x_785 = lean_ctor_get(x_781, 0);
-x_786 = lean_ctor_get(x_781, 1);
-lean_inc(x_786);
-lean_inc(x_785);
-lean_dec(x_781);
-x_787 = lean_array_push(x_9, x_785);
-x_788 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_788, 0, x_787);
-lean_ctor_set(x_788, 1, x_786);
-return x_788;
+lean_object* x_776; lean_object* x_777; lean_object* x_778; lean_object* x_779; 
+x_776 = lean_ctor_get(x_772, 0);
+x_777 = lean_ctor_get(x_772, 1);
+lean_inc(x_777);
+lean_inc(x_776);
+lean_dec(x_772);
+x_778 = lean_array_push(x_9, x_776);
+x_779 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_779, 0, x_778);
+lean_ctor_set(x_779, 1, x_777);
+return x_779;
 }
 }
 else
 {
-uint8_t x_789; 
+uint8_t x_780; 
 lean_dec(x_9);
-x_789 = !lean_is_exclusive(x_781);
-if (x_789 == 0)
+x_780 = !lean_is_exclusive(x_772);
+if (x_780 == 0)
 {
-return x_781;
+return x_772;
 }
 else
 {
-lean_object* x_790; lean_object* x_791; lean_object* x_792; 
-x_790 = lean_ctor_get(x_781, 0);
-x_791 = lean_ctor_get(x_781, 1);
-lean_inc(x_791);
-lean_inc(x_790);
-lean_dec(x_781);
-x_792 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_792, 0, x_790);
-lean_ctor_set(x_792, 1, x_791);
-return x_792;
+lean_object* x_781; lean_object* x_782; lean_object* x_783; 
+x_781 = lean_ctor_get(x_772, 0);
+x_782 = lean_ctor_get(x_772, 1);
+lean_inc(x_782);
+lean_inc(x_781);
+lean_dec(x_772);
+x_783 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_783, 0, x_781);
+lean_ctor_set(x_783, 1, x_782);
+return x_783;
 }
 }
 }
@@ -43618,399 +43622,399 @@ return x_792;
 }
 else
 {
-lean_object* x_796; lean_object* x_797; lean_object* x_798; lean_object* x_799; lean_object* x_800; 
+lean_object* x_787; lean_object* x_788; lean_object* x_789; lean_object* x_790; lean_object* x_791; 
 lean_dec(x_1);
-x_796 = lean_box(0);
-x_797 = l_Lean_Syntax_identComponents(x_600, x_796);
-x_798 = lean_box(0);
-lean_inc(x_598);
-x_799 = l_List_mapTRAux___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__3(x_598, x_797, x_798);
-x_800 = l_List_appendTR___rarg(x_799, x_2);
-x_1 = x_598;
-x_2 = x_800;
+x_787 = lean_box(0);
+x_788 = l_Lean_Syntax_identComponents(x_591, x_787);
+x_789 = lean_box(0);
+lean_inc(x_589);
+x_790 = l_List_mapTRAux___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__3(x_589, x_788, x_789);
+x_791 = l_List_appendTR___rarg(x_790, x_2);
+x_1 = x_589;
+x_2 = x_791;
 goto _start;
 }
 }
 }
 else
 {
-lean_object* x_802; lean_object* x_803; uint8_t x_804; 
-x_802 = lean_unsigned_to_nat(3u);
-x_803 = l_Lean_Syntax_getArg(x_1, x_802);
-x_804 = l_Lean_Syntax_matchesNull(x_803, x_597);
-if (x_804 == 0)
+lean_object* x_793; lean_object* x_794; uint8_t x_795; 
+x_793 = lean_unsigned_to_nat(3u);
+x_794 = l_Lean_Syntax_getArg(x_1, x_793);
+x_795 = l_Lean_Syntax_matchesNull(x_794, x_588);
+if (x_795 == 0)
 {
-uint8_t x_805; uint8_t x_806; 
-lean_dec(x_600);
-lean_dec(x_598);
-x_805 = l_List_isEmpty___rarg(x_2);
+uint8_t x_796; uint8_t x_797; 
+lean_dec(x_591);
+lean_dec(x_589);
+x_796 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_897; 
-x_897 = 1;
-x_806 = x_897;
-goto block_896;
+uint8_t x_888; 
+x_888 = 1;
+x_797 = x_888;
+goto block_887;
 }
 else
 {
-uint8_t x_898; 
-x_898 = 0;
-x_806 = x_898;
-goto block_896;
+uint8_t x_889; 
+x_889 = 0;
+x_797 = x_889;
+goto block_887;
 }
-block_896:
+block_887:
 {
+if (x_796 == 0)
+{
+lean_object* x_798; lean_object* x_799; lean_object* x_800; lean_object* x_801; lean_object* x_802; lean_object* x_803; lean_object* x_804; 
+x_798 = lean_box(0);
+x_799 = lean_box(x_797);
+x_800 = lean_box(x_6);
+x_801 = lean_box(x_7);
+x_802 = lean_box(x_8);
+x_803 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_803, 0, x_1);
+lean_closure_set(x_803, 1, x_798);
+lean_closure_set(x_803, 2, x_799);
+lean_closure_set(x_803, 3, x_2);
+lean_closure_set(x_803, 4, x_3);
+lean_closure_set(x_803, 5, x_4);
+lean_closure_set(x_803, 6, x_5);
+lean_closure_set(x_803, 7, x_800);
+lean_closure_set(x_803, 8, x_801);
+lean_closure_set(x_803, 9, x_802);
+x_804 = l_Lean_Elab_Term_observing___rarg(x_803, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_804) == 0)
+{
+uint8_t x_805; 
+x_805 = !lean_is_exclusive(x_804);
 if (x_805 == 0)
 {
-lean_object* x_807; lean_object* x_808; lean_object* x_809; lean_object* x_810; lean_object* x_811; lean_object* x_812; lean_object* x_813; 
-x_807 = lean_box(0);
-x_808 = lean_box(x_806);
-x_809 = lean_box(x_6);
-x_810 = lean_box(x_7);
-x_811 = lean_box(x_8);
-x_812 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_812, 0, x_1);
-lean_closure_set(x_812, 1, x_807);
-lean_closure_set(x_812, 2, x_808);
-lean_closure_set(x_812, 3, x_2);
-lean_closure_set(x_812, 4, x_3);
-lean_closure_set(x_812, 5, x_4);
-lean_closure_set(x_812, 6, x_5);
-lean_closure_set(x_812, 7, x_809);
-lean_closure_set(x_812, 8, x_810);
-lean_closure_set(x_812, 9, x_811);
-x_813 = l_Lean_Elab_Term_observing___rarg(x_812, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_813) == 0)
-{
-uint8_t x_814; 
-x_814 = !lean_is_exclusive(x_813);
-if (x_814 == 0)
-{
-lean_object* x_815; lean_object* x_816; 
-x_815 = lean_ctor_get(x_813, 0);
-x_816 = lean_array_push(x_9, x_815);
-lean_ctor_set(x_813, 0, x_816);
-return x_813;
+lean_object* x_806; lean_object* x_807; 
+x_806 = lean_ctor_get(x_804, 0);
+x_807 = lean_array_push(x_9, x_806);
+lean_ctor_set(x_804, 0, x_807);
+return x_804;
 }
 else
 {
-lean_object* x_817; lean_object* x_818; lean_object* x_819; lean_object* x_820; 
-x_817 = lean_ctor_get(x_813, 0);
-x_818 = lean_ctor_get(x_813, 1);
-lean_inc(x_818);
-lean_inc(x_817);
-lean_dec(x_813);
-x_819 = lean_array_push(x_9, x_817);
-x_820 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_820, 0, x_819);
-lean_ctor_set(x_820, 1, x_818);
-return x_820;
+lean_object* x_808; lean_object* x_809; lean_object* x_810; lean_object* x_811; 
+x_808 = lean_ctor_get(x_804, 0);
+x_809 = lean_ctor_get(x_804, 1);
+lean_inc(x_809);
+lean_inc(x_808);
+lean_dec(x_804);
+x_810 = lean_array_push(x_9, x_808);
+x_811 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_811, 0, x_810);
+lean_ctor_set(x_811, 1, x_809);
+return x_811;
 }
 }
 else
 {
-uint8_t x_821; 
+uint8_t x_812; 
 lean_dec(x_9);
-x_821 = !lean_is_exclusive(x_813);
-if (x_821 == 0)
+x_812 = !lean_is_exclusive(x_804);
+if (x_812 == 0)
 {
-return x_813;
+return x_804;
 }
 else
 {
-lean_object* x_822; lean_object* x_823; lean_object* x_824; 
-x_822 = lean_ctor_get(x_813, 0);
-x_823 = lean_ctor_get(x_813, 1);
-lean_inc(x_823);
-lean_inc(x_822);
-lean_dec(x_813);
-x_824 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_824, 0, x_822);
-lean_ctor_set(x_824, 1, x_823);
-return x_824;
+lean_object* x_813; lean_object* x_814; lean_object* x_815; 
+x_813 = lean_ctor_get(x_804, 0);
+x_814 = lean_ctor_get(x_804, 1);
+lean_inc(x_814);
+lean_inc(x_813);
+lean_dec(x_804);
+x_815 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_815, 0, x_813);
+lean_ctor_set(x_815, 1, x_814);
+return x_815;
 }
 }
 }
 else
 {
-uint8_t x_825; 
-x_825 = l_Array_isEmpty___rarg(x_3);
-if (x_825 == 0)
+uint8_t x_816; 
+x_816 = l_Array_isEmpty___rarg(x_3);
+if (x_816 == 0)
 {
-lean_object* x_826; lean_object* x_827; lean_object* x_828; lean_object* x_829; lean_object* x_830; lean_object* x_831; lean_object* x_832; 
-x_826 = lean_box(0);
-x_827 = lean_box(x_806);
-x_828 = lean_box(x_6);
-x_829 = lean_box(x_7);
-x_830 = lean_box(x_8);
-x_831 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_831, 0, x_1);
-lean_closure_set(x_831, 1, x_826);
-lean_closure_set(x_831, 2, x_827);
-lean_closure_set(x_831, 3, x_2);
-lean_closure_set(x_831, 4, x_3);
-lean_closure_set(x_831, 5, x_4);
-lean_closure_set(x_831, 6, x_5);
-lean_closure_set(x_831, 7, x_828);
-lean_closure_set(x_831, 8, x_829);
-lean_closure_set(x_831, 9, x_830);
-x_832 = l_Lean_Elab_Term_observing___rarg(x_831, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_832) == 0)
+lean_object* x_817; lean_object* x_818; lean_object* x_819; lean_object* x_820; lean_object* x_821; lean_object* x_822; lean_object* x_823; 
+x_817 = lean_box(0);
+x_818 = lean_box(x_797);
+x_819 = lean_box(x_6);
+x_820 = lean_box(x_7);
+x_821 = lean_box(x_8);
+x_822 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_822, 0, x_1);
+lean_closure_set(x_822, 1, x_817);
+lean_closure_set(x_822, 2, x_818);
+lean_closure_set(x_822, 3, x_2);
+lean_closure_set(x_822, 4, x_3);
+lean_closure_set(x_822, 5, x_4);
+lean_closure_set(x_822, 6, x_5);
+lean_closure_set(x_822, 7, x_819);
+lean_closure_set(x_822, 8, x_820);
+lean_closure_set(x_822, 9, x_821);
+x_823 = l_Lean_Elab_Term_observing___rarg(x_822, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_823) == 0)
 {
-uint8_t x_833; 
-x_833 = !lean_is_exclusive(x_832);
-if (x_833 == 0)
+uint8_t x_824; 
+x_824 = !lean_is_exclusive(x_823);
+if (x_824 == 0)
 {
-lean_object* x_834; lean_object* x_835; 
-x_834 = lean_ctor_get(x_832, 0);
-x_835 = lean_array_push(x_9, x_834);
-lean_ctor_set(x_832, 0, x_835);
-return x_832;
+lean_object* x_825; lean_object* x_826; 
+x_825 = lean_ctor_get(x_823, 0);
+x_826 = lean_array_push(x_9, x_825);
+lean_ctor_set(x_823, 0, x_826);
+return x_823;
 }
 else
 {
-lean_object* x_836; lean_object* x_837; lean_object* x_838; lean_object* x_839; 
-x_836 = lean_ctor_get(x_832, 0);
-x_837 = lean_ctor_get(x_832, 1);
-lean_inc(x_837);
-lean_inc(x_836);
-lean_dec(x_832);
-x_838 = lean_array_push(x_9, x_836);
-x_839 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_839, 0, x_838);
-lean_ctor_set(x_839, 1, x_837);
-return x_839;
+lean_object* x_827; lean_object* x_828; lean_object* x_829; lean_object* x_830; 
+x_827 = lean_ctor_get(x_823, 0);
+x_828 = lean_ctor_get(x_823, 1);
+lean_inc(x_828);
+lean_inc(x_827);
+lean_dec(x_823);
+x_829 = lean_array_push(x_9, x_827);
+x_830 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_830, 0, x_829);
+lean_ctor_set(x_830, 1, x_828);
+return x_830;
 }
 }
 else
 {
-uint8_t x_840; 
+uint8_t x_831; 
 lean_dec(x_9);
-x_840 = !lean_is_exclusive(x_832);
-if (x_840 == 0)
+x_831 = !lean_is_exclusive(x_823);
+if (x_831 == 0)
 {
-return x_832;
+return x_823;
 }
 else
 {
-lean_object* x_841; lean_object* x_842; lean_object* x_843; 
-x_841 = lean_ctor_get(x_832, 0);
-x_842 = lean_ctor_get(x_832, 1);
-lean_inc(x_842);
-lean_inc(x_841);
-lean_dec(x_832);
-x_843 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_843, 0, x_841);
-lean_ctor_set(x_843, 1, x_842);
-return x_843;
+lean_object* x_832; lean_object* x_833; lean_object* x_834; 
+x_832 = lean_ctor_get(x_823, 0);
+x_833 = lean_ctor_get(x_823, 1);
+lean_inc(x_833);
+lean_inc(x_832);
+lean_dec(x_823);
+x_834 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_834, 0, x_832);
+lean_ctor_set(x_834, 1, x_833);
+return x_834;
 }
 }
 }
 else
 {
-uint8_t x_844; 
-x_844 = l_Array_isEmpty___rarg(x_4);
-if (x_844 == 0)
+uint8_t x_835; 
+x_835 = l_Array_isEmpty___rarg(x_4);
+if (x_835 == 0)
 {
-lean_object* x_845; lean_object* x_846; lean_object* x_847; lean_object* x_848; lean_object* x_849; lean_object* x_850; lean_object* x_851; 
-x_845 = lean_box(0);
-x_846 = lean_box(x_806);
-x_847 = lean_box(x_6);
-x_848 = lean_box(x_7);
-x_849 = lean_box(x_8);
-x_850 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_850, 0, x_1);
-lean_closure_set(x_850, 1, x_845);
-lean_closure_set(x_850, 2, x_846);
-lean_closure_set(x_850, 3, x_2);
-lean_closure_set(x_850, 4, x_3);
-lean_closure_set(x_850, 5, x_4);
-lean_closure_set(x_850, 6, x_5);
-lean_closure_set(x_850, 7, x_847);
-lean_closure_set(x_850, 8, x_848);
-lean_closure_set(x_850, 9, x_849);
-x_851 = l_Lean_Elab_Term_observing___rarg(x_850, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_851) == 0)
+lean_object* x_836; lean_object* x_837; lean_object* x_838; lean_object* x_839; lean_object* x_840; lean_object* x_841; lean_object* x_842; 
+x_836 = lean_box(0);
+x_837 = lean_box(x_797);
+x_838 = lean_box(x_6);
+x_839 = lean_box(x_7);
+x_840 = lean_box(x_8);
+x_841 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_841, 0, x_1);
+lean_closure_set(x_841, 1, x_836);
+lean_closure_set(x_841, 2, x_837);
+lean_closure_set(x_841, 3, x_2);
+lean_closure_set(x_841, 4, x_3);
+lean_closure_set(x_841, 5, x_4);
+lean_closure_set(x_841, 6, x_5);
+lean_closure_set(x_841, 7, x_838);
+lean_closure_set(x_841, 8, x_839);
+lean_closure_set(x_841, 9, x_840);
+x_842 = l_Lean_Elab_Term_observing___rarg(x_841, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_842) == 0)
 {
-uint8_t x_852; 
-x_852 = !lean_is_exclusive(x_851);
-if (x_852 == 0)
+uint8_t x_843; 
+x_843 = !lean_is_exclusive(x_842);
+if (x_843 == 0)
 {
-lean_object* x_853; lean_object* x_854; 
-x_853 = lean_ctor_get(x_851, 0);
-x_854 = lean_array_push(x_9, x_853);
-lean_ctor_set(x_851, 0, x_854);
-return x_851;
+lean_object* x_844; lean_object* x_845; 
+x_844 = lean_ctor_get(x_842, 0);
+x_845 = lean_array_push(x_9, x_844);
+lean_ctor_set(x_842, 0, x_845);
+return x_842;
 }
 else
 {
-lean_object* x_855; lean_object* x_856; lean_object* x_857; lean_object* x_858; 
-x_855 = lean_ctor_get(x_851, 0);
-x_856 = lean_ctor_get(x_851, 1);
-lean_inc(x_856);
-lean_inc(x_855);
-lean_dec(x_851);
-x_857 = lean_array_push(x_9, x_855);
-x_858 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_858, 0, x_857);
-lean_ctor_set(x_858, 1, x_856);
-return x_858;
+lean_object* x_846; lean_object* x_847; lean_object* x_848; lean_object* x_849; 
+x_846 = lean_ctor_get(x_842, 0);
+x_847 = lean_ctor_get(x_842, 1);
+lean_inc(x_847);
+lean_inc(x_846);
+lean_dec(x_842);
+x_848 = lean_array_push(x_9, x_846);
+x_849 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_849, 0, x_848);
+lean_ctor_set(x_849, 1, x_847);
+return x_849;
 }
 }
 else
 {
+uint8_t x_850; 
+lean_dec(x_9);
+x_850 = !lean_is_exclusive(x_842);
+if (x_850 == 0)
+{
+return x_842;
+}
+else
+{
+lean_object* x_851; lean_object* x_852; lean_object* x_853; 
+x_851 = lean_ctor_get(x_842, 0);
+x_852 = lean_ctor_get(x_842, 1);
+lean_inc(x_852);
+lean_inc(x_851);
+lean_dec(x_842);
+x_853 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_853, 0, x_851);
+lean_ctor_set(x_853, 1, x_852);
+return x_853;
+}
+}
+}
+else
+{
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+if (x_8 == 0)
+{
+uint8_t x_854; lean_object* x_855; lean_object* x_856; lean_object* x_857; lean_object* x_858; 
+x_854 = 1;
+x_855 = lean_box(x_854);
+x_856 = lean_box(x_854);
+x_857 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_857, 0, x_1);
+lean_closure_set(x_857, 1, x_5);
+lean_closure_set(x_857, 2, x_855);
+lean_closure_set(x_857, 3, x_856);
+x_858 = l_Lean_Elab_Term_observing___rarg(x_857, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_858) == 0)
+{
 uint8_t x_859; 
-lean_dec(x_9);
-x_859 = !lean_is_exclusive(x_851);
+x_859 = !lean_is_exclusive(x_858);
 if (x_859 == 0)
 {
-return x_851;
+lean_object* x_860; lean_object* x_861; 
+x_860 = lean_ctor_get(x_858, 0);
+x_861 = lean_array_push(x_9, x_860);
+lean_ctor_set(x_858, 0, x_861);
+return x_858;
 }
 else
 {
-lean_object* x_860; lean_object* x_861; lean_object* x_862; 
-x_860 = lean_ctor_get(x_851, 0);
-x_861 = lean_ctor_get(x_851, 1);
-lean_inc(x_861);
-lean_inc(x_860);
-lean_dec(x_851);
-x_862 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_862, 0, x_860);
-lean_ctor_set(x_862, 1, x_861);
-return x_862;
-}
+lean_object* x_862; lean_object* x_863; lean_object* x_864; lean_object* x_865; 
+x_862 = lean_ctor_get(x_858, 0);
+x_863 = lean_ctor_get(x_858, 1);
+lean_inc(x_863);
+lean_inc(x_862);
+lean_dec(x_858);
+x_864 = lean_array_push(x_9, x_862);
+x_865 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_865, 0, x_864);
+lean_ctor_set(x_865, 1, x_863);
+return x_865;
 }
 }
 else
 {
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-if (x_8 == 0)
-{
-uint8_t x_863; lean_object* x_864; lean_object* x_865; lean_object* x_866; lean_object* x_867; 
-x_863 = 1;
-x_864 = lean_box(x_863);
-x_865 = lean_box(x_863);
-x_866 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_866, 0, x_1);
-lean_closure_set(x_866, 1, x_5);
-lean_closure_set(x_866, 2, x_864);
-lean_closure_set(x_866, 3, x_865);
-x_867 = l_Lean_Elab_Term_observing___rarg(x_866, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_867) == 0)
-{
-uint8_t x_868; 
-x_868 = !lean_is_exclusive(x_867);
-if (x_868 == 0)
-{
-lean_object* x_869; lean_object* x_870; 
-x_869 = lean_ctor_get(x_867, 0);
-x_870 = lean_array_push(x_9, x_869);
-lean_ctor_set(x_867, 0, x_870);
-return x_867;
-}
-else
-{
-lean_object* x_871; lean_object* x_872; lean_object* x_873; lean_object* x_874; 
-x_871 = lean_ctor_get(x_867, 0);
-x_872 = lean_ctor_get(x_867, 1);
-lean_inc(x_872);
-lean_inc(x_871);
-lean_dec(x_867);
-x_873 = lean_array_push(x_9, x_871);
-x_874 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_874, 0, x_873);
-lean_ctor_set(x_874, 1, x_872);
-return x_874;
-}
-}
-else
-{
-uint8_t x_875; 
+uint8_t x_866; 
 lean_dec(x_9);
-x_875 = !lean_is_exclusive(x_867);
-if (x_875 == 0)
+x_866 = !lean_is_exclusive(x_858);
+if (x_866 == 0)
 {
-return x_867;
+return x_858;
 }
 else
 {
-lean_object* x_876; lean_object* x_877; lean_object* x_878; 
-x_876 = lean_ctor_get(x_867, 0);
-x_877 = lean_ctor_get(x_867, 1);
-lean_inc(x_877);
-lean_inc(x_876);
-lean_dec(x_867);
-x_878 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_878, 0, x_876);
-lean_ctor_set(x_878, 1, x_877);
-return x_878;
+lean_object* x_867; lean_object* x_868; lean_object* x_869; 
+x_867 = lean_ctor_get(x_858, 0);
+x_868 = lean_ctor_get(x_858, 1);
+lean_inc(x_868);
+lean_inc(x_867);
+lean_dec(x_858);
+x_869 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_869, 0, x_867);
+lean_ctor_set(x_869, 1, x_868);
+return x_869;
 }
 }
 }
 else
 {
-lean_object* x_879; uint8_t x_880; lean_object* x_881; lean_object* x_882; lean_object* x_883; lean_object* x_884; 
-x_879 = lean_box(0);
-x_880 = 1;
-x_881 = lean_box(x_806);
-x_882 = lean_box(x_880);
-x_883 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_883, 0, x_1);
-lean_closure_set(x_883, 1, x_5);
-lean_closure_set(x_883, 2, x_881);
-lean_closure_set(x_883, 3, x_882);
-lean_closure_set(x_883, 4, x_879);
-x_884 = l_Lean_Elab_Term_observing___rarg(x_883, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_884) == 0)
+lean_object* x_870; uint8_t x_871; lean_object* x_872; lean_object* x_873; lean_object* x_874; lean_object* x_875; 
+x_870 = lean_box(0);
+x_871 = 1;
+x_872 = lean_box(x_797);
+x_873 = lean_box(x_871);
+x_874 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_874, 0, x_1);
+lean_closure_set(x_874, 1, x_5);
+lean_closure_set(x_874, 2, x_872);
+lean_closure_set(x_874, 3, x_873);
+lean_closure_set(x_874, 4, x_870);
+x_875 = l_Lean_Elab_Term_observing___rarg(x_874, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_875) == 0)
 {
-uint8_t x_885; 
-x_885 = !lean_is_exclusive(x_884);
-if (x_885 == 0)
+uint8_t x_876; 
+x_876 = !lean_is_exclusive(x_875);
+if (x_876 == 0)
 {
-lean_object* x_886; lean_object* x_887; 
-x_886 = lean_ctor_get(x_884, 0);
-x_887 = lean_array_push(x_9, x_886);
-lean_ctor_set(x_884, 0, x_887);
-return x_884;
+lean_object* x_877; lean_object* x_878; 
+x_877 = lean_ctor_get(x_875, 0);
+x_878 = lean_array_push(x_9, x_877);
+lean_ctor_set(x_875, 0, x_878);
+return x_875;
 }
 else
 {
-lean_object* x_888; lean_object* x_889; lean_object* x_890; lean_object* x_891; 
-x_888 = lean_ctor_get(x_884, 0);
-x_889 = lean_ctor_get(x_884, 1);
-lean_inc(x_889);
-lean_inc(x_888);
-lean_dec(x_884);
-x_890 = lean_array_push(x_9, x_888);
-x_891 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_891, 0, x_890);
-lean_ctor_set(x_891, 1, x_889);
-return x_891;
+lean_object* x_879; lean_object* x_880; lean_object* x_881; lean_object* x_882; 
+x_879 = lean_ctor_get(x_875, 0);
+x_880 = lean_ctor_get(x_875, 1);
+lean_inc(x_880);
+lean_inc(x_879);
+lean_dec(x_875);
+x_881 = lean_array_push(x_9, x_879);
+x_882 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_882, 0, x_881);
+lean_ctor_set(x_882, 1, x_880);
+return x_882;
 }
 }
 else
 {
-uint8_t x_892; 
+uint8_t x_883; 
 lean_dec(x_9);
-x_892 = !lean_is_exclusive(x_884);
-if (x_892 == 0)
+x_883 = !lean_is_exclusive(x_875);
+if (x_883 == 0)
 {
-return x_884;
+return x_875;
 }
 else
 {
-lean_object* x_893; lean_object* x_894; lean_object* x_895; 
-x_893 = lean_ctor_get(x_884, 0);
-x_894 = lean_ctor_get(x_884, 1);
-lean_inc(x_894);
-lean_inc(x_893);
-lean_dec(x_884);
-x_895 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_895, 0, x_893);
-lean_ctor_set(x_895, 1, x_894);
-return x_895;
+lean_object* x_884; lean_object* x_885; lean_object* x_886; 
+x_884 = lean_ctor_get(x_875, 0);
+x_885 = lean_ctor_get(x_875, 1);
+lean_inc(x_885);
+lean_inc(x_884);
+lean_dec(x_875);
+x_886 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_886, 0, x_884);
+lean_ctor_set(x_886, 1, x_885);
+return x_886;
 }
 }
 }
@@ -44021,38 +44025,38 @@ return x_895;
 }
 else
 {
-lean_object* x_899; 
+lean_object* x_890; 
 lean_dec(x_1);
-x_899 = l_Lean_Syntax_isFieldIdx_x3f(x_600);
-if (lean_obj_tag(x_899) == 0)
+x_890 = l_Lean_Syntax_isFieldIdx_x3f(x_591);
+if (lean_obj_tag(x_890) == 0)
 {
-lean_object* x_900; lean_object* x_901; lean_object* x_902; lean_object* x_903; 
-x_900 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__26;
-x_901 = l_panic___at_String_toNat_x21___spec__1(x_900);
-x_902 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_902, 0, x_600);
-lean_ctor_set(x_902, 1, x_901);
-x_903 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_903, 0, x_902);
-lean_ctor_set(x_903, 1, x_2);
-x_1 = x_598;
-x_2 = x_903;
+lean_object* x_891; lean_object* x_892; lean_object* x_893; lean_object* x_894; 
+x_891 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__26;
+x_892 = l_panic___at_String_toNat_x21___spec__1(x_891);
+x_893 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_893, 0, x_591);
+lean_ctor_set(x_893, 1, x_892);
+x_894 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_894, 0, x_893);
+lean_ctor_set(x_894, 1, x_2);
+x_1 = x_589;
+x_2 = x_894;
 goto _start;
 }
 else
 {
-lean_object* x_905; lean_object* x_906; lean_object* x_907; 
-x_905 = lean_ctor_get(x_899, 0);
-lean_inc(x_905);
-lean_dec(x_899);
-x_906 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_906, 0, x_600);
-lean_ctor_set(x_906, 1, x_905);
-x_907 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_907, 0, x_906);
-lean_ctor_set(x_907, 1, x_2);
-x_1 = x_598;
-x_2 = x_907;
+lean_object* x_896; lean_object* x_897; lean_object* x_898; 
+x_896 = lean_ctor_get(x_890, 0);
+lean_inc(x_896);
+lean_dec(x_890);
+x_897 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_897, 0, x_591);
+lean_ctor_set(x_897, 1, x_896);
+x_898 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_898, 0, x_897);
+lean_ctor_set(x_898, 1, x_2);
+x_1 = x_589;
+x_2 = x_898;
 goto _start;
 }
 }
@@ -44061,260 +44065,260 @@ goto _start;
 }
 else
 {
-lean_object* x_909; lean_object* x_910; lean_object* x_911; lean_object* x_912; lean_object* x_913; uint8_t x_914; 
-x_909 = lean_unsigned_to_nat(0u);
-x_910 = l_Lean_Syntax_getArg(x_1, x_909);
-x_911 = lean_unsigned_to_nat(2u);
-x_912 = l_Lean_Syntax_getArg(x_1, x_911);
-x_913 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__22;
-lean_inc(x_912);
-x_914 = l_Lean_Syntax_isOfKind(x_912, x_913);
-if (x_914 == 0)
+lean_object* x_900; lean_object* x_901; lean_object* x_902; lean_object* x_903; lean_object* x_904; uint8_t x_905; 
+x_900 = lean_unsigned_to_nat(0u);
+x_901 = l_Lean_Syntax_getArg(x_1, x_900);
+x_902 = lean_unsigned_to_nat(2u);
+x_903 = l_Lean_Syntax_getArg(x_1, x_902);
+x_904 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__22;
+lean_inc(x_903);
+x_905 = l_Lean_Syntax_isOfKind(x_903, x_904);
+if (x_905 == 0)
 {
-lean_object* x_915; uint8_t x_916; 
-x_915 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
-lean_inc(x_912);
-x_916 = l_Lean_Syntax_isOfKind(x_912, x_915);
-if (x_916 == 0)
+lean_object* x_906; uint8_t x_907; 
+x_906 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__10;
+lean_inc(x_903);
+x_907 = l_Lean_Syntax_isOfKind(x_903, x_906);
+if (x_907 == 0)
 {
-uint8_t x_917; uint8_t x_918; 
-lean_dec(x_912);
-lean_dec(x_910);
-x_917 = l_List_isEmpty___rarg(x_2);
+uint8_t x_908; uint8_t x_909; 
+lean_dec(x_903);
+lean_dec(x_901);
+x_908 = l_List_isEmpty___rarg(x_2);
 if (x_8 == 0)
 {
-uint8_t x_1009; 
-x_1009 = 1;
-x_918 = x_1009;
-goto block_1008;
+uint8_t x_1000; 
+x_1000 = 1;
+x_909 = x_1000;
+goto block_999;
 }
 else
 {
-uint8_t x_1010; 
-x_1010 = 0;
-x_918 = x_1010;
-goto block_1008;
+uint8_t x_1001; 
+x_1001 = 0;
+x_909 = x_1001;
+goto block_999;
 }
-block_1008:
+block_999:
 {
+if (x_908 == 0)
+{
+lean_object* x_910; lean_object* x_911; lean_object* x_912; lean_object* x_913; lean_object* x_914; lean_object* x_915; lean_object* x_916; 
+x_910 = lean_box(0);
+x_911 = lean_box(x_909);
+x_912 = lean_box(x_6);
+x_913 = lean_box(x_7);
+x_914 = lean_box(x_8);
+x_915 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_915, 0, x_1);
+lean_closure_set(x_915, 1, x_910);
+lean_closure_set(x_915, 2, x_911);
+lean_closure_set(x_915, 3, x_2);
+lean_closure_set(x_915, 4, x_3);
+lean_closure_set(x_915, 5, x_4);
+lean_closure_set(x_915, 6, x_5);
+lean_closure_set(x_915, 7, x_912);
+lean_closure_set(x_915, 8, x_913);
+lean_closure_set(x_915, 9, x_914);
+x_916 = l_Lean_Elab_Term_observing___rarg(x_915, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_916) == 0)
+{
+uint8_t x_917; 
+x_917 = !lean_is_exclusive(x_916);
 if (x_917 == 0)
 {
-lean_object* x_919; lean_object* x_920; lean_object* x_921; lean_object* x_922; lean_object* x_923; lean_object* x_924; lean_object* x_925; 
-x_919 = lean_box(0);
-x_920 = lean_box(x_918);
-x_921 = lean_box(x_6);
-x_922 = lean_box(x_7);
-x_923 = lean_box(x_8);
-x_924 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_924, 0, x_1);
-lean_closure_set(x_924, 1, x_919);
-lean_closure_set(x_924, 2, x_920);
-lean_closure_set(x_924, 3, x_2);
-lean_closure_set(x_924, 4, x_3);
-lean_closure_set(x_924, 5, x_4);
-lean_closure_set(x_924, 6, x_5);
-lean_closure_set(x_924, 7, x_921);
-lean_closure_set(x_924, 8, x_922);
-lean_closure_set(x_924, 9, x_923);
-x_925 = l_Lean_Elab_Term_observing___rarg(x_924, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_925) == 0)
-{
-uint8_t x_926; 
-x_926 = !lean_is_exclusive(x_925);
-if (x_926 == 0)
-{
-lean_object* x_927; lean_object* x_928; 
-x_927 = lean_ctor_get(x_925, 0);
-x_928 = lean_array_push(x_9, x_927);
-lean_ctor_set(x_925, 0, x_928);
-return x_925;
+lean_object* x_918; lean_object* x_919; 
+x_918 = lean_ctor_get(x_916, 0);
+x_919 = lean_array_push(x_9, x_918);
+lean_ctor_set(x_916, 0, x_919);
+return x_916;
 }
 else
 {
-lean_object* x_929; lean_object* x_930; lean_object* x_931; lean_object* x_932; 
-x_929 = lean_ctor_get(x_925, 0);
-x_930 = lean_ctor_get(x_925, 1);
-lean_inc(x_930);
-lean_inc(x_929);
-lean_dec(x_925);
-x_931 = lean_array_push(x_9, x_929);
-x_932 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_932, 0, x_931);
-lean_ctor_set(x_932, 1, x_930);
-return x_932;
+lean_object* x_920; lean_object* x_921; lean_object* x_922; lean_object* x_923; 
+x_920 = lean_ctor_get(x_916, 0);
+x_921 = lean_ctor_get(x_916, 1);
+lean_inc(x_921);
+lean_inc(x_920);
+lean_dec(x_916);
+x_922 = lean_array_push(x_9, x_920);
+x_923 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_923, 0, x_922);
+lean_ctor_set(x_923, 1, x_921);
+return x_923;
 }
 }
 else
 {
-uint8_t x_933; 
+uint8_t x_924; 
 lean_dec(x_9);
-x_933 = !lean_is_exclusive(x_925);
-if (x_933 == 0)
+x_924 = !lean_is_exclusive(x_916);
+if (x_924 == 0)
 {
-return x_925;
+return x_916;
 }
 else
 {
-lean_object* x_934; lean_object* x_935; lean_object* x_936; 
-x_934 = lean_ctor_get(x_925, 0);
-x_935 = lean_ctor_get(x_925, 1);
-lean_inc(x_935);
-lean_inc(x_934);
-lean_dec(x_925);
-x_936 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_936, 0, x_934);
-lean_ctor_set(x_936, 1, x_935);
-return x_936;
+lean_object* x_925; lean_object* x_926; lean_object* x_927; 
+x_925 = lean_ctor_get(x_916, 0);
+x_926 = lean_ctor_get(x_916, 1);
+lean_inc(x_926);
+lean_inc(x_925);
+lean_dec(x_916);
+x_927 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_927, 0, x_925);
+lean_ctor_set(x_927, 1, x_926);
+return x_927;
 }
 }
 }
 else
 {
-uint8_t x_937; 
-x_937 = l_Array_isEmpty___rarg(x_3);
-if (x_937 == 0)
+uint8_t x_928; 
+x_928 = l_Array_isEmpty___rarg(x_3);
+if (x_928 == 0)
 {
-lean_object* x_938; lean_object* x_939; lean_object* x_940; lean_object* x_941; lean_object* x_942; lean_object* x_943; lean_object* x_944; 
-x_938 = lean_box(0);
-x_939 = lean_box(x_918);
-x_940 = lean_box(x_6);
-x_941 = lean_box(x_7);
-x_942 = lean_box(x_8);
-x_943 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_943, 0, x_1);
-lean_closure_set(x_943, 1, x_938);
-lean_closure_set(x_943, 2, x_939);
-lean_closure_set(x_943, 3, x_2);
-lean_closure_set(x_943, 4, x_3);
-lean_closure_set(x_943, 5, x_4);
-lean_closure_set(x_943, 6, x_5);
-lean_closure_set(x_943, 7, x_940);
-lean_closure_set(x_943, 8, x_941);
-lean_closure_set(x_943, 9, x_942);
-x_944 = l_Lean_Elab_Term_observing___rarg(x_943, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_944) == 0)
+lean_object* x_929; lean_object* x_930; lean_object* x_931; lean_object* x_932; lean_object* x_933; lean_object* x_934; lean_object* x_935; 
+x_929 = lean_box(0);
+x_930 = lean_box(x_909);
+x_931 = lean_box(x_6);
+x_932 = lean_box(x_7);
+x_933 = lean_box(x_8);
+x_934 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_934, 0, x_1);
+lean_closure_set(x_934, 1, x_929);
+lean_closure_set(x_934, 2, x_930);
+lean_closure_set(x_934, 3, x_2);
+lean_closure_set(x_934, 4, x_3);
+lean_closure_set(x_934, 5, x_4);
+lean_closure_set(x_934, 6, x_5);
+lean_closure_set(x_934, 7, x_931);
+lean_closure_set(x_934, 8, x_932);
+lean_closure_set(x_934, 9, x_933);
+x_935 = l_Lean_Elab_Term_observing___rarg(x_934, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_935) == 0)
 {
-uint8_t x_945; 
-x_945 = !lean_is_exclusive(x_944);
-if (x_945 == 0)
+uint8_t x_936; 
+x_936 = !lean_is_exclusive(x_935);
+if (x_936 == 0)
 {
-lean_object* x_946; lean_object* x_947; 
-x_946 = lean_ctor_get(x_944, 0);
-x_947 = lean_array_push(x_9, x_946);
-lean_ctor_set(x_944, 0, x_947);
-return x_944;
+lean_object* x_937; lean_object* x_938; 
+x_937 = lean_ctor_get(x_935, 0);
+x_938 = lean_array_push(x_9, x_937);
+lean_ctor_set(x_935, 0, x_938);
+return x_935;
 }
 else
 {
-lean_object* x_948; lean_object* x_949; lean_object* x_950; lean_object* x_951; 
-x_948 = lean_ctor_get(x_944, 0);
-x_949 = lean_ctor_get(x_944, 1);
-lean_inc(x_949);
-lean_inc(x_948);
-lean_dec(x_944);
-x_950 = lean_array_push(x_9, x_948);
-x_951 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_951, 0, x_950);
-lean_ctor_set(x_951, 1, x_949);
-return x_951;
+lean_object* x_939; lean_object* x_940; lean_object* x_941; lean_object* x_942; 
+x_939 = lean_ctor_get(x_935, 0);
+x_940 = lean_ctor_get(x_935, 1);
+lean_inc(x_940);
+lean_inc(x_939);
+lean_dec(x_935);
+x_941 = lean_array_push(x_9, x_939);
+x_942 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_942, 0, x_941);
+lean_ctor_set(x_942, 1, x_940);
+return x_942;
 }
 }
 else
 {
-uint8_t x_952; 
+uint8_t x_943; 
 lean_dec(x_9);
-x_952 = !lean_is_exclusive(x_944);
-if (x_952 == 0)
+x_943 = !lean_is_exclusive(x_935);
+if (x_943 == 0)
 {
-return x_944;
+return x_935;
 }
 else
 {
-lean_object* x_953; lean_object* x_954; lean_object* x_955; 
-x_953 = lean_ctor_get(x_944, 0);
-x_954 = lean_ctor_get(x_944, 1);
-lean_inc(x_954);
-lean_inc(x_953);
-lean_dec(x_944);
-x_955 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_955, 0, x_953);
-lean_ctor_set(x_955, 1, x_954);
-return x_955;
+lean_object* x_944; lean_object* x_945; lean_object* x_946; 
+x_944 = lean_ctor_get(x_935, 0);
+x_945 = lean_ctor_get(x_935, 1);
+lean_inc(x_945);
+lean_inc(x_944);
+lean_dec(x_935);
+x_946 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_946, 0, x_944);
+lean_ctor_set(x_946, 1, x_945);
+return x_946;
 }
 }
 }
 else
 {
-uint8_t x_956; 
-x_956 = l_Array_isEmpty___rarg(x_4);
-if (x_956 == 0)
+uint8_t x_947; 
+x_947 = l_Array_isEmpty___rarg(x_4);
+if (x_947 == 0)
 {
-lean_object* x_957; lean_object* x_958; lean_object* x_959; lean_object* x_960; lean_object* x_961; lean_object* x_962; lean_object* x_963; 
-x_957 = lean_box(0);
-x_958 = lean_box(x_918);
-x_959 = lean_box(x_6);
-x_960 = lean_box(x_7);
-x_961 = lean_box(x_8);
-x_962 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
-lean_closure_set(x_962, 0, x_1);
-lean_closure_set(x_962, 1, x_957);
-lean_closure_set(x_962, 2, x_958);
-lean_closure_set(x_962, 3, x_2);
-lean_closure_set(x_962, 4, x_3);
-lean_closure_set(x_962, 5, x_4);
-lean_closure_set(x_962, 6, x_5);
-lean_closure_set(x_962, 7, x_959);
-lean_closure_set(x_962, 8, x_960);
-lean_closure_set(x_962, 9, x_961);
-x_963 = l_Lean_Elab_Term_observing___rarg(x_962, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_963) == 0)
+lean_object* x_948; lean_object* x_949; lean_object* x_950; lean_object* x_951; lean_object* x_952; lean_object* x_953; lean_object* x_954; 
+x_948 = lean_box(0);
+x_949 = lean_box(x_909);
+x_950 = lean_box(x_6);
+x_951 = lean_box(x_7);
+x_952 = lean_box(x_8);
+x_953 = lean_alloc_closure((void*)(l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed), 17, 10);
+lean_closure_set(x_953, 0, x_1);
+lean_closure_set(x_953, 1, x_948);
+lean_closure_set(x_953, 2, x_949);
+lean_closure_set(x_953, 3, x_2);
+lean_closure_set(x_953, 4, x_3);
+lean_closure_set(x_953, 5, x_4);
+lean_closure_set(x_953, 6, x_5);
+lean_closure_set(x_953, 7, x_950);
+lean_closure_set(x_953, 8, x_951);
+lean_closure_set(x_953, 9, x_952);
+x_954 = l_Lean_Elab_Term_observing___rarg(x_953, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_954) == 0)
 {
-uint8_t x_964; 
-x_964 = !lean_is_exclusive(x_963);
-if (x_964 == 0)
+uint8_t x_955; 
+x_955 = !lean_is_exclusive(x_954);
+if (x_955 == 0)
 {
-lean_object* x_965; lean_object* x_966; 
-x_965 = lean_ctor_get(x_963, 0);
-x_966 = lean_array_push(x_9, x_965);
-lean_ctor_set(x_963, 0, x_966);
-return x_963;
+lean_object* x_956; lean_object* x_957; 
+x_956 = lean_ctor_get(x_954, 0);
+x_957 = lean_array_push(x_9, x_956);
+lean_ctor_set(x_954, 0, x_957);
+return x_954;
 }
 else
 {
-lean_object* x_967; lean_object* x_968; lean_object* x_969; lean_object* x_970; 
-x_967 = lean_ctor_get(x_963, 0);
-x_968 = lean_ctor_get(x_963, 1);
-lean_inc(x_968);
-lean_inc(x_967);
-lean_dec(x_963);
-x_969 = lean_array_push(x_9, x_967);
-x_970 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_970, 0, x_969);
-lean_ctor_set(x_970, 1, x_968);
-return x_970;
+lean_object* x_958; lean_object* x_959; lean_object* x_960; lean_object* x_961; 
+x_958 = lean_ctor_get(x_954, 0);
+x_959 = lean_ctor_get(x_954, 1);
+lean_inc(x_959);
+lean_inc(x_958);
+lean_dec(x_954);
+x_960 = lean_array_push(x_9, x_958);
+x_961 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_961, 0, x_960);
+lean_ctor_set(x_961, 1, x_959);
+return x_961;
 }
 }
 else
 {
-uint8_t x_971; 
+uint8_t x_962; 
 lean_dec(x_9);
-x_971 = !lean_is_exclusive(x_963);
-if (x_971 == 0)
+x_962 = !lean_is_exclusive(x_954);
+if (x_962 == 0)
 {
-return x_963;
+return x_954;
 }
 else
 {
-lean_object* x_972; lean_object* x_973; lean_object* x_974; 
-x_972 = lean_ctor_get(x_963, 0);
-x_973 = lean_ctor_get(x_963, 1);
-lean_inc(x_973);
-lean_inc(x_972);
-lean_dec(x_963);
-x_974 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_974, 0, x_972);
-lean_ctor_set(x_974, 1, x_973);
-return x_974;
+lean_object* x_963; lean_object* x_964; lean_object* x_965; 
+x_963 = lean_ctor_get(x_954, 0);
+x_964 = lean_ctor_get(x_954, 1);
+lean_inc(x_964);
+lean_inc(x_963);
+lean_dec(x_954);
+x_965 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_965, 0, x_963);
+lean_ctor_set(x_965, 1, x_964);
+return x_965;
 }
 }
 }
@@ -44325,129 +44329,129 @@ lean_dec(x_3);
 lean_dec(x_2);
 if (x_8 == 0)
 {
-uint8_t x_975; lean_object* x_976; lean_object* x_977; lean_object* x_978; lean_object* x_979; 
-x_975 = 1;
-x_976 = lean_box(x_975);
-x_977 = lean_box(x_975);
-x_978 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
-lean_closure_set(x_978, 0, x_1);
-lean_closure_set(x_978, 1, x_5);
-lean_closure_set(x_978, 2, x_976);
-lean_closure_set(x_978, 3, x_977);
-x_979 = l_Lean_Elab_Term_observing___rarg(x_978, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_979) == 0)
+uint8_t x_966; lean_object* x_967; lean_object* x_968; lean_object* x_969; lean_object* x_970; 
+x_966 = 1;
+x_967 = lean_box(x_966);
+x_968 = lean_box(x_966);
+x_969 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTerm___boxed), 11, 4);
+lean_closure_set(x_969, 0, x_1);
+lean_closure_set(x_969, 1, x_5);
+lean_closure_set(x_969, 2, x_967);
+lean_closure_set(x_969, 3, x_968);
+x_970 = l_Lean_Elab_Term_observing___rarg(x_969, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_970) == 0)
 {
-uint8_t x_980; 
-x_980 = !lean_is_exclusive(x_979);
-if (x_980 == 0)
+uint8_t x_971; 
+x_971 = !lean_is_exclusive(x_970);
+if (x_971 == 0)
 {
-lean_object* x_981; lean_object* x_982; 
-x_981 = lean_ctor_get(x_979, 0);
-x_982 = lean_array_push(x_9, x_981);
-lean_ctor_set(x_979, 0, x_982);
-return x_979;
+lean_object* x_972; lean_object* x_973; 
+x_972 = lean_ctor_get(x_970, 0);
+x_973 = lean_array_push(x_9, x_972);
+lean_ctor_set(x_970, 0, x_973);
+return x_970;
 }
 else
 {
-lean_object* x_983; lean_object* x_984; lean_object* x_985; lean_object* x_986; 
-x_983 = lean_ctor_get(x_979, 0);
-x_984 = lean_ctor_get(x_979, 1);
-lean_inc(x_984);
-lean_inc(x_983);
-lean_dec(x_979);
-x_985 = lean_array_push(x_9, x_983);
-x_986 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_986, 0, x_985);
-lean_ctor_set(x_986, 1, x_984);
-return x_986;
+lean_object* x_974; lean_object* x_975; lean_object* x_976; lean_object* x_977; 
+x_974 = lean_ctor_get(x_970, 0);
+x_975 = lean_ctor_get(x_970, 1);
+lean_inc(x_975);
+lean_inc(x_974);
+lean_dec(x_970);
+x_976 = lean_array_push(x_9, x_974);
+x_977 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_977, 0, x_976);
+lean_ctor_set(x_977, 1, x_975);
+return x_977;
 }
 }
 else
 {
-uint8_t x_987; 
+uint8_t x_978; 
 lean_dec(x_9);
-x_987 = !lean_is_exclusive(x_979);
-if (x_987 == 0)
+x_978 = !lean_is_exclusive(x_970);
+if (x_978 == 0)
 {
-return x_979;
+return x_970;
 }
 else
 {
-lean_object* x_988; lean_object* x_989; lean_object* x_990; 
-x_988 = lean_ctor_get(x_979, 0);
-x_989 = lean_ctor_get(x_979, 1);
-lean_inc(x_989);
-lean_inc(x_988);
-lean_dec(x_979);
-x_990 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_990, 0, x_988);
-lean_ctor_set(x_990, 1, x_989);
-return x_990;
+lean_object* x_979; lean_object* x_980; lean_object* x_981; 
+x_979 = lean_ctor_get(x_970, 0);
+x_980 = lean_ctor_get(x_970, 1);
+lean_inc(x_980);
+lean_inc(x_979);
+lean_dec(x_970);
+x_981 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_981, 0, x_979);
+lean_ctor_set(x_981, 1, x_980);
+return x_981;
 }
 }
 }
 else
 {
-lean_object* x_991; uint8_t x_992; lean_object* x_993; lean_object* x_994; lean_object* x_995; lean_object* x_996; 
-x_991 = lean_box(0);
-x_992 = 1;
-x_993 = lean_box(x_918);
-x_994 = lean_box(x_992);
-x_995 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_995, 0, x_1);
-lean_closure_set(x_995, 1, x_5);
-lean_closure_set(x_995, 2, x_993);
-lean_closure_set(x_995, 3, x_994);
-lean_closure_set(x_995, 4, x_991);
-x_996 = l_Lean_Elab_Term_observing___rarg(x_995, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-if (lean_obj_tag(x_996) == 0)
+lean_object* x_982; uint8_t x_983; lean_object* x_984; lean_object* x_985; lean_object* x_986; lean_object* x_987; 
+x_982 = lean_box(0);
+x_983 = 1;
+x_984 = lean_box(x_909);
+x_985 = lean_box(x_983);
+x_986 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_986, 0, x_1);
+lean_closure_set(x_986, 1, x_5);
+lean_closure_set(x_986, 2, x_984);
+lean_closure_set(x_986, 3, x_985);
+lean_closure_set(x_986, 4, x_982);
+x_987 = l_Lean_Elab_Term_observing___rarg(x_986, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_987) == 0)
 {
-uint8_t x_997; 
-x_997 = !lean_is_exclusive(x_996);
-if (x_997 == 0)
+uint8_t x_988; 
+x_988 = !lean_is_exclusive(x_987);
+if (x_988 == 0)
 {
-lean_object* x_998; lean_object* x_999; 
-x_998 = lean_ctor_get(x_996, 0);
-x_999 = lean_array_push(x_9, x_998);
-lean_ctor_set(x_996, 0, x_999);
-return x_996;
+lean_object* x_989; lean_object* x_990; 
+x_989 = lean_ctor_get(x_987, 0);
+x_990 = lean_array_push(x_9, x_989);
+lean_ctor_set(x_987, 0, x_990);
+return x_987;
 }
 else
 {
-lean_object* x_1000; lean_object* x_1001; lean_object* x_1002; lean_object* x_1003; 
-x_1000 = lean_ctor_get(x_996, 0);
-x_1001 = lean_ctor_get(x_996, 1);
-lean_inc(x_1001);
-lean_inc(x_1000);
-lean_dec(x_996);
-x_1002 = lean_array_push(x_9, x_1000);
-x_1003 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1003, 0, x_1002);
-lean_ctor_set(x_1003, 1, x_1001);
-return x_1003;
+lean_object* x_991; lean_object* x_992; lean_object* x_993; lean_object* x_994; 
+x_991 = lean_ctor_get(x_987, 0);
+x_992 = lean_ctor_get(x_987, 1);
+lean_inc(x_992);
+lean_inc(x_991);
+lean_dec(x_987);
+x_993 = lean_array_push(x_9, x_991);
+x_994 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_994, 0, x_993);
+lean_ctor_set(x_994, 1, x_992);
+return x_994;
 }
 }
 else
 {
-uint8_t x_1004; 
+uint8_t x_995; 
 lean_dec(x_9);
-x_1004 = !lean_is_exclusive(x_996);
-if (x_1004 == 0)
+x_995 = !lean_is_exclusive(x_987);
+if (x_995 == 0)
 {
-return x_996;
+return x_987;
 }
 else
 {
-lean_object* x_1005; lean_object* x_1006; lean_object* x_1007; 
-x_1005 = lean_ctor_get(x_996, 0);
-x_1006 = lean_ctor_get(x_996, 1);
-lean_inc(x_1006);
-lean_inc(x_1005);
-lean_dec(x_996);
-x_1007 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_1007, 0, x_1005);
-lean_ctor_set(x_1007, 1, x_1006);
-return x_1007;
+lean_object* x_996; lean_object* x_997; lean_object* x_998; 
+x_996 = lean_ctor_get(x_987, 0);
+x_997 = lean_ctor_get(x_987, 1);
+lean_inc(x_997);
+lean_inc(x_996);
+lean_dec(x_987);
+x_998 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_998, 0, x_996);
+lean_ctor_set(x_998, 1, x_997);
+return x_998;
 }
 }
 }
@@ -44458,53 +44462,53 @@ return x_1007;
 }
 else
 {
-lean_object* x_1011; lean_object* x_1012; lean_object* x_1013; lean_object* x_1014; lean_object* x_1015; 
+lean_object* x_1002; lean_object* x_1003; lean_object* x_1004; lean_object* x_1005; lean_object* x_1006; 
 lean_dec(x_1);
-x_1011 = lean_box(0);
-x_1012 = l_Lean_Syntax_identComponents(x_912, x_1011);
-x_1013 = lean_box(0);
-lean_inc(x_910);
-x_1014 = l_List_mapTRAux___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__4(x_910, x_1012, x_1013);
-x_1015 = l_List_appendTR___rarg(x_1014, x_2);
-x_1 = x_910;
-x_2 = x_1015;
+x_1002 = lean_box(0);
+x_1003 = l_Lean_Syntax_identComponents(x_903, x_1002);
+x_1004 = lean_box(0);
+lean_inc(x_901);
+x_1005 = l_List_mapTRAux___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__4(x_901, x_1003, x_1004);
+x_1006 = l_List_appendTR___rarg(x_1005, x_2);
+x_1 = x_901;
+x_2 = x_1006;
 goto _start;
 }
 }
 else
 {
-lean_object* x_1017; 
+lean_object* x_1008; 
 lean_dec(x_1);
-x_1017 = l_Lean_Syntax_isFieldIdx_x3f(x_912);
-if (lean_obj_tag(x_1017) == 0)
+x_1008 = l_Lean_Syntax_isFieldIdx_x3f(x_903);
+if (lean_obj_tag(x_1008) == 0)
 {
-lean_object* x_1018; lean_object* x_1019; lean_object* x_1020; lean_object* x_1021; 
-x_1018 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__26;
-x_1019 = l_panic___at_String_toNat_x21___spec__1(x_1018);
-x_1020 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1020, 0, x_912);
-lean_ctor_set(x_1020, 1, x_1019);
-x_1021 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_1021, 0, x_1020);
-lean_ctor_set(x_1021, 1, x_2);
-x_1 = x_910;
-x_2 = x_1021;
+lean_object* x_1009; lean_object* x_1010; lean_object* x_1011; lean_object* x_1012; 
+x_1009 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___closed__26;
+x_1010 = l_panic___at_String_toNat_x21___spec__1(x_1009);
+x_1011 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1011, 0, x_903);
+lean_ctor_set(x_1011, 1, x_1010);
+x_1012 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_1012, 0, x_1011);
+lean_ctor_set(x_1012, 1, x_2);
+x_1 = x_901;
+x_2 = x_1012;
 goto _start;
 }
 else
 {
-lean_object* x_1023; lean_object* x_1024; lean_object* x_1025; 
-x_1023 = lean_ctor_get(x_1017, 0);
-lean_inc(x_1023);
-lean_dec(x_1017);
-x_1024 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1024, 0, x_912);
-lean_ctor_set(x_1024, 1, x_1023);
-x_1025 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_1025, 0, x_1024);
-lean_ctor_set(x_1025, 1, x_2);
-x_1 = x_910;
-x_2 = x_1025;
+lean_object* x_1014; lean_object* x_1015; lean_object* x_1016; 
+x_1014 = lean_ctor_get(x_1008, 0);
+lean_inc(x_1014);
+lean_dec(x_1008);
+x_1015 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1015, 0, x_903);
+lean_ctor_set(x_1015, 1, x_1014);
+x_1016 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_1016, 0, x_1015);
+lean_ctor_set(x_1016, 1, x_2);
+x_1 = x_901;
+x_2 = x_1016;
 goto _start;
 }
 }
@@ -44512,17 +44516,17 @@ goto _start;
 }
 else
 {
-lean_object* x_1027; lean_object* x_1028; lean_object* x_1029; uint8_t x_1030; 
-x_1027 = l_Lean_Syntax_getArgs(x_1);
+lean_object* x_1018; lean_object* x_1019; lean_object* x_1020; uint8_t x_1021; 
+x_1018 = l_Lean_Syntax_getArgs(x_1);
 lean_dec(x_1);
-x_1028 = lean_array_get_size(x_1027);
-x_1029 = lean_unsigned_to_nat(0u);
-x_1030 = lean_nat_dec_lt(x_1029, x_1028);
-if (x_1030 == 0)
+x_1019 = lean_array_get_size(x_1018);
+x_1020 = lean_unsigned_to_nat(0u);
+x_1021 = lean_nat_dec_lt(x_1020, x_1019);
+if (x_1021 == 0)
 {
-lean_object* x_1031; 
-lean_dec(x_1028);
-lean_dec(x_1027);
+lean_object* x_1022; 
+lean_dec(x_1019);
+lean_dec(x_1018);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -44533,27 +44537,27 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1031 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1031, 0, x_9);
-lean_ctor_set(x_1031, 1, x_16);
-return x_1031;
+x_1022 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1022, 0, x_9);
+lean_ctor_set(x_1022, 1, x_16);
+return x_1022;
 }
 else
 {
-uint8_t x_1032; 
-x_1032 = !lean_is_exclusive(x_10);
-if (x_1032 == 0)
+uint8_t x_1023; 
+x_1023 = !lean_is_exclusive(x_10);
+if (x_1023 == 0)
 {
-uint8_t x_1033; uint8_t x_1034; 
-x_1033 = 0;
-lean_ctor_set_uint8(x_10, sizeof(void*)*8 + 1, x_1033);
-x_1034 = lean_nat_dec_le(x_1028, x_1028);
-if (x_1034 == 0)
+uint8_t x_1024; uint8_t x_1025; 
+x_1024 = 0;
+lean_ctor_set_uint8(x_10, sizeof(void*)*8 + 1, x_1024);
+x_1025 = lean_nat_dec_le(x_1019, x_1019);
+if (x_1025 == 0)
 {
-lean_object* x_1035; 
+lean_object* x_1026; 
 lean_dec(x_10);
-lean_dec(x_1028);
-lean_dec(x_1027);
+lean_dec(x_1019);
+lean_dec(x_1018);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -44563,74 +44567,74 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1035 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1035, 0, x_9);
-lean_ctor_set(x_1035, 1, x_16);
-return x_1035;
+x_1026 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1026, 0, x_9);
+lean_ctor_set(x_1026, 1, x_16);
+return x_1026;
 }
 else
 {
-size_t x_1036; size_t x_1037; lean_object* x_1038; 
-x_1036 = 0;
-x_1037 = lean_usize_of_nat(x_1028);
-lean_dec(x_1028);
-x_1038 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__5(x_2, x_3, x_4, x_5, x_6, x_7, x_1027, x_1036, x_1037, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-lean_dec(x_1027);
-return x_1038;
+size_t x_1027; size_t x_1028; lean_object* x_1029; 
+x_1027 = 0;
+x_1028 = lean_usize_of_nat(x_1019);
+lean_dec(x_1019);
+x_1029 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__5(x_2, x_3, x_4, x_5, x_6, x_7, x_1018, x_1027, x_1028, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_1018);
+return x_1029;
 }
 }
 else
 {
-lean_object* x_1039; lean_object* x_1040; lean_object* x_1041; uint8_t x_1042; uint8_t x_1043; lean_object* x_1044; lean_object* x_1045; lean_object* x_1046; lean_object* x_1047; uint8_t x_1048; uint8_t x_1049; uint8_t x_1050; uint8_t x_1051; lean_object* x_1052; uint8_t x_1053; uint8_t x_1054; lean_object* x_1055; uint8_t x_1056; 
-x_1039 = lean_ctor_get(x_10, 0);
-x_1040 = lean_ctor_get(x_10, 1);
-x_1041 = lean_ctor_get(x_10, 2);
-x_1042 = lean_ctor_get_uint8(x_10, sizeof(void*)*8);
-x_1043 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 2);
-x_1044 = lean_ctor_get(x_10, 3);
-x_1045 = lean_ctor_get(x_10, 4);
-x_1046 = lean_ctor_get(x_10, 5);
-x_1047 = lean_ctor_get(x_10, 6);
-x_1048 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 3);
-x_1049 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 4);
-x_1050 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 5);
-x_1051 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 6);
-x_1052 = lean_ctor_get(x_10, 7);
-x_1053 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 7);
-lean_inc(x_1052);
-lean_inc(x_1047);
-lean_inc(x_1046);
-lean_inc(x_1045);
-lean_inc(x_1044);
-lean_inc(x_1041);
-lean_inc(x_1040);
-lean_inc(x_1039);
+lean_object* x_1030; lean_object* x_1031; lean_object* x_1032; uint8_t x_1033; uint8_t x_1034; lean_object* x_1035; lean_object* x_1036; lean_object* x_1037; lean_object* x_1038; uint8_t x_1039; uint8_t x_1040; uint8_t x_1041; uint8_t x_1042; lean_object* x_1043; uint8_t x_1044; uint8_t x_1045; lean_object* x_1046; uint8_t x_1047; 
+x_1030 = lean_ctor_get(x_10, 0);
+x_1031 = lean_ctor_get(x_10, 1);
+x_1032 = lean_ctor_get(x_10, 2);
+x_1033 = lean_ctor_get_uint8(x_10, sizeof(void*)*8);
+x_1034 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 2);
+x_1035 = lean_ctor_get(x_10, 3);
+x_1036 = lean_ctor_get(x_10, 4);
+x_1037 = lean_ctor_get(x_10, 5);
+x_1038 = lean_ctor_get(x_10, 6);
+x_1039 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 3);
+x_1040 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 4);
+x_1041 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 5);
+x_1042 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 6);
+x_1043 = lean_ctor_get(x_10, 7);
+x_1044 = lean_ctor_get_uint8(x_10, sizeof(void*)*8 + 7);
+lean_inc(x_1043);
+lean_inc(x_1038);
+lean_inc(x_1037);
+lean_inc(x_1036);
+lean_inc(x_1035);
+lean_inc(x_1032);
+lean_inc(x_1031);
+lean_inc(x_1030);
 lean_dec(x_10);
-x_1054 = 0;
-x_1055 = lean_alloc_ctor(0, 8, 8);
-lean_ctor_set(x_1055, 0, x_1039);
-lean_ctor_set(x_1055, 1, x_1040);
-lean_ctor_set(x_1055, 2, x_1041);
-lean_ctor_set(x_1055, 3, x_1044);
-lean_ctor_set(x_1055, 4, x_1045);
-lean_ctor_set(x_1055, 5, x_1046);
-lean_ctor_set(x_1055, 6, x_1047);
-lean_ctor_set(x_1055, 7, x_1052);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8, x_1042);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 1, x_1054);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 2, x_1043);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 3, x_1048);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 4, x_1049);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 5, x_1050);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 6, x_1051);
-lean_ctor_set_uint8(x_1055, sizeof(void*)*8 + 7, x_1053);
-x_1056 = lean_nat_dec_le(x_1028, x_1028);
-if (x_1056 == 0)
+x_1045 = 0;
+x_1046 = lean_alloc_ctor(0, 8, 8);
+lean_ctor_set(x_1046, 0, x_1030);
+lean_ctor_set(x_1046, 1, x_1031);
+lean_ctor_set(x_1046, 2, x_1032);
+lean_ctor_set(x_1046, 3, x_1035);
+lean_ctor_set(x_1046, 4, x_1036);
+lean_ctor_set(x_1046, 5, x_1037);
+lean_ctor_set(x_1046, 6, x_1038);
+lean_ctor_set(x_1046, 7, x_1043);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8, x_1033);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 1, x_1045);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 2, x_1034);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 3, x_1039);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 4, x_1040);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 5, x_1041);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 6, x_1042);
+lean_ctor_set_uint8(x_1046, sizeof(void*)*8 + 7, x_1044);
+x_1047 = lean_nat_dec_le(x_1019, x_1019);
+if (x_1047 == 0)
 {
-lean_object* x_1057; 
-lean_dec(x_1055);
-lean_dec(x_1028);
-lean_dec(x_1027);
+lean_object* x_1048; 
+lean_dec(x_1046);
+lean_dec(x_1019);
+lean_dec(x_1018);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -44640,20 +44644,20 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1057 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_1057, 0, x_9);
-lean_ctor_set(x_1057, 1, x_16);
-return x_1057;
+x_1048 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1048, 0, x_9);
+lean_ctor_set(x_1048, 1, x_16);
+return x_1048;
 }
 else
 {
-size_t x_1058; size_t x_1059; lean_object* x_1060; 
-x_1058 = 0;
-x_1059 = lean_usize_of_nat(x_1028);
-lean_dec(x_1028);
-x_1060 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__5(x_2, x_3, x_4, x_5, x_6, x_7, x_1027, x_1058, x_1059, x_9, x_1055, x_11, x_12, x_13, x_14, x_15, x_16);
-lean_dec(x_1027);
-return x_1060;
+size_t x_1049; size_t x_1050; lean_object* x_1051; 
+x_1049 = 0;
+x_1050 = lean_usize_of_nat(x_1019);
+lean_dec(x_1019);
+x_1051 = l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__5(x_2, x_3, x_4, x_5, x_6, x_7, x_1018, x_1049, x_1050, x_9, x_1046, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_1018);
+return x_1051;
 }
 }
 }
@@ -44754,18 +44758,35 @@ x_22 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1(x_1, x_
 return x_22;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___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, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2___boxed(lean_object** _args) {
+lean_object* x_1 = _args[0];
+lean_object* x_2 = _args[1];
+lean_object* x_3 = _args[2];
+lean_object* x_4 = _args[3];
+lean_object* x_5 = _args[4];
+lean_object* x_6 = _args[5];
+lean_object* x_7 = _args[6];
+lean_object* x_8 = _args[7];
+lean_object* x_9 = _args[8];
+lean_object* x_10 = _args[9];
+lean_object* x_11 = _args[10];
+lean_object* x_12 = _args[11];
+lean_object* x_13 = _args[12];
+lean_object* x_14 = _args[13];
+lean_object* x_15 = _args[14];
+lean_object* x_16 = _args[15];
+lean_object* x_17 = _args[16];
 _start:
 {
-uint8_t x_17; uint8_t x_18; uint8_t x_19; lean_object* x_20; 
-x_17 = lean_unbox(x_6);
-lean_dec(x_6);
-x_18 = lean_unbox(x_7);
-lean_dec(x_7);
-x_19 = lean_unbox(x_8);
+uint8_t x_18; uint8_t x_19; uint8_t x_20; lean_object* x_21; 
+x_18 = lean_unbox(x_8);
 lean_dec(x_8);
-x_20 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2(x_1, x_2, x_3, x_4, x_5, x_17, x_18, x_19, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
-return x_20;
+x_19 = lean_unbox(x_9);
+lean_dec(x_9);
+x_20 = lean_unbox(x_10);
+lean_dec(x_10);
+x_21 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_18, x_19, x_20, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
+return x_21;
 }
 }
 LEAN_EXPORT lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
@@ -45540,7 +45561,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Term_ElabElim_finalize___lambda__4___closed__4;
 x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_App_0__Lean_Elab_Term_mergeFailures___spec__2___closed__1;
-x_3 = lean_unsigned_to_nat(1355u);
+x_3 = lean_unsigned_to_nat(1356u);
 x_4 = lean_unsigned_to_nat(57u);
 x_5 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop___lambda__3___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -46578,7 +46599,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Term_ElabElim_finalize___lambda__4___closed__4;
 x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppAux___spec__5___closed__1;
-x_3 = lean_unsigned_to_nat(1370u);
+x_3 = lean_unsigned_to_nat(1371u);
 x_4 = lean_unsigned_to_nat(21u);
 x_5 = l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop___lambda__3___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -47531,7 +47552,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabApp_declRange___clos
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1392u);
+x_1 = lean_unsigned_to_nat(1393u);
 x_2 = lean_unsigned_to_nat(23u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47543,7 +47564,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabApp_declRange___clos
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1395u);
+x_1 = lean_unsigned_to_nat(1396u);
 x_2 = lean_unsigned_to_nat(90u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47571,7 +47592,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabApp_declRange___clos
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1392u);
+x_1 = lean_unsigned_to_nat(1393u);
 x_2 = lean_unsigned_to_nat(27u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47583,7 +47604,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabApp_declRange___clos
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1392u);
+x_1 = lean_unsigned_to_nat(1393u);
 x_2 = lean_unsigned_to_nat(34u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47742,7 +47763,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabIdent_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1400u);
+x_1 = lean_unsigned_to_nat(1401u);
 x_2 = lean_unsigned_to_nat(25u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47754,7 +47775,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabIdent_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1400u);
+x_1 = lean_unsigned_to_nat(1401u);
 x_2 = lean_unsigned_to_nat(61u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47782,7 +47803,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabIdent_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1400u);
+x_1 = lean_unsigned_to_nat(1401u);
 x_2 = lean_unsigned_to_nat(29u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47794,7 +47815,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabIdent_declRange___cl
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1400u);
+x_1 = lean_unsigned_to_nat(1401u);
 x_2 = lean_unsigned_to_nat(38u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47902,7 +47923,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNamedPattern_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1401u);
+x_1 = lean_unsigned_to_nat(1402u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47914,7 +47935,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNamedPattern_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1401u);
+x_1 = lean_unsigned_to_nat(1402u);
 x_2 = lean_unsigned_to_nat(75u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47942,7 +47963,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNamedPattern_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1401u);
+x_1 = lean_unsigned_to_nat(1402u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -47954,7 +47975,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNamedPattern_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1401u);
+x_1 = lean_unsigned_to_nat(1402u);
 x_2 = lean_unsigned_to_nat(52u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48052,7 +48073,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabDotIdent_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1402u);
+x_1 = lean_unsigned_to_nat(1403u);
 x_2 = lean_unsigned_to_nat(28u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48064,7 +48085,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabDotIdent_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1402u);
+x_1 = lean_unsigned_to_nat(1403u);
 x_2 = lean_unsigned_to_nat(67u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48092,7 +48113,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabDotIdent_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1402u);
+x_1 = lean_unsigned_to_nat(1403u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48104,7 +48125,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabDotIdent_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1402u);
+x_1 = lean_unsigned_to_nat(1403u);
 x_2 = lean_unsigned_to_nat(44u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48202,7 +48223,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicitUniv_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1403u);
+x_1 = lean_unsigned_to_nat(1404u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48214,7 +48235,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicitUniv_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1403u);
+x_1 = lean_unsigned_to_nat(1404u);
 x_2 = lean_unsigned_to_nat(75u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48242,7 +48263,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicitUniv_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1403u);
+x_1 = lean_unsigned_to_nat(1404u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48254,7 +48275,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicitUniv_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1403u);
+x_1 = lean_unsigned_to_nat(1404u);
 x_2 = lean_unsigned_to_nat(52u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48508,7 +48529,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabPipeProj_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1404u);
+x_1 = lean_unsigned_to_nat(1405u);
 x_2 = lean_unsigned_to_nat(28u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48520,7 +48541,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabPipeProj_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1409u);
+x_1 = lean_unsigned_to_nat(1410u);
 x_2 = lean_unsigned_to_nat(34u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48548,7 +48569,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabPipeProj_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1404u);
+x_1 = lean_unsigned_to_nat(1405u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48560,7 +48581,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabPipeProj_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1404u);
+x_1 = lean_unsigned_to_nat(1405u);
 x_2 = lean_unsigned_to_nat(44u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48799,7 +48820,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicit_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1411u);
+x_1 = lean_unsigned_to_nat(1412u);
 x_2 = lean_unsigned_to_nat(28u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48811,7 +48832,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicit_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1417u);
+x_1 = lean_unsigned_to_nat(1418u);
 x_2 = lean_unsigned_to_nat(50u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48839,7 +48860,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicit_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1411u);
+x_1 = lean_unsigned_to_nat(1412u);
 x_2 = lean_unsigned_to_nat(32u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48851,7 +48872,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabExplicit_declRange__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1411u);
+x_1 = lean_unsigned_to_nat(1412u);
 x_2 = lean_unsigned_to_nat(44u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48949,7 +48970,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabChoice_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1419u);
+x_1 = lean_unsigned_to_nat(1420u);
 x_2 = lean_unsigned_to_nat(26u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48961,7 +48982,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabChoice_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1419u);
+x_1 = lean_unsigned_to_nat(1420u);
 x_2 = lean_unsigned_to_nat(63u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -48989,7 +49010,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabChoice_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1419u);
+x_1 = lean_unsigned_to_nat(1420u);
 x_2 = lean_unsigned_to_nat(30u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49001,7 +49022,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabChoice_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1419u);
+x_1 = lean_unsigned_to_nat(1420u);
 x_2 = lean_unsigned_to_nat(40u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49099,7 +49120,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabProj_declRange___clo
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1420u);
+x_1 = lean_unsigned_to_nat(1421u);
 x_2 = lean_unsigned_to_nat(24u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49111,7 +49132,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabProj_declRange___clo
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1420u);
+x_1 = lean_unsigned_to_nat(1421u);
 x_2 = lean_unsigned_to_nat(59u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49139,7 +49160,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabProj_declRange___clo
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1420u);
+x_1 = lean_unsigned_to_nat(1421u);
 x_2 = lean_unsigned_to_nat(28u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49151,7 +49172,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabProj_declRange___clo
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(1420u);
+x_1 = lean_unsigned_to_nat(1421u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -49197,7 +49218,7 @@ x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -49207,11 +49228,11 @@ x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1;
 x_3 = 0;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -50083,9 +50104,9 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabProj_declRange___closed__
 res = l___regBuiltin_Lean_Elab_Term_elabProj_declRange(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023____closed__1);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20023_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025____closed__1);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_App___hyg_20025_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Elab/Match.c b/stage0/stdlib/Lean/Elab/Match.c
index 62b9e6b3c8..73c66ce921 100644
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@@ -782,7 +782,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatch
 LEAN_EXPORT lean_object* l_Lean_AssocList_foldlM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkPatternRefMap_go___spec__6(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___lambda__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_findDiscrRefinementPath_goType___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_Term_addTermInfo(lean_object*, 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* l_Lean_Elab_Term_addTermInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withLetDecl___at_Lean_Elab_Term_ToDepElimPattern_savePatternInfo_go___spec__2___rarg___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*);
 static lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1820,7 +1820,7 @@ lean_dec(x_20);
 x_24 = lean_box(0);
 x_25 = lean_box(0);
 x_26 = 0;
-x_27 = l_Lean_Elab_Term_addTermInfo(x_10, x_16, x_24, x_24, x_25, x_26, x_2, x_3, x_4, x_5, x_6, x_7, x_21);
+x_27 = l_Lean_Elab_Term_addTermInfo(x_10, x_16, x_24, x_24, x_25, x_26, x_26, x_2, x_3, x_4, x_5, x_6, x_7, x_21);
 return x_27;
 }
 else
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Rewrite.c b/stage0/stdlib/Lean/Elab/Tactic/Rewrite.c
index e02fff079f..0f75c1ba31 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Rewrite.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Rewrite.c
@@ -170,7 +170,7 @@ static lean_object* l_Lean_resolveGlobalConst___at_Lean_Elab_Tactic_withRWRulesS
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_rewriteLocalDecl___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_EXPORT lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_withRWRulesSeq___spec__10___lambda__2(lean_object*, uint8_t, 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*, lean_object*);
-lean_object* l_Lean_Elab_Term_addTermInfo(lean_object*, 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* l_Lean_Elab_Term_addTermInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_evalUnsafe____x40_Lean_Elab_Tactic_Rewrite___hyg_1072____closed__3;
 lean_object* l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_withRWRulesSeq___spec__10___lambda__2___closed__5;
@@ -1859,7 +1859,7 @@ x_31 = lean_box(0);
 lean_ctor_set(x_17, 0, x_30);
 x_32 = lean_box(0);
 x_33 = 0;
-x_34 = l_Lean_Elab_Term_addTermInfo(x_4, x_28, x_31, x_17, x_32, x_33, x_8, x_9, x_10, x_11, x_12, x_13, x_29);
+x_34 = l_Lean_Elab_Term_addTermInfo(x_4, x_28, x_31, x_17, x_32, x_33, x_33, x_8, x_9, x_10, x_11, x_12, x_13, x_29);
 if (lean_obj_tag(x_34) == 0)
 {
 uint8_t x_35; 
@@ -2014,7 +2014,7 @@ x_62 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_62, 0, x_60);
 x_63 = lean_box(0);
 x_64 = 0;
-x_65 = l_Lean_Elab_Term_addTermInfo(x_4, x_58, x_61, x_62, x_63, x_64, x_8, x_9, x_10, x_11, x_12, x_13, x_59);
+x_65 = l_Lean_Elab_Term_addTermInfo(x_4, x_58, x_61, x_62, x_63, x_64, x_64, x_8, x_9, x_10, x_11, x_12, x_13, x_59);
 if (lean_obj_tag(x_65) == 0)
 {
 lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
diff --git a/stage0/stdlib/Lean/Elab/Term.c b/stage0/stdlib/Lean/Elab/Term.c
index 418d2973e0..97c163addb 100644
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
@@ -65,7 +65,6 @@ lean_object* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo_x27(lean_object*, 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_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_isExplicitApp___boxed(lean_object*);
-static lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_commitIfNoErrors_x3f(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_withoutModifyingElabMetaStateWithInfo___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_tryCoeThunk_x3f___closed__3;
@@ -85,7 +84,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError(lean_object*, l
 static lean_object* l_Lean_Elab_throwAutoBoundImplicitLocal___at_Lean_Elab_Term_resolveName_process___spec__1___closed__2;
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_mapM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_withoutModifyingStateWithInfoAndMessagesImpl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2;
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_getLetRecsToLift___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_instMonadMacroAdapterTermElabM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -181,7 +179,7 @@ static lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at_Lean_Elab_Term_expa
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__48___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapM_loop___at_Lean_Elab_Term_resolveName_x27___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_RBNode_insert___at_Lean_Elab_Term_registerSyntheticMVar___spec__1(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo___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_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo___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*);
 static lean_object* l_Lean_Elab_logException___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__3___closed__1;
 static lean_object* l_Lean_Elab_Term_instInhabitedLetRecToLift___closed__7;
 static lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__3___closed__1;
@@ -335,6 +333,7 @@ static lean_object* l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__1;
 static lean_object* l_Lean_Elab_Term_isLetRecAuxMVar___lambda__2___closed__2;
 static lean_object* l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_getLevelNames___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFnsAux(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___lambda__3___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_throwMVarError___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -413,6 +412,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAnd
 static lean_object* l_Lean_Elab_Term_instInhabitedMVarErrorKind___closed__2;
 static lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError___closed__7;
 static lean_object* l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__3;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_observing___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_throwAbortCommand___at_Lean_Elab_Term_ensureNoUnassignedMVars___spec__1___rarg___closed__1;
 static lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__1___closed__3;
@@ -422,6 +422,7 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfError
 static lean_object* l_Lean_Elab_Term_isLetRecAuxMVar___closed__4;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__51___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*);
 static lean_object* l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__16;
+static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2;
 extern lean_object* l_Lean_maxRecDepth;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_isTacticOrPostponedHole_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_expandDeclId___spec__4___closed__2;
@@ -500,7 +501,6 @@ lean_object* l_Lean_MapDeclarationExtension_insert___rarg(lean_object*, lean_obj
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_logUnassignedUsingErrorInfos___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_MetavarContext_0__Lean_DependsOn_dep_visitMain___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__11(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentArray_toList___rarg(lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2;
 static lean_object* l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__6;
 static lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at_Lean_Elab_Term_expandDeclId___spec__6___lambda__1___closed__3;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
@@ -646,7 +646,6 @@ static lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryCoe___closed
 static lean_object* l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__7;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__6(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1;
 LEAN_EXPORT lean_object* l_Array_findSomeRevM_x3f_find___at_Lean_Elab_Term_resolveLocalName___spec__10(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_MetavarContext_0__Lean_DependsOn_dep_visitMain___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Elab_Term_blockImplicitLambda(lean_object*);
@@ -688,7 +687,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_commitIfDidNotPostpone(lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5870_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_5842_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkAuxName___at_Lean_Elab_Term_mkAuxName___spec__2___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_setElabConfig(lean_object*);
 static lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__14;
@@ -928,6 +927,7 @@ LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_withoutModif
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_resolveId_x3f___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentArray_mapM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_withoutModifyingStateWithInfoAndMessagesImpl___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__39___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_instInhabitedCacheKey;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_instMetaEvalTermElabM___spec__6(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_logException___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1067,7 +1067,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_addAutoBou
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_applyAttributes(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_resolveId_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo(lean_object*, 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_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__41___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_State_syntheticMVars___default;
 static lean_object* l_Lean_Elab_Term_instInhabitedSavedState___closed__1;
@@ -1292,7 +1292,7 @@ static lean_object* l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__17;
 LEAN_EXPORT lean_object* l_ReaderT_pure___at_Lean_Elab_Term_addTermInfo___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_throwErrorIfErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getDelayedMVarAssignment_x3f___at_Lean_Elab_Term_isLetRecAuxMVar___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_addAutoBoundImplicits(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_addAutoBoundImplicits_go___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe___closed__11;
@@ -35221,92 +35221,110 @@ x_15 = l_Lean_Elab_Term_mkTermInfo(x_1, x_2, x_3, x_4, x_5, x_6, x_8, x_9, x_10,
 return x_15;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-uint8_t x_14; 
-x_14 = lean_ctor_get_uint8(x_7, sizeof(void*)*8 + 6);
-if (x_14 == 0)
+lean_object* x_15; uint8_t x_30; 
+x_30 = lean_ctor_get_uint8(x_8, sizeof(void*)*8 + 6);
+if (x_30 == 0)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_15 = lean_box(0);
-x_16 = lean_alloc_closure((void*)(l_ReaderT_pure___at_Lean_Elab_Term_addTermInfo___spec__1___rarg___boxed), 8, 1);
-lean_closure_set(x_16, 0, x_15);
-x_17 = lean_box(x_6);
-lean_inc(x_2);
-x_18 = lean_alloc_closure((void*)(l_Lean_Elab_Term_addTermInfo___lambda__1___boxed), 14, 6);
-lean_closure_set(x_18, 0, x_5);
-lean_closure_set(x_18, 1, x_1);
-lean_closure_set(x_18, 2, x_2);
-lean_closure_set(x_18, 3, x_3);
-lean_closure_set(x_18, 4, x_4);
-lean_closure_set(x_18, 5, x_17);
-x_19 = l_Lean_Elab_withInfoContext_x27___at_Lean_Elab_Term_addTermInfo___spec__2(x_16, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_19) == 0)
-{
-uint8_t x_20; 
-x_20 = !lean_is_exclusive(x_19);
-if (x_20 == 0)
-{
-lean_object* x_21; 
-x_21 = lean_ctor_get(x_19, 0);
-lean_dec(x_21);
-lean_ctor_set(x_19, 0, x_2);
-return x_19;
+lean_object* x_31; 
+x_31 = lean_box(0);
+x_15 = x_31;
+goto block_29;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; 
-x_22 = lean_ctor_get(x_19, 1);
-lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_2);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
-}
-}
-else
+if (x_7 == 0)
 {
-uint8_t x_24; 
-lean_dec(x_2);
-x_24 = !lean_is_exclusive(x_19);
-if (x_24 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_19, 0);
-x_26 = lean_ctor_get(x_19, 1);
-lean_inc(x_26);
-lean_inc(x_25);
-lean_dec(x_19);
-x_27 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_27, 0, x_25);
-lean_ctor_set(x_27, 1, x_26);
-return x_27;
-}
-}
-}
-else
-{
-lean_object* x_28; lean_object* x_29; 
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_28 = l_Lean_mkPatternWithRef(x_2, x_1);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_13);
-return x_29;
+x_32 = l_Lean_mkPatternWithRef(x_2, x_1);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_14);
+return x_33;
+}
+else
+{
+lean_object* x_34; 
+x_34 = lean_box(0);
+x_15 = x_34;
+goto block_29;
+}
+}
+block_29:
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+lean_dec(x_15);
+x_16 = lean_box(0);
+x_17 = lean_alloc_closure((void*)(l_ReaderT_pure___at_Lean_Elab_Term_addTermInfo___spec__1___rarg___boxed), 8, 1);
+lean_closure_set(x_17, 0, x_16);
+x_18 = lean_box(x_6);
+lean_inc(x_2);
+x_19 = lean_alloc_closure((void*)(l_Lean_Elab_Term_addTermInfo___lambda__1___boxed), 14, 6);
+lean_closure_set(x_19, 0, x_5);
+lean_closure_set(x_19, 1, x_1);
+lean_closure_set(x_19, 2, x_2);
+lean_closure_set(x_19, 3, x_3);
+lean_closure_set(x_19, 4, x_4);
+lean_closure_set(x_19, 5, x_18);
+x_20 = l_Lean_Elab_withInfoContext_x27___at_Lean_Elab_Term_addTermInfo___spec__2(x_17, x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+if (lean_obj_tag(x_20) == 0)
+{
+uint8_t x_21; 
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; 
+x_22 = lean_ctor_get(x_20, 0);
+lean_dec(x_22);
+lean_ctor_set(x_20, 0, x_2);
+return x_20;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_ctor_get(x_20, 1);
+lean_inc(x_23);
+lean_dec(x_20);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_2);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
+}
+}
+else
+{
+uint8_t x_25; 
+lean_dec(x_2);
+x_25 = !lean_is_exclusive(x_20);
+if (x_25 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_20, 0);
+x_27 = lean_ctor_get(x_20, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_20);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
+}
+}
 }
 }
 }
@@ -35342,67 +35360,70 @@ lean_dec(x_5);
 return x_16;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-uint8_t x_14; lean_object* x_15; 
-x_14 = lean_unbox(x_6);
+uint8_t x_15; uint8_t x_16; lean_object* x_17; 
+x_15 = lean_unbox(x_6);
 lean_dec(x_6);
-x_15 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_5, x_14, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-return x_15;
+x_16 = lean_unbox(x_7);
+lean_dec(x_7);
+x_17 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_5, x_15, x_16, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+return x_17;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_addTermInfo_x27(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
 _start:
 {
-lean_object* x_14; 
-x_14 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
-if (lean_obj_tag(x_14) == 0)
+uint8_t x_14; lean_object* x_15; 
+x_14 = 0;
+x_15 = l_Lean_Elab_Term_addTermInfo(x_1, x_2, x_3, x_4, x_5, x_6, x_14, x_7, x_8, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(x_15) == 0)
 {
-uint8_t x_15; 
-x_15 = !lean_is_exclusive(x_14);
-if (x_15 == 0)
+uint8_t x_16; 
+x_16 = !lean_is_exclusive(x_15);
+if (x_16 == 0)
 {
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_ctor_get(x_14, 0);
-lean_dec(x_16);
-x_17 = lean_box(0);
-lean_ctor_set(x_14, 0, x_17);
-return x_14;
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_ctor_get(x_15, 0);
+lean_dec(x_17);
+x_18 = lean_box(0);
+lean_ctor_set(x_15, 0, x_18);
+return x_15;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_14, 1);
-lean_inc(x_18);
-lean_dec(x_14);
-x_19 = lean_box(0);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-return x_20;
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_15, 1);
+lean_inc(x_19);
+lean_dec(x_15);
+x_20 = lean_box(0);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+return x_21;
 }
 }
 else
 {
-uint8_t x_21; 
-x_21 = !lean_is_exclusive(x_14);
-if (x_21 == 0)
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_15);
+if (x_22 == 0)
 {
-return x_14;
+return x_15;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_14, 0);
-x_23 = lean_ctor_get(x_14, 1);
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_15, 0);
+x_24 = lean_ctor_get(x_15, 1);
+lean_inc(x_24);
 lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_14);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-return x_24;
+lean_dec(x_15);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
 }
 }
 }
@@ -51712,7 +51733,7 @@ lean_dec(x_3);
 return x_10;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -51720,21 +51741,21 @@ x_1 = lean_mk_string_from_bytes("letrec", 6);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__2;
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2;
 x_3 = 0;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -52092,7 +52113,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_isLetRecAuxMVar(lean_object* x_1, lean
 _start:
 {
 lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
-x_9 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2;
+x_9 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2;
 x_10 = l_Lean_isTracingEnabledFor___at_Lean_Elab_Term_traceAtCmdPos___spec__1(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
@@ -57953,7 +57974,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_24 = l_Lean_Elab_Term_addTermInfo(x_2, x_18, x_21, x_21, x_22, x_23, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_24 = l_Lean_Elab_Term_addTermInfo(x_2, x_18, x_21, x_21, x_22, x_23, x_23, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 if (lean_obj_tag(x_24) == 0)
 {
 lean_object* x_25; lean_object* x_26; lean_object* x_27; 
@@ -63813,7 +63834,7 @@ x_3 = lean_alloc_closure((void*)(l_Lean_Elab_withoutModifyingStateWithInfoAndMes
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -63821,17 +63842,17 @@ x_1 = lean_mk_string_from_bytes("debug", 5);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__2;
-x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1;
+x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
@@ -63852,7 +63873,7 @@ lean_object* x_8; lean_object* x_9; lean_object* x_10;
 x_8 = lean_ctor_get(x_7, 1);
 lean_inc(x_8);
 lean_dec(x_7);
-x_9 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2;
+x_9 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2;
 x_10 = l_Lean_registerTraceClass(x_9, x_3, x_8);
 return x_10;
 }
@@ -64640,11 +64661,11 @@ l_Lean_Elab_Term_mkAuxName___closed__1 = _init_l_Lean_Elab_Term_mkAuxName___clos
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__1);
 l_Lean_Elab_Term_mkAuxName___closed__2 = _init_l_Lean_Elab_Term_mkAuxName___closed__2();
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046____closed__2);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14046_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058____closed__2);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_14058_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_isLetRecAuxMVar___lambda__2___closed__1 = _init_l_Lean_Elab_Term_isLetRecAuxMVar___lambda__2___closed__1();
@@ -64815,11 +64836,11 @@ l_Lean_Elab_Term_exprToSyntax___lambda__1___closed__3 = _init_l_Lean_Elab_Term_e
 lean_mark_persistent(l_Lean_Elab_Term_exprToSyntax___lambda__1___closed__3);
 l_Lean_Elab_Term_exprToSyntax___lambda__1___closed__4 = _init_l_Lean_Elab_Term_exprToSyntax___lambda__1___closed__4();
 lean_mark_persistent(l_Lean_Elab_Term_exprToSyntax___lambda__1___closed__4);
-l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__1);
-l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991____closed__2);
-res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_16991_(lean_io_mk_world());
+l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__1);
+l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003____closed__2);
+res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_17003_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));