diff --git a/stage0/src/Init/NotationExtra.lean b/stage0/src/Init/NotationExtra.lean
index fb8a3498ed..0f92f53238 100644
--- a/stage0/src/Init/NotationExtra.lean
+++ b/stage0/src/Init/NotationExtra.lean
@@ -210,10 +210,6 @@ syntax (name := calcTactic) "calc" ppLine withPosition(calcStep) ppLine withPosi
   | `($_ $array $index) => `($array[$index]?)
   | _ => throw ()
 
-@[appUnexpander getElem'] def unexpandGetElem' : Lean.PrettyPrinter.Unexpander
-  | `($_ $array $index $h) => `($array[$index]'$h)
-  | _ => throw ()
-
 /--
 Apply function extensionality and introduce new hypotheses.
 The tactic `funext` will keep applying new the `funext` lemma until the goal target is not reducible to
diff --git a/stage0/src/Init/Tactics.lean b/stage0/src/Init/Tactics.lean
index 393c534aba..487bda2563 100644
--- a/stage0/src/Init/Tactics.lean
+++ b/stage0/src/Init/Tactics.lean
@@ -161,8 +161,7 @@ syntax caseArg := binderIdent binderIdent*
   with inaccessible names to the given names.
 * `case tag₁ | tag₂ => tac` is equivalent to `(case tag₁ => tac); (case tag₂ => tac)`.
 -/
-syntax (name := case) "case " binderIdent binderIdent* " => " tacticSeq : tactic
--- syntax (name := case) "case " sepBy1(caseArg, " | ") " => " tacticSeq : tactic
+syntax (name := case) "case " sepBy1(caseArg, " | ") " => " tacticSeq : tactic
 
 /--
 `case'` is similar to the `case tag => tac` tactic, but does not ensure the goal
@@ -170,8 +169,7 @@ has been solved after applying `tac`, nor admits the goal if `tac` failed.
 Recall that `case` closes the goal using `sorry` when `tac` fails, and
 the tactic execution is not interrupted.
 -/
-syntax (name := case') "case' " binderIdent binderIdent* " => " tacticSeq : tactic
--- syntax (name := case') "case' " sepBy1(caseArg, " | ") " => " tacticSeq : tactic
+syntax (name := case') "case' " sepBy1(caseArg, " | ") " => " tacticSeq : tactic
 
 /--
 `next => tac` focuses on the next goal and solves it using `tac`, or else fails.
@@ -398,7 +396,7 @@ syntax (name := injection) "injection " term (" with " (colGt (ident <|> hole))+
 (since `injection` can produce new hypotheses). Useful for destructing nested
 constructor equalities like `(a::b::c) = (d::e::f)`. -/
 -- TODO: add with
-syntax (name := injections) "injections" : tactic
+syntax (name := injections) "injections" (colGt (ident <|> hole))* : tactic
 
 /--
 The discharger clause of `simp` and related tactics.
@@ -835,9 +833,5 @@ macro "get_elem_tactic" : tactic =>
 @[inheritDoc getElem]
 macro:max x:term noWs "[" i:term "]" : term => `(getElem $x $i (by get_elem_tactic))
 
-/-- Helper declaration for the unexpander -/
-@[inline] def getElem' [GetElem cont idx elem dom] (xs : cont) (i : idx) (h : dom xs i) : elem :=
-  getElem xs i h
-
 @[inheritDoc getElem]
-macro x:term noWs "[" i:term "]'" h:term:max : term => `(getElem' $x $i $h)
+macro x:term noWs "[" i:term "]'" h:term:max : term => `(getElem $x $i $h)
diff --git a/stage0/src/Lean/Compiler/LCNF/CSE.lean b/stage0/src/Lean/Compiler/LCNF/CSE.lean
index 57f3cac7f9..a9edb30507 100644
--- a/stage0/src/Lean/Compiler/LCNF/CSE.lean
+++ b/stage0/src/Lean/Compiler/LCNF/CSE.lean
@@ -19,9 +19,12 @@ structure State where
 
 abbrev M := StateRefT State CompilerM
 
-instance : MonadFVarSubst M where
+instance : MonadFVarSubst M false where
   getSubst := return (← get).subst
 
+instance : MonadFVarSubstState M where
+  modifySubst f := modify fun s => { s with subst := f s.subst }
+
 @[inline] def getSubst : M FVarSubst :=
   return (← get).subst
 
@@ -34,11 +37,11 @@ instance : MonadFVarSubst M where
 
 def replaceLet (decl : LetDecl) (fvarId : FVarId) : M Unit := do
   eraseLetDecl decl
-  modify fun s => { s with subst := s.subst.insert decl.fvarId (.fvar fvarId) }
+  addFVarSubst decl.fvarId fvarId
 
 def replaceFun (decl : FunDecl) (fvarId : FVarId) : M Unit := do
   eraseFunDecl decl
-  modify fun s => { s with subst := s.subst.insert decl.fvarId (.fvar fvarId) }
+  addFVarSubst decl.fvarId fvarId
 
 partial def _root_.Lean.Compiler.LCNF.Code.cse (code : Code) : CompilerM Code :=
   go code |>.run' {}
diff --git a/stage0/src/Lean/Compiler/LCNF/CompilerM.lean b/stage0/src/Lean/Compiler/LCNF/CompilerM.lean
index 7b345ead46..efe0b35cc2 100644
--- a/stage0/src/Lean/Compiler/LCNF/CompilerM.lean
+++ b/stage0/src/Lean/Compiler/LCNF/CompilerM.lean
@@ -104,16 +104,34 @@ During the internalization process, we ensure all free variables in the LCNF cod
 at the `CompilerM` local context.
 Remark: in LCNF, (computationally relevant) data is in A-normal form, but this is not the case for types and type formers.
 So, when inlining we often want to replace a free variable with a type or type former.
+
+The substitution contains entries `fvarId ↦ e` s.t., `e` is a valid LCNF argument. That is,
+it is a free variable, a type (or type former), or `lcErased`.
+
+`Check.lean` contains a substitution validator.
 -/
 abbrev FVarSubst := Std.HashMap FVarId Expr
 
-private partial def normExprImp (s : FVarSubst) (e : Expr) : Expr :=
+/--
+Replace the free variables in `e` using the given substitution.
+
+If `translator = true`, then we assume the free variables occurring in the range of the substitution are in another
+local context. For example, `translator = true` during internalization where we are making sure all free variables
+in a given expression are replaced with new ones that do not collide with the ones in the current local context.
+
+If `translator = false`, we assume the substitution contains free variable replacements in the same local context,
+and given entries such as `x₁ ↦ x₂`, `x₂ ↦ x₃`, ..., `xₙ₋₁ ↦ xₙ`, and the expression `f x₁ x₂`, we want the resulting
+expression to be `f xₙ xₙ`. We use this setting, for example, in the simplifier.
+-/
+private partial def normExprImp (s : FVarSubst) (e : Expr) (translator : Bool) : Expr :=
   go e
 where
   go (e : Expr) : Expr :=
     if e.hasFVar then
       match e with
-      | .fvar fvarId => s.find? fvarId |>.getD e
+      | .fvar fvarId => match s.find? fvarId with
+        | some e => if translator then e else go e
+        | none => e
       | .lit .. | .const .. | .sort .. | .mvar .. | .bvar .. => e
       | .app f a => e.updateApp! (go f) (go a)
       | .mdata _ b => e.updateMData! (go b)
@@ -124,27 +142,68 @@ where
     else
       e
 
-private partial def normFVarImp (s : FVarSubst) (fvarId : FVarId) : FVarId :=
+/--
+Normalize the given free variable.
+See `normExprImp` for documentation on the `translator` parameter.
+This function is meant to be used in contexts where the input free-variable is computationally relevant.
+This function panics if the substitution is mapping `fvarId` to an expression that is not another free variable.
+That is, it is not a type (or type former), nor `lcErased`. Recall that a valid `FVarSubst` contains only
+expressions that are free variables, `lcErased`, or type formers.
+-/
+private partial def normFVarImp (s : FVarSubst) (fvarId : FVarId) (translator : Bool) : FVarId :=
   match s.find? fvarId with
-  | some (.fvar fvarId') => normFVarImp s fvarId'
-  | some _ => panic! "invalid LCNF substitution of free variable with expression"
+  | some (.fvar fvarId') =>
+    if translator then
+      fvarId'
+    else
+      normFVarImp s fvarId' translator
+  | some e => panic! s!"invalid LCNF substitution of free variable with expression {e}"
   | none => fvarId
 
-class MonadFVarSubst (m : Type → Type) where
+/--
+Interface for monads that have a free substitutions.
+-/
+class MonadFVarSubst (m : Type → Type) (translator : outParam Bool) where
   getSubst : m FVarSubst
 
 export MonadFVarSubst (getSubst)
 
-instance (m n) [MonadLift m n] [MonadFVarSubst m] : MonadFVarSubst n where
+instance (m n) [MonadLift m n] [MonadFVarSubst m t] : MonadFVarSubst n t where
   getSubst := liftM (getSubst : m _)
 
-@[inline] def normFVar [MonadFVarSubst m] [Monad m] (fvarId : FVarId) : m FVarId :=
-  return normFVarImp (← getSubst) fvarId
+class MonadFVarSubstState (m : Type → Type) where
+  modifySubst : (FVarSubst → FVarSubst) → m Unit
 
-@[inline] def normExpr [MonadFVarSubst m] [Monad m] (e : Expr) : m Expr :=
-  return normExprImp (← getSubst) e
+export MonadFVarSubstState (modifySubst)
 
-def normExprs [MonadFVarSubst m] [Monad m] (es : Array Expr) : m (Array Expr) :=
+instance (m n) [MonadLift m n] [MonadFVarSubstState m] : MonadFVarSubstState n where
+  modifySubst f := liftM (modifySubst f : m _)
+
+/--
+Add the entry `fvarId ↦ fvarId'` to the free variable substitution.
+-/
+@[inline] def addFVarSubst [MonadFVarSubstState m] (fvarId : FVarId) (fvarId' : FVarId) : m Unit :=
+  modifySubst fun s => s.insert fvarId (.fvar fvarId')
+
+/--
+Add the substitution `fvarId ↦ e`, `e` must be a valid LCNF argument.
+That is, it must be a free variable, type (or type former), or `lcErased`.
+
+See `Check.lean` for the free variable substitution checker.
+-/
+@[inline] def addSubst [MonadFVarSubstState m] (fvarId : FVarId) (e : Expr) : m Unit :=
+  modifySubst fun s => s.insert fvarId e
+
+@[inline, inheritDoc normFVarImp] def normFVar [MonadFVarSubst m t] [Monad m] (fvarId : FVarId) : m FVarId :=
+  return normFVarImp (← getSubst) fvarId t
+
+@[inline, inheritDoc normExprImp] def normExpr [MonadFVarSubst m t] [Monad m] (e : Expr) : m Expr :=
+  return normExprImp (← getSubst) e t
+
+/--
+Normalize the given expressions using the current substitution.
+-/
+def normExprs [MonadFVarSubst m t] [Monad m] (es : Array Expr) : m (Array Expr) :=
   es.mapMonoM normExpr
 
 def mkFreshBinderName (binderName := `_x): CompilerM Name := do
@@ -164,12 +223,22 @@ namespace Internalize
 
 abbrev InternalizeM := StateRefT FVarSubst CompilerM
 
-instance : MonadFVarSubst InternalizeM where
+/--
+The `InternalizeM` monad is a translator. It "translates" the free variables
+in the input expressions and `Code`, into new fresh free variables in the
+local context.
+-/
+instance : MonadFVarSubst InternalizeM true where
   getSubst := get
 
+instance : MonadFVarSubstState InternalizeM where
+  modifySubst := modify
+
+  -- modifySubst f := modify f
+
 private def mkNewFVarId (fvarId : FVarId) : InternalizeM FVarId := do
   let fvarId' ← Lean.mkFreshFVarId
-  modify fun s => s.insert fvarId (.fvar fvarId')
+  addFVarSubst fvarId fvarId'
   return fvarId'
 
 def internalizeParam (p : Param) : InternalizeM Param := do
@@ -303,26 +372,28 @@ abbrev FunDeclCore.update' (decl : FunDecl) (type : Expr) (value : Code) : Compi
 abbrev FunDeclCore.updateValue (decl : FunDecl) (value : Code) : CompilerM FunDecl :=
   decl.update decl.type decl.params value
 
-@[inline] def normParam [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m] (p : Param) : m Param := do
+@[inline] def normParam [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m t] (p : Param) : m Param := do
   p.update (← normExpr p.type)
 
-def normParams [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m] (ps : Array Param) : m (Array Param) :=
+def normParams [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m t] (ps : Array Param) : m (Array Param) :=
   ps.mapMonoM normParam
 
-def normLetDecl [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m] (decl : LetDecl) : m LetDecl := do
+def normLetDecl [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m t] (decl : LetDecl) : m LetDecl := do
   decl.update (← normExpr decl.type) (← normExpr decl.value)
 
-instance : MonadFVarSubst (ReaderT FVarSubst CompilerM) where
+abbrev NormalizerM (_translator : Bool) := ReaderT FVarSubst CompilerM
+
+instance : MonadFVarSubst (NormalizerM t) t where
   getSubst := read
 
 mutual
-  partial def normFunDeclImp (decl : FunDecl) : ReaderT FVarSubst CompilerM FunDecl := do
+  partial def normFunDeclImp (decl : FunDecl) : NormalizerM t FunDecl  := do
     let type ← normExpr decl.type
     let params ← normParams decl.params
     let value ← normCodeImp decl.value
     decl.update type params value
 
-  partial def normCodeImp (code : Code) : ReaderT FVarSubst CompilerM Code := do
+  partial def normCodeImp (code : Code) : NormalizerM t Code := do
     match code with
     | .let decl k => return code.updateLet! (← normLetDecl decl) (← normCodeImp k)
     | .fun decl k | .jp decl k => return code.updateFun! (← normFunDeclImp decl) (← normCodeImp k)
@@ -339,22 +410,18 @@ mutual
       return code.updateCases! resultType discr alts
 end
 
-@[inline] def normFunDecl [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m] (decl : FunDecl) : m FunDecl := do
-  normFunDeclImp decl (← getSubst)
+@[inline] def normFunDecl [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m t] (decl : FunDecl) : m FunDecl := do
+  normFunDeclImp (t := t) decl (← getSubst)
 
 /-- Similar to `internalize`, but does not refresh `FVarId`s. -/
-@[inline] def normCode [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m] (code : Code) : m Code := do
-  normCodeImp code (← getSubst)
+@[inline] def normCode [MonadLiftT CompilerM m] [Monad m] [MonadFVarSubst m t] (code : Code) : m Code := do
+  normCodeImp (t := t) code (← getSubst)
 
-def replaceExprFVars (e : Expr) (s : FVarSubst) : CompilerM Expr :=
-  (normExpr e : ReaderT FVarSubst CompilerM Expr).run s
+def replaceExprFVars (e : Expr) (s : FVarSubst) (translator : Bool) : CompilerM Expr :=
+  (normExpr e : NormalizerM translator Expr).run s
 
-def replaceFVars (code : Code) (s : FVarSubst) : CompilerM Code :=
-  (normCode code : ReaderT FVarSubst CompilerM Code).run s
-
-def replaceFVar (code : Code) (fvarId fvarId' : FVarId) : CompilerM Code :=
-  let s : FVarSubst := {}
-  replaceFVars code (s.insert fvarId (.fvar fvarId'))
+def replaceFVars (code : Code) (s : FVarSubst) (translator : Bool) : CompilerM Code :=
+  (normCode code : NormalizerM translator Code).run s
 
 def mkFreshJpName : CompilerM Name := do
   mkFreshBinderName `_jp
diff --git a/stage0/src/Lean/Compiler/LCNF/Main.lean b/stage0/src/Lean/Compiler/LCNF/Main.lean
index 02daee075b..2c4b02ef78 100644
--- a/stage0/src/Lean/Compiler/LCNF/Main.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Main.lean
@@ -56,7 +56,13 @@ def checkpoint (stepName : Name) (decls : Array Decl) : CompilerM Unit := do
 
 namespace PassManager
 
-def run (declNames : Array Name) : CompilerM (Array Decl) := do
+def run (declNames : Array Name) : CompilerM (Array Decl) := withAtLeastMaxRecDepth 8192 do
+  /-
+  Note: we need to increase the recursion depth because we currently do to save phase1
+  declarations in .olean files. Then, we have to recursively compile all dependencies,
+  and it often creates a very deep recursion.
+  Moreover, some declarations get very big during simplification.
+  -/
   let declNames ← declNames.filterM (shouldGenerateCode ·)
   if declNames.isEmpty then return #[]
   let mut decls ← declNames.mapM toDecl
diff --git a/stage0/src/Lean/Compiler/LCNF/PrettyPrinter.lean b/stage0/src/Lean/Compiler/LCNF/PrettyPrinter.lean
index a327a77945..cfeb703226 100644
--- a/stage0/src/Lean/Compiler/LCNF/PrettyPrinter.lean
+++ b/stage0/src/Lean/Compiler/LCNF/PrettyPrinter.lean
@@ -42,7 +42,10 @@ def ppArg (e : Expr) : M Format := do
   if e.isFVar then
     ppFVar e.fvarId!
   else if pp.explicit.get (← getOptions) then
-    ppExpr e
+    if e.isConst || e.isProp || e.isType0 then
+      ppExpr e
+    else
+      return Format.paren (←  ppExpr e)
   else
     return "_"
 
@@ -112,4 +115,15 @@ def ppFunDecl (decl : FunDecl) : CompilerM Format :=
   PP.run do
     return f!"fun {decl.binderName}{← PP.ppParams decl.params} :={indentD (← PP.ppCode decl.value)}"
 
+/--
+Similar to `ppDecl`, but in `CoreM`, and it does not assume
+`decl` has already been internalized.
+-/
+def ppDecl' (decl : Decl) : CoreM Format := do
+  go |>.run {}
+where
+  go : CompilerM Format := do
+    let decl ← decl.internalize
+    ppDecl decl
+
 end Lean.Compiler.LCNF
diff --git a/stage0/src/Lean/Compiler/LCNF/Simp.lean b/stage0/src/Lean/Compiler/LCNF/Simp.lean
index 6adf31691e..28229f094a 100644
--- a/stage0/src/Lean/Compiler/LCNF/Simp.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Simp.lean
@@ -199,9 +199,12 @@ structure State where
 
 abbrev SimpM := ReaderT Context $ StateRefT State CompilerM
 
-instance : MonadFVarSubst SimpM where
+instance : MonadFVarSubst SimpM false where
   getSubst := return (← get).subst
 
+instance : MonadFVarSubstState SimpM where
+  modifySubst f := modify fun s => { s with subst := f s.subst }
+
 /--
 Use `findExpr`, and if the result is a free variable, check whether it is in the map `discrCtorMap`.
 We use this method when simplifying projections and cases-constructor.
@@ -323,12 +326,14 @@ Result of `inlineCandidate?`.
 It contains information for inlining local and global functions.
 -/
 structure InlineCandidateInfo where
-  isLocal : Bool
-  params  : Array Param
+  isLocal  : Bool
+  params   : Array Param
   /-- Value (lambda expression) of the function to be inlined. -/
-  value   : Code
-  f       : Expr
-  args    : Array Expr
+  value    : Code
+  f        : Expr
+  args     : Array Expr
+  /-- `ifReduce = true` if the declaration being inlined was tagged with `inlineIfReduce`. -/
+  ifReduce : Bool
 
 /-- The arity (aka number of parameters) of the function to be inlined. -/
 def InlineCandidateInfo.arity : InlineCandidateInfo → Nat
@@ -380,15 +385,16 @@ def inlineCandidate? (e : Expr) : SimpM (Option InlineCandidateInfo) := do
     if inlineIfReduce then
       let some paramIdx := isCasesOnParam? decl | return none
       unless paramIdx < numArgs do return none
-      let arg ← findCtor (e.getArg! paramIdx)
+      let arg ← findExpr (e.getArg! paramIdx)
       unless arg.isConstructorApp (← getEnv) do return none
     let params := decl.instantiateParamsLevelParams us
     let value := decl.instantiateValueLevelParams us
     incInline
     return some {
-      isLocal := false
-      f       := e.getAppFn
-      args    := e.getAppArgs
+      isLocal  := false
+      f        := e.getAppFn
+      args     := e.getAppArgs
+      ifReduce := inlineIfReduce
       params, value
     }
   else if let some decl ← findFunDecl? f then
@@ -398,22 +404,16 @@ def inlineCandidate? (e : Expr) : SimpM (Option InlineCandidateInfo) := do
     incInlineLocal
     modify fun s => { s with inlineLocal := s.inlineLocal + 1 }
     return some {
-      isLocal := true
-      f       := e.getAppFn
-      args    := e.getAppArgs
-      params  := decl.params
-      value   := decl.value
+      isLocal  := true
+      f        := e.getAppFn
+      args     := e.getAppArgs
+      params   := decl.params
+      value    := decl.value
+      ifReduce := false
     }
   else
     return none
 
-/--
-Add substitution `fvarId ↦ val`. `val` is a free variable, or
-it is a type, type former, or `lcErased`.
--/
-def addSubst (fvarId : FVarId) (val : Expr) : SimpM Unit :=
-  modify fun s => { s with subst := s.subst.insert fvarId val }
-
 /--
 Return `true` if `c` has only one exit point.
 This is a quick approximation. It does not check cases
@@ -428,7 +428,7 @@ where
     match c with
     | .let _ k | .fun _ k => go k
     -- Approximation, the cases may have many unreachable alternatives, and only reachable.
-    | .cases c => c.alts.size == 1 && c.alts.any fun alt => go alt.getCode
+    | .cases c => c.alts.size == 1 && go c.alts[0]!.getCode
     -- Approximation, we assume that any code containing join points have more than one exit point
     | .jp .. | .jmp .. => false
     | .return .. | .unreach .. => true
@@ -457,7 +457,7 @@ def specializePartialApp (info : InlineCandidateInfo) : SimpM FunDecl := do
     subst := subst.insert param.fvarId arg
   let mut paramsNew := #[]
   for param in info.params[info.args.size:] do
-    let type ← replaceExprFVars param.type subst
+    let type ← replaceExprFVars param.type subst (translator := true)
     let paramNew ← mkAuxParam type
     paramsNew := paramsNew.push paramNew
     subst := subst.insert param.fvarId (.fvar paramNew.fvarId)
@@ -465,56 +465,6 @@ def specializePartialApp (info : InlineCandidateInfo) : SimpM FunDecl := do
   updateFunDeclInfo code
   mkAuxFunDecl paramsNew code
 
-/--
-If the value of the given let-declaration is an application that can be inlined, inline it.
-
-`k` is the "continuation" for the let declaration.
--/
-partial def inlineApp? (letDecl : LetDecl) (k : Code) : SimpM (Option Code) := do
-  if k matches .unreach .. then return some k
-  let some info ← inlineCandidate? letDecl.value | return none
-  markSimplified
-  let numArgs := info.args.size
-  trace[Compiler.simp.inline] "inlining {letDecl.value}"
-  let fvarId := letDecl.fvarId
-  if numArgs < info.arity then
-    let funDecl ← specializePartialApp info
-    addSubst letDecl.fvarId (.fvar funDecl.fvarId)
-    return some (.fun funDecl k)
-  else
-    let code ← betaReduce info.params info.value info.args[:info.arity]
-    if k.isReturnOf fvarId && numArgs == info.arity then
-      /- Easy case, the continuation `k` is just returning the result of the application. -/
-      return code
-    else if oneExitPointQuick code then
-      /-
-      `code` has only one exit point, thus we can attach the continuation directly there,
-      and simplify the result.
-      -/
-      code.bind fun fvarId' => do
-        /- fvarId' is the result of the computation -/
-        if numArgs > info.arity then
-          let decl ← mkAuxLetDecl (mkAppN (.fvar fvarId') info.args[info.arity:])
-          let k ← replaceFVar k fvarId decl.fvarId
-          return .let decl k
-        else
-          replaceFVar k fvarId fvarId'
-    else
-      /-
-      `code` has multiple exit points, and the continuation is non-trivial
-      Thus, we create an auxiliary join point.
-      -/
-      let jpParam ← mkAuxParam (← inferType (mkAppN info.f info.args[:info.arity]))
-      let jpValue ← if numArgs > info.arity then
-        let decl ← mkAuxLetDecl (mkAppN (.fvar jpParam.fvarId) info.args[info.arity:])
-        let k ← replaceFVar k fvarId decl.fvarId
-        pure <| .let decl k
-      else
-        replaceFVar k fvarId jpParam.fvarId
-      let jpDecl ← mkAuxJpDecl #[jpParam] jpValue
-      let code ← code.bind fun fvarId => return .jmp jpDecl.fvarId #[.fvar fvarId]
-      return Code.jp jpDecl code
-
 /--
 Try to inline a join point.
 -/
@@ -865,11 +815,83 @@ def etaPolyApp? (letDecl : LetDecl) : OptionT SimpM FunDecl := do
   let value := mkAppN letDecl.value (params.map (.fvar ·.fvarId))
   let auxDecl ← mkAuxLetDecl value
   let funDecl ← mkAuxFunDecl params (.let auxDecl (.return auxDecl.fvarId))
-  addSubst letDecl.fvarId (.fvar funDecl.fvarId)
+  addFVarSubst letDecl.fvarId funDecl.fvarId
   eraseLetDecl letDecl
   return funDecl
 
+/--
+Similar to `Code.isReturnOf`, but taking the current substitution into account.
+-/
+def isReturnOf (c : Code) (fvarId : FVarId) : SimpM Bool := do
+  match c with
+  | .return fvarId' => return (← normFVar fvarId') == fvarId
+  | _ => return false
+
 mutual
+/--
+If the value of the given let-declaration is an application that can be inlined,
+inline it and simplify the result.
+
+`k` is the "continuation" for the let declaration, if the application is inlined,
+it will also be simplified.
+
+Note: `inlineApp?` did not use to be in this mutually recursive declaration.
+It used to be invoked by `simp`, and would return `Option Code` that would be
+then simplified by `simp`. However, this simpler architecture produced an
+exponential blowup in when processing functions such as `Lean.Elab.Deriving.Ord.mkMatch.mkAlts`.
+The key problem is that when inlining a declaration we often can reduce the number
+of exit points by simplified the inlined code, and then connecting the result to the
+continuation `k`. However, this optimization is only possible if we simplify the
+inlined code **before** we attach it to the continuation.
+-/
+partial def inlineApp? (letDecl : LetDecl) (k : Code) : SimpM (Option Code) := do
+  let some info ← inlineCandidate? letDecl.value | return none
+  let numArgs := info.args.size
+  trace[Compiler.simp.inline] "inlining {letDecl.value}"
+  let fvarId := letDecl.fvarId
+  if numArgs < info.arity then
+    let funDecl ← specializePartialApp info
+    addFVarSubst fvarId funDecl.fvarId
+    markSimplified
+    simp (.fun funDecl k)
+  else
+    let code ← betaReduce info.params info.value info.args[:info.arity]
+    if k.isReturnOf fvarId && numArgs == info.arity then
+      /- Easy case, the continuation `k` is just returning the result of the application. -/
+      markSimplified
+      simp code
+    else
+      let code ← simp code
+      if oneExitPointQuick code then
+        -- TODO: if `k` is small, we should also inline it here
+        markSimplified
+        code.bind fun fvarId' => do
+          markUsedFVar fvarId'
+          /- fvarId' is the result of the computation -/
+          if numArgs > info.arity then
+            let decl ← mkAuxLetDecl (mkAppN (.fvar fvarId') info.args[info.arity:])
+            addFVarSubst fvarId decl.fvarId
+            simp (.let decl k)
+          else
+            addFVarSubst fvarId fvarId'
+            simp k
+      -- else if info.ifReduce then
+      --  eraseCode code
+      --  return none
+      else
+        markSimplified
+        let jpParam ← mkAuxParam (← inferType (mkAppN info.f info.args[:info.arity]))
+        let jpValue ← if numArgs > info.arity then
+          let decl ← mkAuxLetDecl (mkAppN (.fvar jpParam.fvarId) info.args[info.arity:])
+          addFVarSubst fvarId decl.fvarId
+          simp (.let decl k)
+        else
+          addFVarSubst fvarId jpParam.fvarId
+          simp k
+        let jpDecl ← mkAuxJpDecl #[jpParam] jpValue
+        let code ← code.bind fun fvarId => return .jmp jpDecl.fvarId #[.fvar fvarId]
+        return Code.jp jpDecl code
+
 /--
 Simplify the given local function declaration.
 -/
@@ -901,11 +923,11 @@ partial def simpCasesOnCtor? (cases : Cases) : SimpM (Option Code) := do
       To make the code robust, we add auxiliary declarations whenever the `field` is not a free variable.
       -/
       if field.isFVar then
-        addSubst param.fvarId field
+        addFVarSubst param.fvarId field.fvarId!
       else
         let auxDecl ← mkAuxLetDecl field
         auxDecls := auxDecls.push (CodeDecl.let auxDecl)
-        addSubst param.fvarId (.fvar auxDecl.fvarId)
+        addFVarSubst param.fvarId auxDecl.fvarId
     let k ← simp k
     eraseParams params
     attachCodeDecls auxDecls k
@@ -924,14 +946,14 @@ partial def simp (code : Code) : SimpM Code := withIncRecDepth do
       simp (.fun funDecl k)
     else if decl.value.isFVar then
       /- Eliminate `let _x_i := _x_j;` -/
-      addSubst decl.fvarId decl.value
+      addFVarSubst decl.fvarId decl.value.fvarId!
       eraseLetDecl decl
       simp k
     else if let some code ← inlineApp? decl k then
       eraseLetDecl decl
-      simp code
+      return code
     else if let some (decls, fvarId) ← inlineProjInst? decl.value then
-      addSubst decl.fvarId (.fvar fvarId)
+      addFVarSubst decl.fvarId fvarId
       eraseLetDecl decl
       let k ← simp k
       attachCodeDecls decls k
@@ -956,7 +978,7 @@ partial def simp (code : Code) : SimpM Code := withIncRecDepth do
     else
       /-
       Note that functions in `decl` will be marked as used even if `decl` is not actually used.
-      They will only be deleted in the next pass.
+      They will only be deleted in the next pass. TODO: investigate whether this is a problem.
       -/
       if code.isFun then
         if decl.isEtaExpandCandidate then
diff --git a/stage0/src/Lean/Compiler/LCNF/ToLCNF.lean b/stage0/src/Lean/Compiler/LCNF/ToLCNF.lean
index a7e1414ec6..7fafaf72cf 100644
--- a/stage0/src/Lean/Compiler/LCNF/ToLCNF.lean
+++ b/stage0/src/Lean/Compiler/LCNF/ToLCNF.lean
@@ -113,7 +113,7 @@ where
                 let mut jpArgs := #[]
                 /- Remark: `funDecl.params.size` may be greater than `args.size`. -/
                 for param in funDecl.params[:args.size] do
-                  let type ← replaceExprFVars param.type subst
+                  let type ← replaceExprFVars param.type subst (translator := true)
                   let paramNew ← mkAuxParam type
                   jpParams := jpParams.push paramNew
                   let arg := .fvar paramNew.fvarId
diff --git a/stage0/src/Lean/Compiler/LCNF/Types.lean b/stage0/src/Lean/Compiler/LCNF/Types.lean
index ae609c0ca8..bbffc8db15 100644
--- a/stage0/src/Lean/Compiler/LCNF/Types.lean
+++ b/stage0/src/Lean/Compiler/LCNF/Types.lean
@@ -268,8 +268,8 @@ Return `true` if `type` is a LCNF type former type.
 Remark: This is faster than `Lean.Meta.isTypeFormer`, as this
         assumes that the input `type` is an LCNF type.
 -/
-def isTypeFormerType (type : Expr) : Bool :=
-  match type with
+partial def isTypeFormerType (type : Expr) : Bool :=
+  match type.headBeta with
   | .sort .. => true
   | .forallE _ _ b _ => isTypeFormerType b
   | _ => false
diff --git a/stage0/src/Lean/Elab/Tactic/BuiltinTactic.lean b/stage0/src/Lean/Elab/Tactic/BuiltinTactic.lean
index c53a4aa12e..9cba9ec603 100644
--- a/stage0/src/Lean/Elab/Tactic/BuiltinTactic.lean
+++ b/stage0/src/Lean/Elab/Tactic/BuiltinTactic.lean
@@ -351,46 +351,33 @@ private def getCaseGoals (tag : TSyntax ``binderIdent) : TacticM (MVarId × List
   return (g, gs.erase g)
 
 @[builtinTactic «case»] def evalCase : Tactic
-  -- | stx@`(tactic| case $args|* =>%$arr $tac:tacticSeq) =>
-  | stx =>
-    let (args, arr, tac) := if stx[1].isOfKind ``binderIdent then
-      (#[mkNode ``caseArg #[stx[1], stx[2]]], stx[3], stx[4])
-    else
-      (stx[1].getArgs.map (⟨·⟩), stx[2], stx[3])
-    for arg in args do
-      match arg with
-      | `(caseArg| $tag $hs*) =>
-        let (g, gs) ← getCaseGoals tag
-        let g ← renameInaccessibles g hs
-        setGoals [g]
-        g.setTag Name.anonymous
-        withCaseRef arr tac do
-          closeUsingOrAdmit (withTacticInfoContext stx (evalTactic tac))
-        setGoals gs
-      | _ => throwUnsupportedSyntax
-  -- | _ => throwUnsupportedSyntax
+  | stx@`(tactic| case $[$tag $hs*]|* =>%$arr $tac:tacticSeq) =>
+    for tag in tag, hs in hs do
+      let (g, gs) ← getCaseGoals tag
+      let g ← renameInaccessibles g hs
+      setGoals [g]
+      g.setTag Name.anonymous
+      withCaseRef arr tac do
+        closeUsingOrAdmit (withTacticInfoContext stx (evalTactic tac))
+      setGoals gs
+  | _ => throwUnsupportedSyntax
 
 @[builtinTactic «case'»] def evalCase' : Tactic
-  -- | `(tactic| case' $args|* =>%$arr $tac:tacticSeq) =>
-  | stx =>
-    let (args, arr, tac) := if stx[1].isOfKind ``binderIdent then
-      (#[mkNode ``caseArg #[stx[1], stx[2]]], stx[3], stx[4])
-    else
-      (stx[1].getArgs.map (⟨·⟩), stx[2], stx[3])
-    for arg in args do
-      match arg with
-      | `(caseArg| $tag $hs*) =>
-        let (g, gs) ← getCaseGoals tag
-        let g ← renameInaccessibles g hs
-        let mvarTag ← g.getTag
-        setGoals [g]
-        withCaseRef arr tac (evalTactic tac)
-        let gs' ← getUnsolvedGoals
-        if let [g'] := gs' then
-          g'.setTag mvarTag
-        setGoals (gs' ++ gs)
-      | _ => throwUnsupportedSyntax
-  -- | _ => throwUnsupportedSyntax
+  | `(tactic| case' $[$tag $hs*]|* =>%$arr $tac:tacticSeq) => do
+    let mut acc := #[]
+    for tag in tag, hs in hs do
+      let (g, gs) ← getCaseGoals tag
+      let g ← renameInaccessibles g hs
+      let mvarTag ← g.getTag
+      setGoals [g]
+      withCaseRef arr tac (evalTactic tac)
+      let gs' ← getUnsolvedGoals
+      if let [g'] := gs' then
+        g'.setTag mvarTag
+      acc := acc ++ gs'
+      setGoals gs
+    setGoals (acc.toList ++ (← getGoals))
+  | _ => throwUnsupportedSyntax
 
 @[builtinTactic «renameI»] def evalRenameInaccessibles : Tactic
   | `(tactic| rename_i $hs*) => do replaceMainGoal [← renameInaccessibles (← getMainGoal) hs]
diff --git a/stage0/src/Lean/Elab/Tactic/Injection.lean b/stage0/src/Lean/Elab/Tactic/Injection.lean
index 3eb666ad08..e27ac15364 100644
--- a/stage0/src/Lean/Elab/Tactic/Injection.lean
+++ b/stage0/src/Lean/Elab/Tactic/Injection.lean
@@ -14,9 +14,9 @@ private def getInjectionNewIds (stx : Syntax) : List Name :=
   else
     stx[1].getArgs.toList.map getNameOfIdent'
 
-private def checkUnusedIds (mvarId : MVarId) (unusedIds : List Name) : MetaM Unit :=
+private def checkUnusedIds (tacticName : Name) (mvarId : MVarId) (unusedIds : List Name) : MetaM Unit :=
   unless unusedIds.isEmpty do
-    Meta.throwTacticEx `injection mvarId m!"too many identifiers provided, unused: {unusedIds}"
+    Meta.throwTacticEx tacticName mvarId m!"too many identifiers provided, unused: {unusedIds}"
 
 @[builtinTactic «injection»] def evalInjection : Tactic := fun stx => do
   -- leading_parser nonReservedSymbol "injection " >> termParser >> withIds
@@ -24,13 +24,14 @@ private def checkUnusedIds (mvarId : MVarId) (unusedIds : List Name) : MetaM Uni
   let ids := getInjectionNewIds stx[2]
   liftMetaTactic fun mvarId => do
     match (← Meta.injection mvarId fvarId ids) with
-    | Meta.InjectionResult.solved                      => checkUnusedIds mvarId ids; return []
-    | Meta.InjectionResult.subgoal mvarId' _ unusedIds => checkUnusedIds mvarId unusedIds; return [mvarId']
+    | .solved                      => checkUnusedIds `injection mvarId ids; return []
+    | .subgoal mvarId' _ unusedIds => checkUnusedIds `injection mvarId unusedIds; return [mvarId']
 
-@[builtinTactic «injections»] def evalInjections : Tactic := fun _ => do
+@[builtinTactic «injections»] def evalInjections : Tactic := fun stx => do
+  let ids := stx[1].getArgs.toList.map getNameOfIdent'
   liftMetaTactic fun mvarId => do
-    match (← Meta.injections mvarId) with
-    | none => return []
-    | some mvarId => return [mvarId]
+    match (← Meta.injections mvarId ids) with
+    | .solved                    => checkUnusedIds `injections mvarId ids; return []
+    | .subgoal mvarId' unusedIds => checkUnusedIds `injections mvarId unusedIds; return [mvarId']
 
 end Lean.Elab.Tactic
diff --git a/stage0/src/Lean/Environment.lean b/stage0/src/Lean/Environment.lean
index 373047db50..d3441abcbb 100644
--- a/stage0/src/Lean/Environment.lean
+++ b/stage0/src/Lean/Environment.lean
@@ -52,9 +52,15 @@ instance : Nonempty EnvExtensionEntry := EnvExtensionEntrySpec.property
 /-- Content of a .olean file.
    We use `compact.cpp` to generate the image of this object in disk. -/
 structure ModuleData where
-  imports    : Array Import
-  constants  : Array ConstantInfo
-  entries    : Array (Name × Array EnvExtensionEntry)
+  imports         : Array Import
+  constants       : Array ConstantInfo
+  /--
+  Extra entries for the `const2ModIdx` map in the `Environment` object.
+  The code generator creates auxiliary declarations that are not in the
+  mapping `constants`, but we want to know in which module they were generated.
+  -/
+  extraConstNames : Array Name
+  entries         : Array (Name × Array EnvExtensionEntry)
   deriving Inhabited
 
 /-- Environment fields that are not used often. -/
@@ -116,6 +122,12 @@ structure Environment where
   Environment extensions. It also includes user-defined extensions.
   -/
   extensions   : Array EnvExtensionState
+  /--
+  Constant names to be saved in the field `extraConstNames` at `ModuleData`.
+  It contains auxiliary declaration names created by the code generator which are not in `constants`.
+  When importing modules, we want to insert them at `const2ModIdx`.
+  -/
+  extraConstNames : NameSet
   /-- The header contains additional information that is not updated often. -/
   header       : EnvironmentHeader := {}
   deriving Inhabited
@@ -125,6 +137,17 @@ namespace Environment
 def addAux (env : Environment) (cinfo : ConstantInfo) : Environment :=
   { env with constants := env.constants.insert cinfo.name cinfo }
 
+/--
+Save an extra constant name that is used to populate `const2ModIdx` when we import
+.olean files. We use this feature to save in which module an auxiliary declaration
+created by the code generator has been created.
+-/
+def addExtraName (env : Environment) (name : Name) : Environment :=
+  if env.constants.contains name then
+    env
+  else
+    { env with extraConstNames := env.extraConstNames.insert name }
+
 @[export lean_environment_find]
 def find? (env : Environment) (n : Name) : Option ConstantInfo :=
   /- It is safe to use `find'` because we never overwrite imported declarations. -/
@@ -197,12 +220,12 @@ end Environment
 
 /-- Interface for managing environment extensions. -/
 structure EnvExtensionInterface where
-  ext              : Type → Type
-  inhabitedExt {σ} : Inhabited σ → Inhabited (ext σ)
-  registerExt  {σ} (mkInitial : IO σ) : IO (ext σ)
-  setState     {σ} (e : ext σ) (env : Environment) : σ → Environment
-  modifyState  {σ} (e : ext σ) (env : Environment) : (σ → σ) → Environment
-  getState     {σ} [Inhabited σ] (e : ext σ) (env : Environment) : σ
+  ext          : Type → Type
+  inhabitedExt : Inhabited σ → Inhabited (ext σ)
+  registerExt  (mkInitial : IO σ) : IO (ext σ)
+  setState     (e : ext σ) (env : Environment) : σ → Environment
+  modifyState  (e : ext σ) (env : Environment) : (σ → σ) → Environment
+  getState     [Inhabited σ] (e : ext σ) (env : Environment) : σ
   mkInitialExtStates : IO (Array EnvExtensionState)
   ensureExtensionsSize : Environment → IO Environment
 
@@ -332,10 +355,11 @@ def mkEmptyEnvironment (trustLevel : UInt32 := 0) : IO Environment := do
   if initializing then throw (IO.userError "environment objects cannot be created during initialization")
   let exts ← mkInitialExtensionStates
   pure {
-    const2ModIdx := {},
-    constants    := {},
-    header       := { trustLevel := trustLevel },
-    extensions   := exts
+    const2ModIdx    := {}
+    constants       := {}
+    header          := { trustLevel := trustLevel }
+    extraConstNames := {}
+    extensions      := exts
   }
 
 structure PersistentEnvExtensionState (α : Type) (σ : Type) where
@@ -587,9 +611,10 @@ def mkModuleData (env : Environment) : IO ModuleData := do
       result.push (extName, exportEntriesFn state))
     #[]
   pure {
-    imports    := env.header.imports,
-    constants  := env.constants.foldStage2 (fun cs _ c => cs.push c) #[],
-    entries    := entries
+    imports         := env.header.imports
+    constants       := env.constants.foldStage2 (fun cs _ c => cs.push c) #[]
+    extraConstNames := env.extraConstNames.toArray
+    entries         := entries
   }
 
 @[export lean_write_module]
@@ -676,18 +701,21 @@ partial def importModules (imports : List Import) (opts : Options) (trustLevel :
         | (constantMap', replaced) =>
           constantMap := constantMap'
           if replaced then throw (IO.userError s!"import failed, environment already contains '{cinfo.name}'")
-       modIdx := modIdx + 1
+      for cname in mod.extraConstNames do
+        const2ModIdx := const2ModIdx.insert cname modIdx
+      modIdx := modIdx + 1
     let constants : ConstMap := SMap.fromHashMap constantMap false
     let exts ← mkInitialExtensionStates
     let env : Environment := {
-      const2ModIdx := const2ModIdx,
-      constants    := constants,
-      extensions   := exts,
-      header       := {
-        quotInit     := !imports.isEmpty, -- We assume `core.lean` initializes quotient module
-        trustLevel   := trustLevel,
-        imports      := imports.toArray,
-        regions      := s.regions,
+      const2ModIdx    := const2ModIdx
+      constants       := constants
+      extraConstNames := {}
+      extensions      := exts
+      header          := {
+        quotInit     := !imports.isEmpty -- We assume `core.lean` initializes quotient module
+        trustLevel   := trustLevel
+        imports      := imports.toArray
+        regions      := s.regions
         moduleNames  := s.moduleNames
         moduleData   := s.moduleData
       }
@@ -727,8 +755,8 @@ Environment extension for tracking all `namespace` declared by users.
 -/
 builtin_initialize namespacesExt : SimplePersistentEnvExtension Name NameSSet ←
   registerSimplePersistentEnvExtension {
-    name            := `namespaces,
-    addImportedFn   := fun as => mkStateFromImportedEntries NameSSet.insert NameSSet.empty as |>.switch,
+    name            := `namespaces
+    addImportedFn   := fun as => mkStateFromImportedEntries NameSSet.insert NameSSet.empty as |>.switch
     addEntryFn      := fun s n => s.insert n
   }
 
diff --git a/stage0/src/Lean/Expr.lean b/stage0/src/Lean/Expr.lean
index 9982dbaeba..61ba73ba62 100644
--- a/stage0/src/Lean/Expr.lean
+++ b/stage0/src/Lean/Expr.lean
@@ -291,36 +291,53 @@ instance : Inhabited (MVarIdMap α) where
   default := {}
 
 /--
-Lean expressions. This datastructure is used in the kernel and
+Lean expressions. This data structure is used in the kernel and
 elaborator. However, expressions sent to the kernel should not
 contain metavariables.
 
 Remark: we use the `E` suffix (short for `Expr`) to avoid collision with keywords.
-We considered using «...», but it is too inconvenient to use. -/
+We considered using «...», but it is too inconvenient to use.
+-/
 inductive Expr where
   /--
-  Bound variables. The natural number is the "de Bruijn" index
-  for the bound variable. See https://en.wikipedia.org/wiki/De_Bruijn_index for additional information.
-  Example, the expression `fun x : Nat => forall y : Nat, x = y`
+  The `bvar` constructor represents bound variables, i.e. occurrences
+  of a variable in the expression where there is a variable binder
+  above it (i.e. introduced by a `lam`, `forallE`, or `letE`).
+
+  The `deBruijnIndex` parameter is the *de-Bruijn* index for the bound
+  variable. See [here](https://en.wikipedia.org/wiki/De_Bruijn_index)
+  for additional information on de-Bruijn indexes.
+
+  For example, consider the expression `fun x : Nat => forall y : Nat, x = y`.
+  The `x` and `y` variables in the equality expression are constructed
+  using `bvar` and bound to the binders introduced by the earlier
+  `lam` and `forallE` constructors. Here is the corresponding `Expr` representation
+  for the same expression:
   ```lean
   .lam `x (.const `Nat [])
-    (.forall `y (.const `Nat [])
-      (.app (.app (.app (.const `Eq [.succ .zero])
-                  (.const `Nat [])) (.bvar 1))
-            (.bvar 0))
+    (.forallE `y (.const `Nat [])
+      (.app (.app (.app (.const `Eq [.succ .zero]) (.const `Nat [])) (.bvar 1)) (.bvar 0))
       .default)
     .default
   ```
   -/
   | bvar (deBruijnIndex : Nat)
+
   /--
-  Free variable. Lean uses the locally nameless approach.
-  See https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.365.2479&rep=rep1&type=pdf for additional details.
-  When "visiting" the body of a binding expression (`lam`, `forallE`, or `letE`), bound variables
-  are converted into free variables using a unique identifier, and their user-facing name, type,
-  value (for `LetE`), and binder annotation are stored in the `LocalContext`.
+  The `fvar` constructor represent free variables. These /free/ variable
+  occurrences are not bound by an earlier `lam`, `forallE`, or `letE`
+  contructor and its binder exists in a local context only.
+
+  Note that Lean uses the /locally nameless approach/. See [here](https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.365.2479&rep=rep1&type=pdf)
+  for additional details.
+
+  When "visiting" the body of a binding expression (i.e. `lam`, `forallE`, or `letE`),
+  bound variables are converted into free variables using a unique identifier,
+  and their user-facing name, type, value (for `LetE`), and binder annotation
+  are stored in the `LocalContext`.
   -/
   | fvar (fvarId : FVarId)
+
   /--
   Metavariables are used to represent "holes" in expressions, and goals in the
   tactic framework. Metavariable declarations are stored in the `MetavarContext`.
@@ -328,89 +345,110 @@ inductive Expr where
   or in the code generator.
   -/
   | mvar (mvarId : MVarId)
+
   /--
-  `Type u`, `Sort u`, `Prop`.    -
+  Used for `Type u`, `Sort u`, and `Prop`:
   - `Prop` is represented as `.sort .zero`,
   - `Sort u` as ``.sort (.param `u)``, and
   - `Type u` as ``.sort (.succ (.param `u))``
   -/
   | sort (u : Level)
+
   /--
-  A (universe polymorphic) constant. For example,
-  `@Eq.{1}` is represented as ``.const `Eq [.succ .zero]``, and
-  `@Array.map.{0, 0}` is represented as ``.const `Array.map [.zero, .zero]``.
+  A (universe polymorphic) constant that has been defined earlier in the module or
+  by another imported module. For example, `@Eq.{1}` is represented
+  as ``Expr.const `Eq [.succ .zero]``, and `@Array.map.{0, 0}` is represented
+  as ``Expr.const `Array.map [.zero, .zero]``.
   -/
   | const (declName : Name) (us : List Level)
+
   /--
-  Function application. `Nat.succ Nat.zero` is represented as
-  ```
-  .app (.const `Nat.succ []) (.const .zero [])
-  ```
+  A function application.
+
+  For example, the natural number one, i.e. `Nat.succ Nat.zero` is represented as
+  `Expr.app (.const `Nat.succ []) (.const .zero [])`
+  Note that multiple arguments are represented using partial application.
+
+  For example, the two argument application `f x y` is represented as
+  `Expr.app (.app f x) y`.
   -/
   | app (fn : Expr) (arg : Expr)
+
   /--
-  Lambda abstraction (aka anonymous functions).
-  - `fun x : Nat => x` is represented as
+  A lambda abstraction (aka anonymous functions). It introduces a new binder for
+  variable `x` in scope for the lambda body.
+
+  For example, the expression `fun x : Nat => x` is represented as
   ```
-  .lam `x (.const `Nat []) (.bvar 0) .default
+  Expr.lam `x (.const `Nat []) (.bvar 0) .default
   ```
   -/
   | lam (binderName : Name) (binderType : Expr) (body : Expr) (binderInfo : BinderInfo)
+
   /--
-  A dependent arrow (aka forall-expression). It is also used to represent non-dependent arrows.
-  Examples:
-  - `forall x : Prop, x ∧ x` is represented as
+  A dependent arrow `(a : α) → β)` (aka forall-expression) where `β` may dependent
+  on `a`. Note that this constructor is also used to represent non-dependent arrows
+  where `β` does not depend on `a`.
+
+  For example:
+  - `forall x : Prop, x ∧ x`:
+  ```lean
+  Expr.forallE `x (.sort .zero)
+    (.app (.app (.const `And []) (.bvar 0)) (.bvar 0)) .default
   ```
-  .forallE `x
-     (.sort .zero)
-     (.app (.app (.const `And []) (.bvar 0)) (.bvar 0))
-     .default
-  ```
-  - `Nat → Bool` as
-  ```
-  .forallE `a (.const `Nat []) (.const `Bool []) .default
+  - `Nat → Bool`:
+  ```lean
+  Expr.forallE `a (.const `Nat [])
+    (.const `Bool []) .default
   ```
   -/
   | forallE (binderName : Name) (binderType : Expr) (body : Expr) (binderInfo : BinderInfo)
-  /--
-  Let-expressions. The field `nonDep` is not currently used, but will be used in the future
-  by the code generator (and possibly `simp`) to track whether a let-expression is non-dependent
-  or not.
 
-  **IMPORTANT**: This flag is for "local" use only. That is, a module should not "trust" its value for any purpose.
+  /--
+  Let-expressions.
+
+  **IMPORTANT**: The `nonDep` flag is for "local" use only. That is, a module should not "trust" its value for any purpose.
   In the intended use-case, the compiler will set this flag, and be responsible for maintaining it.
   Other modules may not preserve its value while applying transformations.
 
-  Given an environment, metavariable context, and local context, we say a let-expression
-  `let x : t := v; e` is non-dependent when it is equivalent to `(fun x : t => e) v`.
-  Here is an example of a dependent let-expression
-  `let n : Nat := 2; fun (a : Array Nat n) (b : Array Nat 2) => a = b` is type correct, but
-  `(fun (n : Nat) (a : Array Nat n) (b : Array Nat 2) => a = b) 2` is not.
+  Given an environment, a metavariable context, and a local context,
+  we say a let-expression `let x : t := v; e` is non-dependent when it is equivalent
+  to `(fun x : t => e) v`. Here is an example of a dependent let-expression
+  `let n : Nat := 2; fun (a : Array Nat n) (b : Array Nat 2) => a = b` is type correct,
+  but `(fun (n : Nat) (a : Array Nat n) (b : Array Nat 2) => a = b) 2` is not.
+
   The let-expression `let x : Nat := 2; Nat.succ x` is represented as
   ```
-  .letE `x (.const `Nat []) (.lit (.natVal 2)) (.bvar 0) true
+  Expr.letE `x (.const `Nat []) (.lit (.natVal 2)) (.bvar 0) true
   ```
   -/
   | letE (declName : Name) (type : Expr) (value : Expr) (body : Expr) (nonDep : Bool)
+
   /--
-  Natural number and string literal values. They are not really needed, but provide a more
-  compact representation in memory for these two kinds of literals, and are used to implement
-  efficient reduction in the elaborator and kernel.
-  The "raw" natural number `2` can be represented as `.lit (.natVal 2)`. Note that, it is
-  definitionally equal to
-  ```
-  .app (.const `Nat.succ []) (.app (.const `Nat.succ []) (.const `Nat.zero []))
+  Natural number and string literal values.
+
+  They are not really needed, but provide a more compact representation in memory
+  for these two kinds of literals, and are used to implement efficient reduction
+  in the elaborator and kernel. The "raw" natural number `2` can be represented
+  as `Expr.lit (.natVal 2)`. Note that, it is definitionally equal to:
+  ```lean
+  Expr.app (.const `Nat.succ []) (.app (.const `Nat.succ []) (.const `Nat.zero []))
   ```
   -/
-  | lit     : Literal → Expr
+  | lit : Literal → Expr
+
   /--
-  Metadata (aka annotations). We use annotations to provide hints to the pretty-printer,
+  Metadata (aka annotations).
+
+  We use annotations to provide hints to the pretty-printer,
   store references to `Syntax` nodes, position information, and save information for
   elaboration procedures (e.g., we use the `inaccessible` annotation during elaboration to
   mark `Expr`s that correspond to inaccessible patterns).
-  Note that `.mdata data e` is definitionally equal to `e`.
+
+  Note that `Expr.mdata data e` is definitionally equal to `e`.
   -/
   | mdata (data : MData) (expr : Expr)
+
   /--
   Projection-expressions. They are redundant, but are used to create more compact
   terms, speedup reduction, and implement eta for structures.
@@ -420,6 +458,7 @@ inductive Expr where
   is valid (i.e., it is smaller than the numbef of constructor fields).
   When exporting Lean developments to other systems, `proj` can be replaced with `typeName`.`rec`
   applications.
+
   Example, given `a : Nat x Bool`, `a.1` is represented as
   ```
   .proj `Prod 0 a
@@ -756,6 +795,11 @@ def isType : Expr → Bool
   | sort (.succ ..) => true
   | _ => false
 
+/-- Return `true` if the given expression is of the form `.sort (.succ .zero)`. -/
+def isType0 : Expr → Bool
+  | sort (.succ .zero) => true
+  | _ => false
+
 /-- Return `true` if the given expression is a `.sort .zero` -/
 def isProp : Expr → Bool
   | sort (.zero ..) => true
diff --git a/stage0/src/Lean/Meta/Match/MatchEqs.lean b/stage0/src/Lean/Meta/Match/MatchEqs.lean
index 1197ef170b..4196c4484d 100644
--- a/stage0/src/Lean/Meta/Match/MatchEqs.lean
+++ b/stage0/src/Lean/Meta/Match/MatchEqs.lean
@@ -188,8 +188,8 @@ partial def trySubstVarsAndContradiction (mvarId : MVarId) : MetaM Bool :=
   commitWhen do
     let mvarId ← substVars mvarId
     match (← injections mvarId) with
-    | none => return true -- closed goal
-    | some mvarId' =>
+    | .solved => return true -- closed goal
+    | .subgoal mvarId' _ =>
       if mvarId' == mvarId then
         contradiction mvarId
       else
diff --git a/stage0/src/Lean/Meta/Tactic/Injection.lean b/stage0/src/Lean/Meta/Tactic/Injection.lean
index 511e8f1f0b..584df558a3 100644
--- a/stage0/src/Lean/Meta/Tactic/Injection.lean
+++ b/stage0/src/Lean/Meta/Tactic/Injection.lean
@@ -89,30 +89,34 @@ def injectionIntro (mvarId : MVarId) (numEqs : Nat) (newNames : List Name) (tryT
 
 def injection (mvarId : MVarId) (fvarId : FVarId) (newNames : List Name := []) : MetaM InjectionResult := do
   match (← injectionCore mvarId fvarId) with
-  | InjectionResultCore.solved                => pure InjectionResult.solved
-  | InjectionResultCore.subgoal mvarId numEqs => injectionIntro mvarId numEqs newNames
+  | .solved                => pure .solved
+  | .subgoal mvarId numEqs => injectionIntro mvarId numEqs newNames
 
-partial def injections (mvarId : MVarId) (maxDepth : Nat := 5) : MetaM (Option MVarId) :=
+inductive InjectionsResult where
+  | solved
+  | subgoal (mvarId : MVarId) (remainingNames : List Name)
+
+partial def injections (mvarId : MVarId) (newNames : List Name := []) (maxDepth : Nat := 5) : MetaM InjectionsResult :=
   mvarId.withContext do
     let fvarIds := (← getLCtx).getFVarIds
-    go maxDepth fvarIds.toList mvarId
+    go maxDepth fvarIds.toList mvarId newNames
 where
-  go : Nat → List FVarId → MVarId → MetaM (Option MVarId)
-    | 0,   _,  _      => throwTacticEx `injections mvarId "recursion depth exceeded"
-    | _,   [], mvarId => return mvarId
-    | d+1, fvarId :: fvarIds, mvarId => do
+  go : Nat → List FVarId → MVarId → List Name → MetaM InjectionsResult
+    | 0,   _,  _,      _        => throwTacticEx `injections mvarId "recursion depth exceeded"
+    | _,   [], mvarId, newNames => return .subgoal mvarId newNames
+    | d+1, fvarId :: fvarIds, mvarId, newNames => do
       let cont := do
-        go (d+1) fvarIds mvarId
+        go (d+1) fvarIds mvarId newNames
       if let some (_, lhs, rhs) ← matchEqHEq? (← fvarId.getType) then
         let lhs ← whnf lhs
         let rhs ← whnf rhs
         if lhs.isNatLit && rhs.isNatLit then cont
         else
           try
-            match (← injection mvarId fvarId) with
-            | InjectionResult.solved  => return none
-            | InjectionResult.subgoal mvarId newEqs _ =>
-              mvarId.withContext <| go d (newEqs.toList ++ fvarIds) mvarId
+            match (← injection mvarId fvarId newNames) with
+            | .solved  => return .solved
+            | .subgoal mvarId newEqs remainingNames =>
+              mvarId.withContext <| go d (newEqs.toList ++ fvarIds) mvarId remainingNames
           catch _ => cont
       else cont
 
diff --git a/stage0/src/stdlib_flags.h b/stage0/src/stdlib_flags.h
index 214489ca50..aae6413ccc 100644
--- a/stage0/src/stdlib_flags.h
+++ b/stage0/src/stdlib_flags.h
@@ -8,7 +8,7 @@ options get_default_options() {
     // switch to `true` for ABI-breaking changes affecting meta code
     opts = opts.update({"interpreter", "prefer_native"}, false);
     // switch to `true` for changing built-in parsers used in quotations
-    opts = opts.update({"internal", "parseQuotWithCurrentStage"}, true);
+    opts = opts.update({"internal", "parseQuotWithCurrentStage"}, false);
     opts = opts.update({"pp", "rawOnError"}, true);
 #endif
     return opts;
diff --git a/stage0/stdlib/Init/Data/List/BasicAux.c b/stage0/stdlib/Init/Data/List/BasicAux.c
index 60c3dee4af..1d8556d2ae 100644
--- a/stage0/stdlib/Init/Data/List/BasicAux.c
+++ b/stage0/stdlib/Init/Data/List/BasicAux.c
@@ -119,6 +119,7 @@ LEAN_EXPORT lean_object* l_panic___at_List_tail_x21___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_List_tail_x3f___rarg___boxed(lean_object*);
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__66;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__20;
+static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__25;
 LEAN_EXPORT lean_object* l_List_instAntisymmListLeInstLEList___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -155,10 +156,12 @@ lean_object* l_List_take___rarg(lean_object*, lean_object*);
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__54;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__62;
 LEAN_EXPORT lean_object* l_List_head_x21(lean_object*);
+static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__47;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__60;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__41;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__13;
+static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__22;
 static lean_object* l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__4;
 LEAN_EXPORT lean_object* l_List_getD(lean_object*);
@@ -1698,7 +1701,7 @@ static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRul
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("binderIdent", 11);
+x_1 = lean_mk_string_from_bytes("caseArg", 7);
 return x_1;
 }
 }
@@ -1706,7 +1709,7 @@ static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRul
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__2;
+x_1 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__6;
 x_2 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__65;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -1716,29 +1719,56 @@ static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRul
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("=>", 2);
+x_1 = lean_mk_string_from_bytes("binderIdent", 11);
 return x_1;
 }
 }
 static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__68() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__2;
+x_2 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__67;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("=>", 2);
+return x_1;
+}
+}
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(4u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71() {
+_start:
+{
 lean_object* x_1; 
 x_1 = lean_mk_string_from_bytes("simpArith", 9);
 return x_1;
 }
 }
-static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69() {
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__6;
-x_2 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__68;
+x_2 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70() {
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73() {
 _start:
 {
 lean_object* x_1; 
@@ -1746,7 +1776,7 @@ x_1 = lean_mk_string_from_bytes("simp_arith", 10);
 return x_1;
 }
 }
-static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71() {
+static lean_object* _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -1779,7 +1809,7 @@ x_8 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRule
 x_9 = !lean_is_exclusive(x_8);
 if (x_9 == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 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; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
+lean_object* x_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; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 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; 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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 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; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
 x_10 = lean_ctor_get(x_8, 0);
 x_11 = lean_ctor_get(x_2, 2);
 lean_inc(x_11);
@@ -2000,480 +2030,508 @@ x_105 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_105, 0, x_10);
 lean_ctor_set(x_105, 1, x_104);
 x_106 = lean_array_push(x_34, x_73);
-x_107 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__66;
+x_107 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__68;
 lean_inc(x_10);
 x_108 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_108, 0, x_10);
 lean_ctor_set(x_108, 1, x_107);
 lean_ctor_set(x_108, 2, x_106);
-x_109 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__67;
-lean_inc(x_10);
-x_110 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_110, 0, x_10);
-lean_ctor_set(x_110, 1, x_109);
-x_111 = lean_array_push(x_34, x_37);
+x_109 = lean_array_push(x_25, x_108);
+lean_inc(x_85);
+x_110 = lean_array_push(x_109, x_85);
+x_111 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__66;
 lean_inc(x_10);
 x_112 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_112, 0, x_10);
-lean_ctor_set(x_112, 1, x_49);
-lean_ctor_set(x_112, 2, x_111);
+lean_ctor_set(x_112, 1, x_111);
+lean_ctor_set(x_112, 2, x_110);
 x_113 = lean_array_push(x_34, x_112);
 lean_inc(x_10);
 x_114 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_114, 0, x_10);
-lean_ctor_set(x_114, 1, x_52);
+lean_ctor_set(x_114, 1, x_49);
 lean_ctor_set(x_114, 2, x_113);
-x_115 = lean_array_push(x_34, x_114);
+x_115 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69;
 lean_inc(x_10);
-x_116 = lean_alloc_ctor(1, 3, 0);
+x_116 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_116, 0, x_10);
-lean_ctor_set(x_116, 1, x_55);
-lean_ctor_set(x_116, 2, x_115);
-x_117 = lean_array_push(x_43, x_105);
-x_118 = lean_array_push(x_117, x_108);
-lean_inc(x_85);
-x_119 = lean_array_push(x_118, x_85);
-x_120 = lean_array_push(x_119, x_110);
-x_121 = lean_array_push(x_120, x_116);
-x_122 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__64;
+lean_ctor_set(x_116, 1, x_115);
+x_117 = lean_array_push(x_34, x_37);
 lean_inc(x_10);
-x_123 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_123, 0, x_10);
-lean_ctor_set(x_123, 1, x_122);
-lean_ctor_set(x_123, 2, x_121);
-x_124 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70;
+x_118 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_118, 0, x_10);
+lean_ctor_set(x_118, 1, x_49);
+lean_ctor_set(x_118, 2, x_117);
+x_119 = lean_array_push(x_34, x_118);
 lean_inc(x_10);
-x_125 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_125, 0, x_10);
-lean_ctor_set(x_125, 1, x_124);
-x_126 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71;
-x_127 = lean_array_push(x_126, x_125);
-lean_inc(x_85);
-x_128 = lean_array_push(x_127, x_85);
-lean_inc(x_85);
-x_129 = lean_array_push(x_128, x_85);
-lean_inc(x_85);
-x_130 = lean_array_push(x_129, x_85);
-lean_inc(x_85);
-x_131 = lean_array_push(x_130, x_85);
-lean_inc(x_85);
-x_132 = lean_array_push(x_131, x_85);
-x_133 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69;
+x_120 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_120, 0, x_10);
+lean_ctor_set(x_120, 1, x_52);
+lean_ctor_set(x_120, 2, x_119);
+x_121 = lean_array_push(x_34, x_120);
 lean_inc(x_10);
-x_134 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_134, 0, x_10);
-lean_ctor_set(x_134, 1, x_133);
-lean_ctor_set(x_134, 2, x_132);
-x_135 = lean_array_push(x_43, x_103);
+x_122 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_122, 0, x_10);
+lean_ctor_set(x_122, 1, x_55);
+lean_ctor_set(x_122, 2, x_121);
+x_123 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70;
+x_124 = lean_array_push(x_123, x_105);
+x_125 = lean_array_push(x_124, x_114);
+x_126 = lean_array_push(x_125, x_116);
+x_127 = lean_array_push(x_126, x_122);
+x_128 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__64;
+lean_inc(x_10);
+x_129 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_129, 0, x_10);
+lean_ctor_set(x_129, 1, x_128);
+lean_ctor_set(x_129, 2, x_127);
+x_130 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73;
+lean_inc(x_10);
+x_131 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_131, 0, x_10);
+lean_ctor_set(x_131, 1, x_130);
+x_132 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74;
+x_133 = lean_array_push(x_132, x_131);
+lean_inc(x_85);
+x_134 = lean_array_push(x_133, x_85);
+lean_inc(x_85);
+x_135 = lean_array_push(x_134, x_85);
 lean_inc(x_85);
 x_136 = lean_array_push(x_135, x_85);
-x_137 = lean_array_push(x_136, x_123);
+lean_inc(x_85);
+x_137 = lean_array_push(x_136, x_85);
+lean_inc(x_85);
 x_138 = lean_array_push(x_137, x_85);
-x_139 = lean_array_push(x_138, x_134);
+x_139 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72;
 lean_inc(x_10);
 x_140 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_140, 0, x_10);
-lean_ctor_set(x_140, 1, x_49);
-lean_ctor_set(x_140, 2, x_139);
-x_141 = lean_array_push(x_34, x_140);
-lean_inc(x_10);
-x_142 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_142, 0, x_10);
-lean_ctor_set(x_142, 1, x_52);
-lean_ctor_set(x_142, 2, x_141);
-x_143 = lean_array_push(x_34, x_142);
-lean_inc(x_10);
-x_144 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_144, 0, x_10);
-lean_ctor_set(x_144, 1, x_55);
-lean_ctor_set(x_144, 2, x_143);
-x_145 = lean_array_push(x_57, x_144);
+lean_ctor_set(x_140, 1, x_139);
+lean_ctor_set(x_140, 2, x_138);
+x_141 = lean_array_push(x_43, x_103);
+lean_inc(x_85);
+x_142 = lean_array_push(x_141, x_85);
+x_143 = lean_array_push(x_142, x_129);
+x_144 = lean_array_push(x_143, x_85);
+x_145 = lean_array_push(x_144, x_140);
 lean_inc(x_10);
 x_146 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_146, 0, x_10);
-lean_ctor_set(x_146, 1, x_59);
+lean_ctor_set(x_146, 1, x_49);
 lean_ctor_set(x_146, 2, x_145);
-x_147 = lean_array_push(x_25, x_60);
-x_148 = lean_array_push(x_147, x_146);
+x_147 = lean_array_push(x_34, x_146);
 lean_inc(x_10);
-x_149 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_149, 0, x_10);
-lean_ctor_set(x_149, 1, x_49);
-lean_ctor_set(x_149, 2, x_148);
-x_150 = lean_array_push(x_25, x_14);
-x_151 = lean_array_push(x_150, x_149);
-x_152 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__12;
+x_148 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_148, 0, x_10);
+lean_ctor_set(x_148, 1, x_52);
+lean_ctor_set(x_148, 2, x_147);
+x_149 = lean_array_push(x_34, x_148);
 lean_inc(x_10);
-x_153 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_153, 0, x_10);
-lean_ctor_set(x_153, 1, x_152);
-lean_ctor_set(x_153, 2, x_151);
-x_154 = lean_array_push(x_34, x_153);
+x_150 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_150, 0, x_10);
+lean_ctor_set(x_150, 1, x_55);
+lean_ctor_set(x_150, 2, x_149);
+x_151 = lean_array_push(x_57, x_150);
+lean_inc(x_10);
+x_152 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_152, 0, x_10);
+lean_ctor_set(x_152, 1, x_59);
+lean_ctor_set(x_152, 2, x_151);
+x_153 = lean_array_push(x_25, x_60);
+x_154 = lean_array_push(x_153, x_152);
 lean_inc(x_10);
 x_155 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_155, 0, x_10);
 lean_ctor_set(x_155, 1, x_49);
 lean_ctor_set(x_155, 2, x_154);
-x_156 = lean_array_push(x_34, x_155);
-x_157 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__8;
-x_158 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_158, 0, x_10);
-lean_ctor_set(x_158, 1, x_157);
-lean_ctor_set(x_158, 2, x_156);
-lean_ctor_set(x_8, 0, x_158);
+x_156 = lean_array_push(x_25, x_14);
+x_157 = lean_array_push(x_156, x_155);
+x_158 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__12;
+lean_inc(x_10);
+x_159 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_159, 0, x_10);
+lean_ctor_set(x_159, 1, x_158);
+lean_ctor_set(x_159, 2, x_157);
+x_160 = lean_array_push(x_34, x_159);
+lean_inc(x_10);
+x_161 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_161, 0, x_10);
+lean_ctor_set(x_161, 1, x_49);
+lean_ctor_set(x_161, 2, x_160);
+x_162 = lean_array_push(x_34, x_161);
+x_163 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__8;
+x_164 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_164, 0, x_10);
+lean_ctor_set(x_164, 1, x_163);
+lean_ctor_set(x_164, 2, x_162);
+lean_ctor_set(x_8, 0, x_164);
 return x_8;
 }
 else
 {
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 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; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; 
-x_159 = lean_ctor_get(x_8, 0);
-x_160 = lean_ctor_get(x_8, 1);
-lean_inc(x_160);
-lean_inc(x_159);
+lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 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; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; 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; lean_object* x_311; lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+x_165 = lean_ctor_get(x_8, 0);
+x_166 = lean_ctor_get(x_8, 1);
+lean_inc(x_166);
+lean_inc(x_165);
 lean_dec(x_8);
-x_161 = lean_ctor_get(x_2, 2);
-lean_inc(x_161);
-x_162 = lean_ctor_get(x_2, 1);
-lean_inc(x_162);
+x_167 = lean_ctor_get(x_2, 2);
+lean_inc(x_167);
+x_168 = lean_ctor_get(x_2, 1);
+lean_inc(x_168);
 lean_dec(x_2);
-x_163 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__11;
-lean_inc(x_159);
-x_164 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_164, 0, x_159);
-lean_ctor_set(x_164, 1, x_163);
-x_165 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__15;
-lean_inc(x_159);
-x_166 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_166, 0, x_159);
-lean_ctor_set(x_166, 1, x_165);
-x_167 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__20;
-lean_inc(x_159);
-x_168 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_168, 0, x_159);
-lean_ctor_set(x_168, 1, x_167);
-x_169 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__25;
-lean_inc(x_161);
-lean_inc(x_162);
-x_170 = l_Lean_addMacroScope(x_162, x_169, x_161);
-x_171 = lean_box(0);
-x_172 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__24;
-x_173 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__28;
-lean_inc(x_159);
-x_174 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_174, 0, x_159);
-lean_ctor_set(x_174, 1, x_172);
-lean_ctor_set(x_174, 2, x_170);
-lean_ctor_set(x_174, 3, x_173);
-x_175 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__29;
-x_176 = lean_array_push(x_175, x_168);
-lean_inc(x_174);
-lean_inc(x_176);
-x_177 = lean_array_push(x_176, x_174);
-x_178 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__21;
-lean_inc(x_159);
-x_179 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_179, 0, x_159);
-lean_ctor_set(x_179, 1, x_178);
-lean_ctor_set(x_179, 2, x_177);
-x_180 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__30;
-lean_inc(x_159);
-x_181 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_181, 0, x_159);
-lean_ctor_set(x_181, 1, x_180);
-x_182 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__31;
-lean_inc(x_159);
-x_183 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_183, 0, x_159);
-lean_ctor_set(x_183, 1, x_182);
-x_184 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__33;
-x_185 = lean_array_push(x_184, x_183);
-x_186 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__32;
-lean_inc(x_159);
-x_187 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_187, 0, x_159);
+x_169 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__11;
+lean_inc(x_165);
+x_170 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_170, 0, x_165);
+lean_ctor_set(x_170, 1, x_169);
+x_171 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__15;
+lean_inc(x_165);
+x_172 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_172, 0, x_165);
+lean_ctor_set(x_172, 1, x_171);
+x_173 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__20;
+lean_inc(x_165);
+x_174 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_174, 0, x_165);
+lean_ctor_set(x_174, 1, x_173);
+x_175 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__25;
+lean_inc(x_167);
+lean_inc(x_168);
+x_176 = l_Lean_addMacroScope(x_168, x_175, x_167);
+x_177 = lean_box(0);
+x_178 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__24;
+x_179 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__28;
+lean_inc(x_165);
+x_180 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_180, 0, x_165);
+lean_ctor_set(x_180, 1, x_178);
+lean_ctor_set(x_180, 2, x_176);
+lean_ctor_set(x_180, 3, x_179);
+x_181 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__29;
+x_182 = lean_array_push(x_181, x_174);
+lean_inc(x_180);
+lean_inc(x_182);
+x_183 = lean_array_push(x_182, x_180);
+x_184 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__21;
+lean_inc(x_165);
+x_185 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_185, 0, x_165);
+lean_ctor_set(x_185, 1, x_184);
+lean_ctor_set(x_185, 2, x_183);
+x_186 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__30;
+lean_inc(x_165);
+x_187 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_187, 0, x_165);
 lean_ctor_set(x_187, 1, x_186);
-lean_ctor_set(x_187, 2, x_185);
-x_188 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__34;
-lean_inc(x_159);
+x_188 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__31;
+lean_inc(x_165);
 x_189 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_189, 0, x_159);
+lean_ctor_set(x_189, 0, x_165);
 lean_ctor_set(x_189, 1, x_188);
-x_190 = lean_array_push(x_184, x_189);
-x_191 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__35;
-lean_inc(x_159);
-x_192 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_192, 0, x_159);
-lean_ctor_set(x_192, 1, x_191);
-lean_ctor_set(x_192, 2, x_190);
-x_193 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__36;
-x_194 = lean_array_push(x_193, x_179);
-lean_inc(x_181);
-x_195 = lean_array_push(x_194, x_181);
+x_190 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__33;
+x_191 = lean_array_push(x_190, x_189);
+x_192 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__32;
+lean_inc(x_165);
+x_193 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_193, 0, x_165);
+lean_ctor_set(x_193, 1, x_192);
+lean_ctor_set(x_193, 2, x_191);
+x_194 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__34;
+lean_inc(x_165);
+x_195 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_195, 0, x_165);
+lean_ctor_set(x_195, 1, x_194);
+x_196 = lean_array_push(x_190, x_195);
+x_197 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__35;
+lean_inc(x_165);
+x_198 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_198, 0, x_165);
+lean_ctor_set(x_198, 1, x_197);
+lean_ctor_set(x_198, 2, x_196);
+x_199 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__36;
+x_200 = lean_array_push(x_199, x_185);
 lean_inc(x_187);
-x_196 = lean_array_push(x_195, x_187);
-x_197 = lean_array_push(x_196, x_181);
-x_198 = lean_array_push(x_197, x_192);
-x_199 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__10;
-lean_inc(x_159);
-x_200 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_200, 0, x_159);
-lean_ctor_set(x_200, 1, x_199);
-lean_ctor_set(x_200, 2, x_198);
-x_201 = lean_array_push(x_184, x_200);
-x_202 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__19;
-lean_inc(x_159);
-x_203 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_203, 0, x_159);
-lean_ctor_set(x_203, 1, x_202);
-lean_ctor_set(x_203, 2, x_201);
-x_204 = lean_array_push(x_184, x_203);
-x_205 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__17;
-lean_inc(x_159);
+x_201 = lean_array_push(x_200, x_187);
+lean_inc(x_193);
+x_202 = lean_array_push(x_201, x_193);
+x_203 = lean_array_push(x_202, x_187);
+x_204 = lean_array_push(x_203, x_198);
+x_205 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__10;
+lean_inc(x_165);
 x_206 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_206, 0, x_159);
+lean_ctor_set(x_206, 0, x_165);
 lean_ctor_set(x_206, 1, x_205);
 lean_ctor_set(x_206, 2, x_204);
-x_207 = lean_array_push(x_175, x_166);
-lean_inc(x_207);
-x_208 = lean_array_push(x_207, x_206);
-x_209 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__14;
-lean_inc(x_159);
-x_210 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_210, 0, x_159);
-lean_ctor_set(x_210, 1, x_209);
-lean_ctor_set(x_210, 2, x_208);
-x_211 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__47;
-lean_inc(x_161);
-lean_inc(x_162);
-x_212 = l_Lean_addMacroScope(x_162, x_211, x_161);
-x_213 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__43;
-x_214 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__49;
-lean_inc(x_159);
-x_215 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_215, 0, x_159);
-lean_ctor_set(x_215, 1, x_213);
-lean_ctor_set(x_215, 2, x_212);
-lean_ctor_set(x_215, 3, x_214);
-x_216 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__52;
-lean_inc(x_159);
-x_217 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_217, 0, x_159);
-lean_ctor_set(x_217, 1, x_216);
-x_218 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__55;
-lean_inc(x_159);
-x_219 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_219, 0, x_159);
-lean_ctor_set(x_219, 1, x_218);
-x_220 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__59;
-x_221 = l_Lean_addMacroScope(x_162, x_220, x_161);
-x_222 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__58;
-lean_inc(x_159);
-x_223 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_223, 0, x_159);
+x_207 = lean_array_push(x_190, x_206);
+x_208 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__19;
+lean_inc(x_165);
+x_209 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_209, 0, x_165);
+lean_ctor_set(x_209, 1, x_208);
+lean_ctor_set(x_209, 2, x_207);
+x_210 = lean_array_push(x_190, x_209);
+x_211 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__17;
+lean_inc(x_165);
+x_212 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_212, 0, x_165);
+lean_ctor_set(x_212, 1, x_211);
+lean_ctor_set(x_212, 2, x_210);
+x_213 = lean_array_push(x_181, x_172);
+lean_inc(x_213);
+x_214 = lean_array_push(x_213, x_212);
+x_215 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__14;
+lean_inc(x_165);
+x_216 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_216, 0, x_165);
+lean_ctor_set(x_216, 1, x_215);
+lean_ctor_set(x_216, 2, x_214);
+x_217 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__47;
+lean_inc(x_167);
+lean_inc(x_168);
+x_218 = l_Lean_addMacroScope(x_168, x_217, x_167);
+x_219 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__43;
+x_220 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__49;
+lean_inc(x_165);
+x_221 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_221, 0, x_165);
+lean_ctor_set(x_221, 1, x_219);
+lean_ctor_set(x_221, 2, x_218);
+lean_ctor_set(x_221, 3, x_220);
+x_222 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__52;
+lean_inc(x_165);
+x_223 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_223, 0, x_165);
 lean_ctor_set(x_223, 1, x_222);
-lean_ctor_set(x_223, 2, x_221);
-lean_ctor_set(x_223, 3, x_171);
-x_224 = lean_array_push(x_175, x_219);
-lean_inc(x_223);
-x_225 = lean_array_push(x_224, x_223);
-x_226 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__54;
-lean_inc(x_159);
-x_227 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_227, 0, x_159);
-lean_ctor_set(x_227, 1, x_226);
-lean_ctor_set(x_227, 2, x_225);
-x_228 = lean_array_push(x_184, x_227);
-lean_inc(x_159);
-x_229 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_229, 0, x_159);
-lean_ctor_set(x_229, 1, x_199);
-lean_ctor_set(x_229, 2, x_228);
-x_230 = lean_array_push(x_175, x_174);
+x_224 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__55;
+lean_inc(x_165);
+x_225 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_225, 0, x_165);
+lean_ctor_set(x_225, 1, x_224);
+x_226 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__59;
+x_227 = l_Lean_addMacroScope(x_168, x_226, x_167);
+x_228 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__58;
+lean_inc(x_165);
+x_229 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_229, 0, x_165);
+lean_ctor_set(x_229, 1, x_228);
+lean_ctor_set(x_229, 2, x_227);
+lean_ctor_set(x_229, 3, x_177);
+x_230 = lean_array_push(x_181, x_225);
+lean_inc(x_229);
 x_231 = lean_array_push(x_230, x_229);
-x_232 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__40;
-lean_inc(x_159);
+x_232 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__54;
+lean_inc(x_165);
 x_233 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_233, 0, x_159);
+lean_ctor_set(x_233, 0, x_165);
 lean_ctor_set(x_233, 1, x_232);
 lean_ctor_set(x_233, 2, x_231);
-x_234 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__60;
-lean_inc(x_159);
+x_234 = lean_array_push(x_190, x_233);
+lean_inc(x_165);
 x_235 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_235, 0, x_159);
-lean_ctor_set(x_235, 1, x_199);
+lean_ctor_set(x_235, 0, x_165);
+lean_ctor_set(x_235, 1, x_205);
 lean_ctor_set(x_235, 2, x_234);
-x_236 = lean_array_push(x_175, x_233);
-lean_inc(x_235);
+x_236 = lean_array_push(x_181, x_180);
 x_237 = lean_array_push(x_236, x_235);
-lean_inc(x_159);
-x_238 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_238, 0, x_159);
-lean_ctor_set(x_238, 1, x_199);
-lean_ctor_set(x_238, 2, x_237);
-x_239 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__61;
-lean_inc(x_159);
-x_240 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_240, 0, x_159);
-lean_ctor_set(x_240, 1, x_239);
-x_241 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__62;
-x_242 = lean_array_push(x_241, x_217);
-x_243 = lean_array_push(x_242, x_238);
-x_244 = lean_array_push(x_243, x_240);
-x_245 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__51;
-lean_inc(x_159);
-x_246 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_246, 0, x_159);
+x_238 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__40;
+lean_inc(x_165);
+x_239 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_239, 0, x_165);
+lean_ctor_set(x_239, 1, x_238);
+lean_ctor_set(x_239, 2, x_237);
+x_240 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__60;
+lean_inc(x_165);
+x_241 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_241, 0, x_165);
+lean_ctor_set(x_241, 1, x_205);
+lean_ctor_set(x_241, 2, x_240);
+x_242 = lean_array_push(x_181, x_239);
+lean_inc(x_241);
+x_243 = lean_array_push(x_242, x_241);
+lean_inc(x_165);
+x_244 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_244, 0, x_165);
+lean_ctor_set(x_244, 1, x_205);
+lean_ctor_set(x_244, 2, x_243);
+x_245 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__61;
+lean_inc(x_165);
+x_246 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_246, 0, x_165);
 lean_ctor_set(x_246, 1, x_245);
-lean_ctor_set(x_246, 2, x_244);
-x_247 = lean_array_push(x_184, x_246);
-lean_inc(x_159);
-x_248 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_248, 0, x_159);
-lean_ctor_set(x_248, 1, x_199);
-lean_ctor_set(x_248, 2, x_247);
-x_249 = lean_array_push(x_175, x_215);
-x_250 = lean_array_push(x_249, x_248);
-lean_inc(x_159);
-x_251 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_251, 0, x_159);
-lean_ctor_set(x_251, 1, x_232);
-lean_ctor_set(x_251, 2, x_250);
-x_252 = lean_array_push(x_176, x_251);
-lean_inc(x_159);
-x_253 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_253, 0, x_159);
-lean_ctor_set(x_253, 1, x_178);
-lean_ctor_set(x_253, 2, x_252);
-x_254 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__63;
-lean_inc(x_159);
-x_255 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_255, 0, x_159);
-lean_ctor_set(x_255, 1, x_254);
-x_256 = lean_array_push(x_184, x_223);
-x_257 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__66;
-lean_inc(x_159);
-x_258 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_258, 0, x_159);
-lean_ctor_set(x_258, 1, x_257);
-lean_ctor_set(x_258, 2, x_256);
-x_259 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__67;
-lean_inc(x_159);
-x_260 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_260, 0, x_159);
-lean_ctor_set(x_260, 1, x_259);
-x_261 = lean_array_push(x_184, x_187);
-lean_inc(x_159);
-x_262 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_262, 0, x_159);
-lean_ctor_set(x_262, 1, x_199);
-lean_ctor_set(x_262, 2, x_261);
-x_263 = lean_array_push(x_184, x_262);
-lean_inc(x_159);
+x_247 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__62;
+x_248 = lean_array_push(x_247, x_223);
+x_249 = lean_array_push(x_248, x_244);
+x_250 = lean_array_push(x_249, x_246);
+x_251 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__51;
+lean_inc(x_165);
+x_252 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_252, 0, x_165);
+lean_ctor_set(x_252, 1, x_251);
+lean_ctor_set(x_252, 2, x_250);
+x_253 = lean_array_push(x_190, x_252);
+lean_inc(x_165);
+x_254 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_254, 0, x_165);
+lean_ctor_set(x_254, 1, x_205);
+lean_ctor_set(x_254, 2, x_253);
+x_255 = lean_array_push(x_181, x_221);
+x_256 = lean_array_push(x_255, x_254);
+lean_inc(x_165);
+x_257 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_257, 0, x_165);
+lean_ctor_set(x_257, 1, x_238);
+lean_ctor_set(x_257, 2, x_256);
+x_258 = lean_array_push(x_182, x_257);
+lean_inc(x_165);
+x_259 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_259, 0, x_165);
+lean_ctor_set(x_259, 1, x_184);
+lean_ctor_set(x_259, 2, x_258);
+x_260 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__63;
+lean_inc(x_165);
+x_261 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_261, 0, x_165);
+lean_ctor_set(x_261, 1, x_260);
+x_262 = lean_array_push(x_190, x_229);
+x_263 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__68;
+lean_inc(x_165);
 x_264 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_264, 0, x_159);
-lean_ctor_set(x_264, 1, x_202);
-lean_ctor_set(x_264, 2, x_263);
-x_265 = lean_array_push(x_184, x_264);
-lean_inc(x_159);
-x_266 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_266, 0, x_159);
-lean_ctor_set(x_266, 1, x_205);
-lean_ctor_set(x_266, 2, x_265);
-x_267 = lean_array_push(x_193, x_255);
-x_268 = lean_array_push(x_267, x_258);
-lean_inc(x_235);
-x_269 = lean_array_push(x_268, x_235);
-x_270 = lean_array_push(x_269, x_260);
-x_271 = lean_array_push(x_270, x_266);
-x_272 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__64;
-lean_inc(x_159);
-x_273 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_273, 0, x_159);
-lean_ctor_set(x_273, 1, x_272);
-lean_ctor_set(x_273, 2, x_271);
-x_274 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70;
-lean_inc(x_159);
-x_275 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_275, 0, x_159);
-lean_ctor_set(x_275, 1, x_274);
-x_276 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71;
-x_277 = lean_array_push(x_276, x_275);
-lean_inc(x_235);
-x_278 = lean_array_push(x_277, x_235);
-lean_inc(x_235);
-x_279 = lean_array_push(x_278, x_235);
-lean_inc(x_235);
-x_280 = lean_array_push(x_279, x_235);
-lean_inc(x_235);
-x_281 = lean_array_push(x_280, x_235);
-lean_inc(x_235);
-x_282 = lean_array_push(x_281, x_235);
-x_283 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69;
-lean_inc(x_159);
-x_284 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_284, 0, x_159);
-lean_ctor_set(x_284, 1, x_283);
-lean_ctor_set(x_284, 2, x_282);
-x_285 = lean_array_push(x_193, x_253);
-lean_inc(x_235);
-x_286 = lean_array_push(x_285, x_235);
-x_287 = lean_array_push(x_286, x_273);
-x_288 = lean_array_push(x_287, x_235);
-x_289 = lean_array_push(x_288, x_284);
-lean_inc(x_159);
-x_290 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_290, 0, x_159);
-lean_ctor_set(x_290, 1, x_199);
-lean_ctor_set(x_290, 2, x_289);
-x_291 = lean_array_push(x_184, x_290);
-lean_inc(x_159);
-x_292 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_292, 0, x_159);
-lean_ctor_set(x_292, 1, x_202);
-lean_ctor_set(x_292, 2, x_291);
-x_293 = lean_array_push(x_184, x_292);
-lean_inc(x_159);
-x_294 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_294, 0, x_159);
-lean_ctor_set(x_294, 1, x_205);
-lean_ctor_set(x_294, 2, x_293);
-x_295 = lean_array_push(x_207, x_294);
-lean_inc(x_159);
+lean_ctor_set(x_264, 0, x_165);
+lean_ctor_set(x_264, 1, x_263);
+lean_ctor_set(x_264, 2, x_262);
+x_265 = lean_array_push(x_181, x_264);
+lean_inc(x_241);
+x_266 = lean_array_push(x_265, x_241);
+x_267 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__66;
+lean_inc(x_165);
+x_268 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_268, 0, x_165);
+lean_ctor_set(x_268, 1, x_267);
+lean_ctor_set(x_268, 2, x_266);
+x_269 = lean_array_push(x_190, x_268);
+lean_inc(x_165);
+x_270 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_270, 0, x_165);
+lean_ctor_set(x_270, 1, x_205);
+lean_ctor_set(x_270, 2, x_269);
+x_271 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__69;
+lean_inc(x_165);
+x_272 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_272, 0, x_165);
+lean_ctor_set(x_272, 1, x_271);
+x_273 = lean_array_push(x_190, x_193);
+lean_inc(x_165);
+x_274 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_274, 0, x_165);
+lean_ctor_set(x_274, 1, x_205);
+lean_ctor_set(x_274, 2, x_273);
+x_275 = lean_array_push(x_190, x_274);
+lean_inc(x_165);
+x_276 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_276, 0, x_165);
+lean_ctor_set(x_276, 1, x_208);
+lean_ctor_set(x_276, 2, x_275);
+x_277 = lean_array_push(x_190, x_276);
+lean_inc(x_165);
+x_278 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_278, 0, x_165);
+lean_ctor_set(x_278, 1, x_211);
+lean_ctor_set(x_278, 2, x_277);
+x_279 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70;
+x_280 = lean_array_push(x_279, x_261);
+x_281 = lean_array_push(x_280, x_270);
+x_282 = lean_array_push(x_281, x_272);
+x_283 = lean_array_push(x_282, x_278);
+x_284 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__64;
+lean_inc(x_165);
+x_285 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_285, 0, x_165);
+lean_ctor_set(x_285, 1, x_284);
+lean_ctor_set(x_285, 2, x_283);
+x_286 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73;
+lean_inc(x_165);
+x_287 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_287, 0, x_165);
+lean_ctor_set(x_287, 1, x_286);
+x_288 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74;
+x_289 = lean_array_push(x_288, x_287);
+lean_inc(x_241);
+x_290 = lean_array_push(x_289, x_241);
+lean_inc(x_241);
+x_291 = lean_array_push(x_290, x_241);
+lean_inc(x_241);
+x_292 = lean_array_push(x_291, x_241);
+lean_inc(x_241);
+x_293 = lean_array_push(x_292, x_241);
+lean_inc(x_241);
+x_294 = lean_array_push(x_293, x_241);
+x_295 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72;
+lean_inc(x_165);
 x_296 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_296, 0, x_159);
-lean_ctor_set(x_296, 1, x_209);
-lean_ctor_set(x_296, 2, x_295);
-x_297 = lean_array_push(x_175, x_210);
-x_298 = lean_array_push(x_297, x_296);
-lean_inc(x_159);
-x_299 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_299, 0, x_159);
-lean_ctor_set(x_299, 1, x_199);
-lean_ctor_set(x_299, 2, x_298);
-x_300 = lean_array_push(x_175, x_164);
-x_301 = lean_array_push(x_300, x_299);
-x_302 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__12;
-lean_inc(x_159);
-x_303 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_303, 0, x_159);
-lean_ctor_set(x_303, 1, x_302);
-lean_ctor_set(x_303, 2, x_301);
-x_304 = lean_array_push(x_184, x_303);
-lean_inc(x_159);
-x_305 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_305, 0, x_159);
-lean_ctor_set(x_305, 1, x_199);
-lean_ctor_set(x_305, 2, x_304);
-x_306 = lean_array_push(x_184, x_305);
-x_307 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__8;
+lean_ctor_set(x_296, 0, x_165);
+lean_ctor_set(x_296, 1, x_295);
+lean_ctor_set(x_296, 2, x_294);
+x_297 = lean_array_push(x_199, x_259);
+lean_inc(x_241);
+x_298 = lean_array_push(x_297, x_241);
+x_299 = lean_array_push(x_298, x_285);
+x_300 = lean_array_push(x_299, x_241);
+x_301 = lean_array_push(x_300, x_296);
+lean_inc(x_165);
+x_302 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_302, 0, x_165);
+lean_ctor_set(x_302, 1, x_205);
+lean_ctor_set(x_302, 2, x_301);
+x_303 = lean_array_push(x_190, x_302);
+lean_inc(x_165);
+x_304 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_304, 0, x_165);
+lean_ctor_set(x_304, 1, x_208);
+lean_ctor_set(x_304, 2, x_303);
+x_305 = lean_array_push(x_190, x_304);
+lean_inc(x_165);
+x_306 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_306, 0, x_165);
+lean_ctor_set(x_306, 1, x_211);
+lean_ctor_set(x_306, 2, x_305);
+x_307 = lean_array_push(x_213, x_306);
+lean_inc(x_165);
 x_308 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_308, 0, x_159);
-lean_ctor_set(x_308, 1, x_307);
-lean_ctor_set(x_308, 2, x_306);
-x_309 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_309, 0, x_308);
-lean_ctor_set(x_309, 1, x_160);
-return x_309;
+lean_ctor_set(x_308, 0, x_165);
+lean_ctor_set(x_308, 1, x_215);
+lean_ctor_set(x_308, 2, x_307);
+x_309 = lean_array_push(x_181, x_216);
+x_310 = lean_array_push(x_309, x_308);
+lean_inc(x_165);
+x_311 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_311, 0, x_165);
+lean_ctor_set(x_311, 1, x_205);
+lean_ctor_set(x_311, 2, x_310);
+x_312 = lean_array_push(x_181, x_170);
+x_313 = lean_array_push(x_312, x_311);
+x_314 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__12;
+lean_inc(x_165);
+x_315 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_315, 0, x_165);
+lean_ctor_set(x_315, 1, x_314);
+lean_ctor_set(x_315, 2, x_313);
+x_316 = lean_array_push(x_190, x_315);
+lean_inc(x_165);
+x_317 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_317, 0, x_165);
+lean_ctor_set(x_317, 1, x_205);
+lean_ctor_set(x_317, 2, x_316);
+x_318 = lean_array_push(x_190, x_317);
+x_319 = l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__8;
+x_320 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_320, 0, x_165);
+lean_ctor_set(x_320, 1, x_319);
+lean_ctor_set(x_320, 2, x_318);
+x_321 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_321, 0, x_320);
+lean_ctor_set(x_321, 1, x_166);
+return x_321;
 }
 }
 }
@@ -2779,6 +2837,12 @@ l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__li
 lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__70);
 l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71();
 lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__71);
+l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72();
+lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__72);
+l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73();
+lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__73);
+l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74();
+lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__List__tacticSizeOf__list__dec__1___closed__74);
 l_List___aux__Init__Data__List__BasicAux______macroRules__tacticDecreasing__trivial__1___closed__1 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__tacticDecreasing__trivial__1___closed__1();
 lean_mark_persistent(l_List___aux__Init__Data__List__BasicAux______macroRules__tacticDecreasing__trivial__1___closed__1);
 l_List___aux__Init__Data__List__BasicAux______macroRules__tacticDecreasing__trivial__1___closed__2 = _init_l_List___aux__Init__Data__List__BasicAux______macroRules__tacticDecreasing__trivial__1___closed__2();
diff --git a/stage0/stdlib/Init/NotationExtra.c b/stage0/stdlib/Init/NotationExtra.c
index e6ed96c32e..79a3784e58 100644
--- a/stage0/stdlib/Init/NotationExtra.c
+++ b/stage0/stdlib/Init/NotationExtra.c
@@ -165,13 +165,11 @@ static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__ter
 uint8_t lean_name_eq(lean_object*, lean_object*);
 static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__command____Unif__hint____Where___x7c_x2d_u22a2____1___lambda__2___closed__21;
 static lean_object* l_term_u03a3___x2c_____closed__5;
-static lean_object* l_unexpandGetElem_x27___closed__3;
 static lean_object* l_Lean_doElemRepeat__Until_____closed__6;
 static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__command____Unif__hint____Where___x7c_x2d_u22a2____1___lambda__2___closed__23;
 static lean_object* l_tacticFunext_______closed__1;
 static lean_object* l_Lean_doElemWhile__Do_____closed__6;
 LEAN_EXPORT lean_object* l___aux__Init__NotationExtra______macroRules__Lean__Parser__Command__classAbbrev__1___lambda__2(lean_object*);
-static lean_object* l_unexpandGetElem_x27___closed__1;
 static lean_object* l_Lean_command____Unif__hint____Where___x7c_x2d_u22a2_____closed__1;
 LEAN_EXPORT lean_object* l_tactic_xb7_x2e_____x3b__;
 static lean_object* l___aux__Init__NotationExtra______macroRules__term_u2203___x2c____1___closed__1;
@@ -323,7 +321,6 @@ static lean_object* l_Lean_doElemRepeat_____closed__2;
 static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__command____Unif__hint____Where___x7c_x2d_u22a2____1___lambda__2___closed__29;
 uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_expandBrackedBinders(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_unexpandGetElem_x27___closed__2;
 static lean_object* l_Lean_command____Unif__hint____Where___x7c_x2d_u22a2_____closed__13;
 static lean_object* l___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___closed__11;
 LEAN_EXPORT lean_object* l_Lean_instForInLoopUnit___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -639,7 +636,6 @@ static lean_object* l_calc___closed__5;
 static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__term__Matches___x7c__1___closed__4;
 static lean_object* l_solve___closed__14;
 static lean_object* l_Lean___aux__Init__NotationExtra______macroRules__Lean__term__Matches___x7c__1___closed__8;
-LEAN_EXPORT lean_object* l_unexpandGetElem_x27(lean_object*, lean_object*, lean_object*);
 static lean_object* l_calc___closed__14;
 static lean_object* l___aux__Init__NotationExtra______macroRules__term_x25_x5b___x7c___x5d__1___closed__6;
 static lean_object* l___aux__Init__NotationExtra______macroRules__tacticFunext______1___closed__2;
@@ -11682,163 +11678,6 @@ return x_60;
 }
 }
 }
-static lean_object* _init_l_unexpandGetElem_x27___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("term__[_]'_", 11);
-return x_1;
-}
-}
-static lean_object* _init_l_unexpandGetElem_x27___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_unexpandGetElem_x27___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_unexpandGetElem_x27___closed__3() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("]'", 2);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_unexpandGetElem_x27(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = l_Lean___aux__Init__NotationExtra______macroRules__Lean__termMacro_x2etrace_x5b___x5d____1___closed__6;
-lean_inc(x_1);
-x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_6 = lean_box(0);
-x_7 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_7, 0, x_6);
-lean_ctor_set(x_7, 1, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = lean_unsigned_to_nat(1u);
-x_9 = l_Lean_Syntax_getArg(x_1, x_8);
-lean_dec(x_1);
-x_10 = lean_unsigned_to_nat(3u);
-lean_inc(x_9);
-x_11 = l_Lean_Syntax_matchesNull(x_9, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-lean_dec(x_9);
-lean_dec(x_2);
-x_12 = lean_box(0);
-x_13 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Syntax_getArg(x_9, x_14);
-x_16 = l_Lean_Syntax_getArg(x_9, x_8);
-x_17 = lean_unsigned_to_nat(2u);
-x_18 = l_Lean_Syntax_getArg(x_9, x_17);
-lean_dec(x_9);
-x_19 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______unexpand__Function__comp__1___spec__1(x_2, x_3);
-x_20 = !lean_is_exclusive(x_19);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_21 = lean_ctor_get(x_19, 0);
-x_22 = l_unexpandGetElem___closed__4;
-x_23 = l_Lean___aux__Init__NotationExtra______macroRules__Lean__termMacro_x2etrace_x5b___x5d____1___closed__29;
-lean_inc(x_21);
-x_24 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_24, 0, x_21);
-lean_ctor_set(x_24, 1, x_22);
-lean_ctor_set(x_24, 2, x_23);
-x_25 = l_unexpandListNil___rarg___closed__3;
-lean_inc(x_21);
-x_26 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_26, 0, x_21);
-lean_ctor_set(x_26, 1, x_25);
-x_27 = l_unexpandGetElem_x27___closed__3;
-lean_inc(x_21);
-x_28 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_28, 0, x_21);
-lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean___aux__Init__NotationExtra______macroRules__Lean__command____Unif__hint____Where___x7c_x2d_u22a2____1___lambda__2___closed__20;
-x_30 = lean_array_push(x_29, x_15);
-x_31 = lean_array_push(x_30, x_24);
-x_32 = lean_array_push(x_31, x_26);
-x_33 = lean_array_push(x_32, x_16);
-x_34 = lean_array_push(x_33, x_28);
-x_35 = lean_array_push(x_34, x_18);
-x_36 = l_unexpandGetElem_x27___closed__2;
-x_37 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_37, 0, x_21);
-lean_ctor_set(x_37, 1, x_36);
-lean_ctor_set(x_37, 2, x_35);
-lean_ctor_set(x_19, 0, x_37);
-return x_19;
-}
-else
-{
-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; 
-x_38 = lean_ctor_get(x_19, 0);
-x_39 = lean_ctor_get(x_19, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_19);
-x_40 = l_unexpandGetElem___closed__4;
-x_41 = l_Lean___aux__Init__NotationExtra______macroRules__Lean__termMacro_x2etrace_x5b___x5d____1___closed__29;
-lean_inc(x_38);
-x_42 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_42, 0, x_38);
-lean_ctor_set(x_42, 1, x_40);
-lean_ctor_set(x_42, 2, x_41);
-x_43 = l_unexpandListNil___rarg___closed__3;
-lean_inc(x_38);
-x_44 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_44, 0, x_38);
-lean_ctor_set(x_44, 1, x_43);
-x_45 = l_unexpandGetElem_x27___closed__3;
-lean_inc(x_38);
-x_46 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_46, 0, x_38);
-lean_ctor_set(x_46, 1, x_45);
-x_47 = l_Lean___aux__Init__NotationExtra______macroRules__Lean__command____Unif__hint____Where___x7c_x2d_u22a2____1___lambda__2___closed__20;
-x_48 = lean_array_push(x_47, x_15);
-x_49 = lean_array_push(x_48, x_42);
-x_50 = lean_array_push(x_49, x_44);
-x_51 = lean_array_push(x_50, x_16);
-x_52 = lean_array_push(x_51, x_46);
-x_53 = lean_array_push(x_52, x_18);
-x_54 = l_unexpandGetElem_x27___closed__2;
-x_55 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_55, 0, x_38);
-lean_ctor_set(x_55, 1, x_54);
-lean_ctor_set(x_55, 2, x_53);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_39);
-return x_56;
-}
-}
-}
-}
-}
 static lean_object* _init_l_tacticFunext_______closed__1() {
 _start:
 {
@@ -20365,12 +20204,6 @@ l_unexpandGetElem_x3f___closed__2 = _init_l_unexpandGetElem_x3f___closed__2();
 lean_mark_persistent(l_unexpandGetElem_x3f___closed__2);
 l_unexpandGetElem_x3f___closed__3 = _init_l_unexpandGetElem_x3f___closed__3();
 lean_mark_persistent(l_unexpandGetElem_x3f___closed__3);
-l_unexpandGetElem_x27___closed__1 = _init_l_unexpandGetElem_x27___closed__1();
-lean_mark_persistent(l_unexpandGetElem_x27___closed__1);
-l_unexpandGetElem_x27___closed__2 = _init_l_unexpandGetElem_x27___closed__2();
-lean_mark_persistent(l_unexpandGetElem_x27___closed__2);
-l_unexpandGetElem_x27___closed__3 = _init_l_unexpandGetElem_x27___closed__3();
-lean_mark_persistent(l_unexpandGetElem_x27___closed__3);
 l_tacticFunext_______closed__1 = _init_l_tacticFunext_______closed__1();
 lean_mark_persistent(l_tacticFunext_______closed__1);
 l_tacticFunext_______closed__2 = _init_l_tacticFunext_______closed__2();
diff --git a/stage0/stdlib/Init/Tactics.c b/stage0/stdlib/Init/Tactics.c
index 25c55f71a1..742a92ad1e 100644
--- a/stage0/stdlib/Init/Tactics.c
+++ b/stage0/stdlib/Init/Tactics.c
@@ -38,7 +38,6 @@ LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_fail;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_first;
 static lean_object* l_Lean_Parser_Tactic_withUnfoldingAll___closed__6;
 static lean_object* l_Lean_Parser_Tactic_case_x27___closed__7;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3;
 static lean_object* l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__6;
 static lean_object* l_Lean_Parser_Tactic_letrec___closed__12;
 static lean_object* l_Lean_Parser_Tactic_tacticHave_x27___x3a_x3d_____closed__2;
@@ -56,7 +55,6 @@ static lean_object* l_Lean_Parser_Tactic_tacticHave_____closed__6;
 static lean_object* l_Lean_Parser_Tactic_inductionAlt___closed__11;
 static lean_object* l_Lean_Parser_Tactic_case___closed__6;
 static lean_object* l_Lean_Parser_Tactic_apply___closed__2;
-static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6;
 static lean_object* l_Lean_Parser_Tactic_dbgTrace___closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__6;
@@ -72,6 +70,7 @@ static lean_object* l_Lean_Parser_Tactic_induction___closed__12;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticRfl;
 static lean_object* l_Lean_Parser_Tactic_generalize___closed__2;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 static lean_object* l_Lean_Parser_Tactic_caseArg___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_rwSeq;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_traceMessage;
@@ -286,7 +285,6 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__L
 static lean_object* l_Lean_Parser_Tactic_anyGoals___closed__2;
 static lean_object* l_Lean_Parser_Tactic_generalize___closed__3;
 static lean_object* l_Lean_Parser_Tactic_split___closed__7;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave_x27___x3a_x3d____1___closed__6;
 static lean_object* l_Lean_Parser_Tactic_tacticHave_x27_____closed__6;
 static lean_object* l_Lean_Parser_Tactic_revert___closed__4;
@@ -392,7 +390,6 @@ static lean_object* l_Lean_Parser_Tactic_save___closed__3;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticInfer__instance__1___closed__7;
 static lean_object* l_Lean_Parser_Tactic_inductionAlt___closed__10;
 static lean_object* l_Lean_Parser_Tactic_config___closed__7;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1;
 static lean_object* l_Lean_Parser_Tactic_location___closed__6;
 static lean_object* l_Lean_Parser_Tactic_clear___closed__3;
 static lean_object* l_Lean_Parser_Tactic_intros___closed__8;
@@ -416,7 +413,6 @@ static lean_object* l_Lean_Parser_Tactic_generalizeArg___closed__9;
 static lean_object* l_Lean_Parser_Tactic_delta___closed__6;
 static lean_object* l_Lean_Parser_Tactic_traceState___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_allGoals;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2;
 static lean_object* l_Lean_Parser_Tactic_checkpoint___closed__5;
 static lean_object* l_Lean_Parser_Tactic_refine___closed__3;
 static lean_object* l_Lean_Parser_Tactic_induction___closed__16;
@@ -473,7 +469,6 @@ static lean_object* l_Lean_Parser_Tactic_discharger___closed__9;
 static lean_object* l_Lean_Parser_Tactic_tacticRfl___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticAdmit;
 static lean_object* l_Lean_Parser_Tactic_location___closed__1;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_rewriteSeq;
 static lean_object* l_Lean_Parser_Tactic_traceMessage___closed__9;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_simpPre;
@@ -499,11 +494,9 @@ static lean_object* l_Lean_Parser_Tactic_tacticShow_____closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_rotateLeft;
 static lean_object* l_Lean_Parser_Tactic_focus___closed__6;
 static lean_object* l_Lean_Parser_Tactic_changeWith___closed__1;
-LEAN_EXPORT lean_object* l_getElem_x27(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
 static lean_object* l_Lean_Parser_Tactic_split___closed__2;
 static lean_object* l_Lean_Parser_Tactic_cases___closed__2;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8;
 static lean_object* l_term_____x5b___x5d___closed__7;
 static lean_object* l_Lean_Parser_Tactic_caseArg___closed__1;
 static lean_object* l_tacticGet__elem__tactic__trivial___closed__1;
@@ -621,7 +614,6 @@ static lean_object* l_Lean_Parser_Tactic_withAnnotateState___closed__14;
 static lean_object* l_Lean_Parser_Tactic_inductionAlt___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_injections;
 static lean_object* l_Lean_Parser_Tactic_intro___closed__7;
-static lean_object* l_Lean_Parser_Tactic_case_x27___closed__9;
 static lean_object* l_Lean_Parser_Tactic_inductionAlt___closed__15;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_checkpoint;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTrivial__6___closed__9;
@@ -717,6 +709,7 @@ static lean_object* l_Lean_Parser_Tactic_inductionAlt___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_subst;
 static lean_object* l_Lean_Parser_Tactic_congr___closed__2;
 static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__8;
+static lean_object* l_Lean_Parser_Tactic_case___closed__14;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticExists___x2c_x2c;
 static lean_object* l_Lean_Parser_Tactic_caseArg___closed__5;
 static lean_object* l_Lean_Parser_Tactic_tacticLet_x27_____closed__1;
@@ -750,8 +743,8 @@ static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__L
 static lean_object* l_Lean_Parser_Tactic_paren___closed__9;
 static lean_object* l_tacticGet__elem__tactic___closed__1;
 static lean_object* l_Lean_Parser_Tactic_simp___closed__3;
+static lean_object* l_Lean_Parser_Tactic_injections___closed__5;
 static lean_object* l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__8;
-static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
 static lean_object* l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__17;
 static lean_object* l_Lean_Parser_Tactic_withAnnotateState___closed__15;
 static lean_object* l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__21;
@@ -835,7 +828,6 @@ static lean_object* l_Lean_Parser_Tactic_tacticHave_____closed__1;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 static lean_object* l_Lean_Parser_Tactic_locationHyp___closed__8;
 static lean_object* l_Lean_Parser_Tactic_revert___closed__7;
-LEAN_EXPORT lean_object* l_getElem_x27___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_Tactic_allGoals___closed__5;
 static lean_object* l_Lean_Parser_Tactic_induction___closed__15;
 static lean_object* l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__2;
@@ -1106,7 +1098,9 @@ static lean_object* l_Lean_Parser_Tactic_tacticRefine__lift_____closed__2;
 static lean_object* l_term_____x5b___x5d___closed__10;
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic_tacticSuffices__;
 static lean_object* l_Lean_Parser_Tactic_withReducible___closed__3;
+static lean_object* l_Lean_Parser_Tactic_case___closed__13;
 static lean_object* l_Lean_Parser_Tactic_tacticUnhygienic_____closed__3;
+static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 static lean_object* l_Lean_Parser_Tactic_rotateLeft___closed__8;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticLet____1___closed__2;
 static lean_object* l_Lean_Parser_Tactic_rewriteSeq___closed__1;
@@ -1143,7 +1137,6 @@ static lean_object* l_Lean_Parser_Attr_simp___closed__9;
 static lean_object* l_Lean_Parser_Tactic_letrec___closed__10;
 static lean_object* l_Lean_Parser_Tactic_withAnnotateState___closed__23;
 static lean_object* l_Lean_Parser_Tactic_split___closed__8;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7;
 static lean_object* l_Lean_Parser_Tactic_tacticAdmit___closed__4;
 static lean_object* l_Lean_Parser_Tactic_refine_x27___closed__1;
 static lean_object* l_Lean_Parser_Tactic_specialize___closed__4;
@@ -1157,7 +1150,6 @@ static lean_object* l_Lean_Parser_Tactic_paren___closed__7;
 static lean_object* l_Lean_Parser_Tactic_letrec___closed__5;
 static lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRfl_x27__1___closed__9;
 static lean_object* l_Lean_Parser_Tactic_tacticSuffices_____closed__3;
-static lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5;
 static lean_object* l_Lean_Parser_Tactic_rwSeq___closed__5;
 static lean_object* l_Lean_Parser_Tactic_anyGoals___closed__4;
 static lean_object* l_Lean_Parser_Tactic_unfold___closed__7;
@@ -2901,24 +2893,44 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Tactic_case___closed__5() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
-x_2 = l_Lean_Parser_Tactic_case___closed__4;
-x_3 = l_Lean_binderIdent;
-x_4 = lean_alloc_ctor(2, 3, 0);
-lean_ctor_set(x_4, 0, x_1);
-lean_ctor_set(x_4, 1, x_2);
-lean_ctor_set(x_4, 2, x_3);
-return x_4;
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes(" | ", 3);
+return x_1;
 }
 }
 static lean_object* _init_l_Lean_Parser_Tactic_case___closed__6() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Parser_Tactic_case___closed__5;
+x_2 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; uint8_t x_4; lean_object* x_5; 
+x_1 = l_Lean_Parser_Tactic_caseArg;
+x_2 = l_Lean_Parser_Tactic_case___closed__5;
+x_3 = l_Lean_Parser_Tactic_case___closed__6;
+x_4 = 0;
+x_5 = lean_alloc_ctor(11, 3, 1);
+lean_ctor_set(x_5, 0, x_1);
+lean_ctor_set(x_5, 1, x_2);
+lean_ctor_set(x_5, 2, x_3);
+lean_ctor_set_uint8(x_5, sizeof(void*)*3, x_4);
+return x_5;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__8() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
-x_2 = l_Lean_Parser_Tactic_case___closed__5;
-x_3 = l_Lean_Parser_Tactic_caseArg___closed__3;
+x_2 = l_Lean_Parser_Tactic_case___closed__4;
+x_3 = l_Lean_Parser_Tactic_case___closed__7;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2926,12 +2938,12 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_case___closed__7() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
-x_2 = l_Lean_Parser_Tactic_case___closed__6;
+x_2 = l_Lean_Parser_Tactic_case___closed__8;
 x_3 = l_Lean_Parser_Tactic_rename___closed__8;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
@@ -2940,7 +2952,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_case___closed__8() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -2948,33 +2960,33 @@ x_1 = lean_mk_string_from_bytes("tacticSeq", 9);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_case___closed__9() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic_case___closed__8;
+x_2 = l_Lean_Parser_Tactic_case___closed__10;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_case___closed__10() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Tactic_case___closed__9;
+x_1 = l_Lean_Parser_Tactic_case___closed__11;
 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_Parser_Tactic_case___closed__11() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
-x_2 = l_Lean_Parser_Tactic_case___closed__7;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_2 = l_Lean_Parser_Tactic_case___closed__9;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2982,13 +2994,13 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic_case___closed__12() {
+static lean_object* _init_l_Lean_Parser_Tactic_case___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_case___closed__2;
 x_2 = lean_unsigned_to_nat(1022u);
-x_3 = l_Lean_Parser_Tactic_case___closed__11;
+x_3 = l_Lean_Parser_Tactic_case___closed__13;
 x_4 = lean_alloc_ctor(3, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3000,7 +3012,7 @@ static lean_object* _init_l_Lean_Parser_Tactic_case() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Tactic_case___closed__12;
+x_1 = l_Lean_Parser_Tactic_case___closed__14;
 return x_1;
 }
 }
@@ -3048,7 +3060,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_case_x27___closed__4;
-x_3 = l_Lean_binderIdent;
+x_3 = l_Lean_Parser_Tactic_case___closed__7;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3062,7 +3074,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_case_x27___closed__5;
-x_3 = l_Lean_Parser_Tactic_caseArg___closed__3;
+x_3 = l_Lean_Parser_Tactic_rename___closed__8;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3076,7 +3088,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_case_x27___closed__6;
-x_3 = l_Lean_Parser_Tactic_rename___closed__8;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3088,23 +3100,9 @@ static lean_object* _init_l_Lean_Parser_Tactic_case_x27___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
-x_2 = l_Lean_Parser_Tactic_case_x27___closed__7;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
-x_4 = lean_alloc_ctor(2, 3, 0);
-lean_ctor_set(x_4, 0, x_1);
-lean_ctor_set(x_4, 1, x_2);
-lean_ctor_set(x_4, 2, x_3);
-return x_4;
-}
-}
-static lean_object* _init_l_Lean_Parser_Tactic_case_x27___closed__9() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_case_x27___closed__2;
 x_2 = lean_unsigned_to_nat(1022u);
-x_3 = l_Lean_Parser_Tactic_case_x27___closed__8;
+x_3 = l_Lean_Parser_Tactic_case_x27___closed__7;
 x_4 = lean_alloc_ctor(3, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3116,7 +3114,7 @@ static lean_object* _init_l_Lean_Parser_Tactic_case_x27() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Tactic_case_x27___closed__9;
+x_1 = l_Lean_Parser_Tactic_case_x27___closed__8;
 return x_1;
 }
 }
@@ -3192,7 +3190,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_tacticNext___x3d_x3e_____closed__6;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3226,7 +3224,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("Term", 4);
+x_1 = lean_mk_string_from_bytes("null", 4);
 return x_1;
 }
 }
@@ -3234,7 +3232,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__2;
+x_1 = lean_box(0);
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -3243,14 +3241,32 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("Term", 4);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__2;
+x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_binderIdent___closed__10;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -3258,7 +3274,7 @@ x_1 = lean_mk_string_from_bytes("_", 1);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -3267,24 +3283,6 @@ x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("null", 4);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8() {
 _start:
 {
@@ -3297,16 +3295,25 @@ return x_2;
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("=>", 2);
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(2u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
 }
 }
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("=>", 2);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(5u);
+x_1 = lean_unsigned_to_nat(4u);
 x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
@@ -3343,21 +3350,21 @@ x_13 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRul
 x_14 = !lean_is_exclusive(x_13);
 if (x_14 == 0)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
 x_15 = lean_ctor_get(x_13, 0);
 x_16 = l_Lean_Parser_Tactic_case___closed__1;
 lean_inc(x_15);
 x_17 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_17, 0, x_15);
 lean_ctor_set(x_17, 1, x_16);
-x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_15);
 x_19 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_19, 0, x_15);
 lean_ctor_set(x_19, 1, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_21 = lean_array_push(x_20, x_19);
-x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_15);
 x_23 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_23, 0, x_15);
@@ -3373,93 +3380,121 @@ lean_ctor_set(x_26, 2, x_24);
 x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 x_28 = l_Array_appendCore___rarg(x_27, x_12);
 lean_dec(x_12);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_15);
 x_30 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_30, 0, x_15);
 lean_ctor_set(x_30, 1, x_29);
 lean_ctor_set(x_30, 2, x_28);
 x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
+x_32 = lean_array_push(x_31, x_26);
+x_33 = lean_array_push(x_32, x_30);
+x_34 = l_Lean_Parser_Tactic_caseArg___closed__2;
 lean_inc(x_15);
-x_32 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_32, 0, x_15);
-lean_ctor_set(x_32, 1, x_31);
-x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
-x_34 = lean_array_push(x_33, x_17);
-x_35 = lean_array_push(x_34, x_26);
-x_36 = lean_array_push(x_35, x_30);
-x_37 = lean_array_push(x_36, x_32);
-x_38 = lean_array_push(x_37, x_11);
-x_39 = l_Lean_Parser_Tactic_case___closed__2;
-x_40 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_40, 0, x_15);
-lean_ctor_set(x_40, 1, x_39);
-lean_ctor_set(x_40, 2, x_38);
-lean_ctor_set(x_13, 0, x_40);
+x_35 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_35, 0, x_15);
+lean_ctor_set(x_35, 1, x_34);
+lean_ctor_set(x_35, 2, x_33);
+x_36 = lean_array_push(x_20, x_35);
+lean_inc(x_15);
+x_37 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_37, 0, x_15);
+lean_ctor_set(x_37, 1, x_29);
+lean_ctor_set(x_37, 2, x_36);
+x_38 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+lean_inc(x_15);
+x_39 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_39, 0, x_15);
+lean_ctor_set(x_39, 1, x_38);
+x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
+x_41 = lean_array_push(x_40, x_17);
+x_42 = lean_array_push(x_41, x_37);
+x_43 = lean_array_push(x_42, x_39);
+x_44 = lean_array_push(x_43, x_11);
+x_45 = l_Lean_Parser_Tactic_case___closed__2;
+x_46 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_46, 0, x_15);
+lean_ctor_set(x_46, 1, x_45);
+lean_ctor_set(x_46, 2, x_44);
+lean_ctor_set(x_13, 0, x_46);
 return x_13;
 }
 else
 {
-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; 
-x_41 = lean_ctor_get(x_13, 0);
-x_42 = lean_ctor_get(x_13, 1);
-lean_inc(x_42);
-lean_inc(x_41);
+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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_47 = lean_ctor_get(x_13, 0);
+x_48 = lean_ctor_get(x_13, 1);
+lean_inc(x_48);
+lean_inc(x_47);
 lean_dec(x_13);
-x_43 = l_Lean_Parser_Tactic_case___closed__1;
-lean_inc(x_41);
-x_44 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_44, 0, x_41);
-lean_ctor_set(x_44, 1, x_43);
-x_45 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
-lean_inc(x_41);
-x_46 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_46, 0, x_41);
-lean_ctor_set(x_46, 1, x_45);
-x_47 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
-x_48 = lean_array_push(x_47, x_46);
-x_49 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
-lean_inc(x_41);
-x_50 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_50, 0, x_41);
+x_49 = l_Lean_Parser_Tactic_case___closed__1;
+lean_inc(x_47);
+x_50 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_50, 0, x_47);
 lean_ctor_set(x_50, 1, x_49);
-lean_ctor_set(x_50, 2, x_48);
-x_51 = lean_array_push(x_47, x_50);
-x_52 = l_Lean_binderIdent___closed__4;
-lean_inc(x_41);
-x_53 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_53, 0, x_41);
-lean_ctor_set(x_53, 1, x_52);
-lean_ctor_set(x_53, 2, x_51);
-x_54 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
-x_55 = l_Array_appendCore___rarg(x_54, x_12);
-lean_dec(x_12);
-x_56 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
-lean_inc(x_41);
-x_57 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_57, 0, x_41);
-lean_ctor_set(x_57, 1, x_56);
-lean_ctor_set(x_57, 2, x_55);
-x_58 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
-lean_inc(x_41);
-x_59 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_59, 0, x_41);
+x_51 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
+lean_inc(x_47);
+x_52 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_52, 0, x_47);
+lean_ctor_set(x_52, 1, x_51);
+x_53 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_54 = lean_array_push(x_53, x_52);
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+lean_inc(x_47);
+x_56 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_56, 0, x_47);
+lean_ctor_set(x_56, 1, x_55);
+lean_ctor_set(x_56, 2, x_54);
+x_57 = lean_array_push(x_53, x_56);
+x_58 = l_Lean_binderIdent___closed__4;
+lean_inc(x_47);
+x_59 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_59, 0, x_47);
 lean_ctor_set(x_59, 1, x_58);
-x_60 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
-x_61 = lean_array_push(x_60, x_44);
-x_62 = lean_array_push(x_61, x_53);
-x_63 = lean_array_push(x_62, x_57);
-x_64 = lean_array_push(x_63, x_59);
-x_65 = lean_array_push(x_64, x_11);
-x_66 = l_Lean_Parser_Tactic_case___closed__2;
-x_67 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_67, 0, x_41);
-lean_ctor_set(x_67, 1, x_66);
-lean_ctor_set(x_67, 2, x_65);
-x_68 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_68, 0, x_67);
-lean_ctor_set(x_68, 1, x_42);
-return x_68;
+lean_ctor_set(x_59, 2, x_57);
+x_60 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
+x_61 = l_Array_appendCore___rarg(x_60, x_12);
+lean_dec(x_12);
+x_62 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+lean_inc(x_47);
+x_63 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_63, 0, x_47);
+lean_ctor_set(x_63, 1, x_62);
+lean_ctor_set(x_63, 2, x_61);
+x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
+x_65 = lean_array_push(x_64, x_59);
+x_66 = lean_array_push(x_65, x_63);
+x_67 = l_Lean_Parser_Tactic_caseArg___closed__2;
+lean_inc(x_47);
+x_68 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_68, 0, x_47);
+lean_ctor_set(x_68, 1, x_67);
+lean_ctor_set(x_68, 2, x_66);
+x_69 = lean_array_push(x_53, x_68);
+lean_inc(x_47);
+x_70 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_70, 0, x_47);
+lean_ctor_set(x_70, 1, x_62);
+lean_ctor_set(x_70, 2, x_69);
+x_71 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+lean_inc(x_47);
+x_72 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_72, 0, x_47);
+lean_ctor_set(x_72, 1, x_71);
+x_73 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
+x_74 = lean_array_push(x_73, x_50);
+x_75 = lean_array_push(x_74, x_70);
+x_76 = lean_array_push(x_75, x_72);
+x_77 = lean_array_push(x_76, x_11);
+x_78 = l_Lean_Parser_Tactic_case___closed__2;
+x_79 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_79, 0, x_47);
+lean_ctor_set(x_79, 1, x_78);
+lean_ctor_set(x_79, 2, x_77);
+x_80 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_80, 0, x_79);
+lean_ctor_set(x_80, 1, x_48);
+return x_80;
 }
 }
 }
@@ -3508,7 +3543,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_allGoals___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3582,7 +3617,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_anyGoals___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3656,7 +3691,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_focus___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3996,7 +4031,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_failIfSuccess___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4070,7 +4105,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_paren___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4176,7 +4211,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_withReducible___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4250,7 +4285,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_withReducibleAndInstances___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4324,7 +4359,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_withUnfoldingAll___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4476,7 +4511,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_first___closed__12;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4806,7 +4841,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_tacticTry_____closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4841,7 +4876,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__4;
-x_2 = l_Lean_Parser_Tactic_case___closed__8;
+x_2 = l_Lean_Parser_Tactic_case___closed__10;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -4867,26 +4902,17 @@ return x_3;
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(2u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string_from_bytes("tacticSeq1Indented", 18);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__4;
-x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
+x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -4931,7 +4957,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_18 = lean_array_push(x_17, x_16);
 lean_inc(x_18);
 x_19 = lean_array_push(x_18, x_9);
@@ -4946,7 +4972,7 @@ lean_inc(x_12);
 x_23 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_23, 0, x_12);
 lean_ctor_set(x_23, 1, x_22);
-x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_25 = lean_array_push(x_24, x_23);
 x_26 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_12);
@@ -4955,14 +4981,14 @@ lean_ctor_set(x_27, 0, x_12);
 lean_ctor_set(x_27, 1, x_26);
 lean_ctor_set(x_27, 2, x_25);
 x_28 = lean_array_push(x_24, x_27);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_30 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_30, 0, x_12);
 lean_ctor_set(x_30, 1, x_29);
 lean_ctor_set(x_30, 2, x_28);
 x_31 = lean_array_push(x_24, x_30);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_12);
 x_33 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_33, 0, x_12);
@@ -5029,7 +5055,7 @@ lean_inc(x_51);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_51);
 lean_ctor_set(x_56, 1, x_55);
-x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_58 = lean_array_push(x_57, x_56);
 lean_inc(x_58);
 x_59 = lean_array_push(x_58, x_9);
@@ -5044,7 +5070,7 @@ lean_inc(x_51);
 x_63 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_63, 0, x_51);
 lean_ctor_set(x_63, 1, x_62);
-x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_65 = lean_array_push(x_64, x_63);
 x_66 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_51);
@@ -5053,14 +5079,14 @@ lean_ctor_set(x_67, 0, x_51);
 lean_ctor_set(x_67, 1, x_66);
 lean_ctor_set(x_67, 2, x_65);
 x_68 = lean_array_push(x_64, x_67);
-x_69 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_69 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_51);
 x_70 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_70, 0, x_51);
 lean_ctor_set(x_70, 1, x_69);
 lean_ctor_set(x_70, 2, x_68);
 x_71 = lean_array_push(x_64, x_70);
-x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_51);
 x_73 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_73, 0, x_51);
@@ -5213,6 +5239,15 @@ x_1 = lean_mk_string_from_bytes("all_goals", 9);
 return x_1;
 }
 }
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(5u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -5252,7 +5287,7 @@ lean_inc(x_16);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_16);
 x_21 = lean_alloc_ctor(1, 3, 0);
@@ -5269,7 +5304,7 @@ lean_inc(x_16);
 x_25 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_25, 0, x_16);
 lean_ctor_set(x_25, 1, x_24);
-x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_27 = lean_array_push(x_26, x_25);
 x_28 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_16);
@@ -5299,7 +5334,7 @@ lean_ctor_set(x_39, 0, x_16);
 lean_ctor_set(x_39, 1, x_19);
 lean_ctor_set(x_39, 2, x_38);
 x_40 = lean_array_push(x_26, x_39);
-x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_16);
 x_42 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_42, 0, x_16);
@@ -5312,7 +5347,7 @@ x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_16);
 lean_ctor_set(x_45, 1, x_44);
 lean_ctor_set(x_45, 2, x_43);
-x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_47 = lean_array_push(x_46, x_37);
 x_48 = lean_array_push(x_47, x_45);
 x_49 = l_Lean_Parser_Tactic_allGoals___closed__2;
@@ -5321,7 +5356,7 @@ x_50 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_50, 0, x_16);
 lean_ctor_set(x_50, 1, x_49);
 lean_ctor_set(x_50, 2, x_48);
-x_51 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_51 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_52 = lean_array_push(x_51, x_9);
 lean_inc(x_21);
 x_53 = lean_array_push(x_52, x_21);
@@ -5368,7 +5403,7 @@ lean_inc(x_66);
 x_69 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_69, 0, x_66);
 lean_ctor_set(x_69, 1, x_68);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_71 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_66);
 x_72 = lean_alloc_ctor(1, 3, 0);
@@ -5385,7 +5420,7 @@ lean_inc(x_66);
 x_76 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_76, 0, x_66);
 lean_ctor_set(x_76, 1, x_75);
-x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_78 = lean_array_push(x_77, x_76);
 x_79 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_66);
@@ -5415,7 +5450,7 @@ lean_ctor_set(x_90, 0, x_66);
 lean_ctor_set(x_90, 1, x_70);
 lean_ctor_set(x_90, 2, x_89);
 x_91 = lean_array_push(x_77, x_90);
-x_92 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_92 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_66);
 x_93 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_93, 0, x_66);
@@ -5428,7 +5463,7 @@ x_96 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_96, 0, x_66);
 lean_ctor_set(x_96, 1, x_95);
 lean_ctor_set(x_96, 2, x_94);
-x_97 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_97 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_98 = lean_array_push(x_97, x_88);
 x_99 = lean_array_push(x_98, x_96);
 x_100 = l_Lean_Parser_Tactic_allGoals___closed__2;
@@ -5437,7 +5472,7 @@ x_101 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_101, 0, x_66);
 lean_ctor_set(x_101, 1, x_100);
 lean_ctor_set(x_101, 2, x_99);
-x_102 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_102 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_103 = lean_array_push(x_102, x_9);
 lean_inc(x_72);
 x_104 = lean_array_push(x_103, x_72);
@@ -5626,7 +5661,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_refl___closed__2;
 lean_inc(x_10);
@@ -5635,7 +5670,7 @@ lean_ctor_set(x_16, 0, x_10);
 lean_ctor_set(x_16, 1, x_15);
 lean_ctor_set(x_16, 2, x_14);
 x_17 = lean_array_push(x_13, x_16);
-x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_19 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_19, 0, x_10);
@@ -5663,7 +5698,7 @@ lean_inc(x_23);
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_23);
 lean_ctor_set(x_26, 1, x_25);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_28 = lean_array_push(x_27, x_26);
 x_29 = l_Lean_Parser_Tactic_refl___closed__2;
 lean_inc(x_23);
@@ -5672,7 +5707,7 @@ lean_ctor_set(x_30, 0, x_23);
 lean_ctor_set(x_30, 1, x_29);
 lean_ctor_set(x_30, 2, x_28);
 x_31 = lean_array_push(x_27, x_30);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_23);
 x_33 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_33, 0, x_23);
@@ -5901,7 +5936,7 @@ lean_inc(x_10);
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_10);
 lean_ctor_set(x_27, 1, x_26);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_29 = lean_array_push(x_28, x_27);
 x_30 = l_Lean_Parser_Tactic_tacticRfl___closed__2;
 lean_inc(x_10);
@@ -5910,14 +5945,14 @@ lean_ctor_set(x_31, 0, x_10);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
 x_32 = lean_array_push(x_28, x_31);
-x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_34 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_34, 0, x_10);
 lean_ctor_set(x_34, 1, x_33);
 lean_ctor_set(x_34, 2, x_32);
 x_35 = lean_array_push(x_28, x_34);
-x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_10);
 x_37 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_37, 0, x_10);
@@ -5930,7 +5965,7 @@ x_40 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_40, 0, x_10);
 lean_ctor_set(x_40, 1, x_39);
 lean_ctor_set(x_40, 2, x_38);
-x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_42 = lean_array_push(x_41, x_25);
 x_43 = lean_array_push(x_42, x_40);
 x_44 = l_Lean_Parser_Tactic_withUnfoldingAll___closed__2;
@@ -5957,7 +5992,7 @@ x_51 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_51, 0, x_10);
 lean_ctor_set(x_51, 1, x_39);
 lean_ctor_set(x_51, 2, x_50);
-x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_53 = lean_array_push(x_52, x_14);
 x_54 = lean_array_push(x_53, x_19);
 x_55 = lean_array_push(x_54, x_21);
@@ -6032,7 +6067,7 @@ lean_inc(x_65);
 x_83 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_83, 0, x_65);
 lean_ctor_set(x_83, 1, x_82);
-x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_85 = lean_array_push(x_84, x_83);
 x_86 = l_Lean_Parser_Tactic_tacticRfl___closed__2;
 lean_inc(x_65);
@@ -6041,14 +6076,14 @@ lean_ctor_set(x_87, 0, x_65);
 lean_ctor_set(x_87, 1, x_86);
 lean_ctor_set(x_87, 2, x_85);
 x_88 = lean_array_push(x_84, x_87);
-x_89 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_89 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_65);
 x_90 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_90, 0, x_65);
 lean_ctor_set(x_90, 1, x_89);
 lean_ctor_set(x_90, 2, x_88);
 x_91 = lean_array_push(x_84, x_90);
-x_92 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_92 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_65);
 x_93 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_93, 0, x_65);
@@ -6061,7 +6096,7 @@ x_96 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_96, 0, x_65);
 lean_ctor_set(x_96, 1, x_95);
 lean_ctor_set(x_96, 2, x_94);
-x_97 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_97 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_98 = lean_array_push(x_97, x_81);
 x_99 = lean_array_push(x_98, x_96);
 x_100 = l_Lean_Parser_Tactic_withUnfoldingAll___closed__2;
@@ -6088,7 +6123,7 @@ x_107 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_107, 0, x_65);
 lean_ctor_set(x_107, 1, x_95);
 lean_ctor_set(x_107, 2, x_106);
-x_108 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_108 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_109 = lean_array_push(x_108, x_70);
 x_110 = lean_array_push(x_109, x_75);
 x_111 = lean_array_push(x_110, x_77);
@@ -6252,7 +6287,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -6270,7 +6305,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__3;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -6487,7 +6522,7 @@ lean_ctor_set(x_21, 0, x_10);
 lean_ctor_set(x_21, 1, x_19);
 lean_ctor_set(x_21, 2, x_18);
 lean_ctor_set(x_21, 3, x_20);
-x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_23 = lean_array_push(x_22, x_16);
 x_24 = lean_array_push(x_23, x_21);
 x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__4;
@@ -6496,14 +6531,14 @@ x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_10);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_10);
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_10);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_30 = lean_array_push(x_29, x_28);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_10);
 x_32 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_32, 0, x_10);
@@ -6521,7 +6556,7 @@ lean_ctor_set(x_37, 2, x_34);
 lean_ctor_set(x_37, 3, x_36);
 x_38 = lean_array_push(x_22, x_32);
 x_39 = lean_array_push(x_38, x_37);
-x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_41 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_41, 0, x_10);
@@ -6593,7 +6628,7 @@ lean_ctor_set(x_67, 0, x_55);
 lean_ctor_set(x_67, 1, x_65);
 lean_ctor_set(x_67, 2, x_64);
 lean_ctor_set(x_67, 3, x_66);
-x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_69 = lean_array_push(x_68, x_62);
 x_70 = lean_array_push(x_69, x_67);
 x_71 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__4;
@@ -6602,14 +6637,14 @@ x_72 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_72, 0, x_55);
 lean_ctor_set(x_72, 1, x_71);
 lean_ctor_set(x_72, 2, x_70);
-x_73 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_73 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_55);
 x_74 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_74, 0, x_55);
 lean_ctor_set(x_74, 1, x_73);
-x_75 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_75 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_76 = lean_array_push(x_75, x_74);
-x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_55);
 x_78 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_78, 0, x_55);
@@ -6627,7 +6662,7 @@ lean_ctor_set(x_83, 2, x_80);
 lean_ctor_set(x_83, 3, x_82);
 x_84 = lean_array_push(x_68, x_78);
 x_85 = lean_array_push(x_84, x_83);
-x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_55);
 x_87 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_87, 0, x_55);
@@ -6782,7 +6817,7 @@ lean_ctor_set(x_21, 0, x_10);
 lean_ctor_set(x_21, 1, x_19);
 lean_ctor_set(x_21, 2, x_18);
 lean_ctor_set(x_21, 3, x_20);
-x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_23 = lean_array_push(x_22, x_16);
 x_24 = lean_array_push(x_23, x_21);
 x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__4;
@@ -6791,14 +6826,14 @@ x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_10);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_10);
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_10);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_30 = lean_array_push(x_29, x_28);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_10);
 x_32 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_32, 0, x_10);
@@ -6816,7 +6851,7 @@ lean_ctor_set(x_37, 2, x_34);
 lean_ctor_set(x_37, 3, x_36);
 x_38 = lean_array_push(x_22, x_32);
 x_39 = lean_array_push(x_38, x_37);
-x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_41 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_41, 0, x_10);
@@ -6888,7 +6923,7 @@ lean_ctor_set(x_67, 0, x_55);
 lean_ctor_set(x_67, 1, x_65);
 lean_ctor_set(x_67, 2, x_64);
 lean_ctor_set(x_67, 3, x_66);
-x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_69 = lean_array_push(x_68, x_62);
 x_70 = lean_array_push(x_69, x_67);
 x_71 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__4;
@@ -6897,14 +6932,14 @@ x_72 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_72, 0, x_55);
 lean_ctor_set(x_72, 1, x_71);
 lean_ctor_set(x_72, 2, x_70);
-x_73 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_73 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_55);
 x_74 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_74, 0, x_55);
 lean_ctor_set(x_74, 1, x_73);
-x_75 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_75 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_76 = lean_array_push(x_75, x_74);
-x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_55);
 x_78 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_78, 0, x_55);
@@ -6922,7 +6957,7 @@ lean_ctor_set(x_83, 2, x_80);
 lean_ctor_set(x_83, 3, x_82);
 x_84 = lean_array_push(x_68, x_78);
 x_85 = lean_array_push(x_84, x_83);
-x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_55);
 x_87 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_87, 0, x_55);
@@ -7157,7 +7192,7 @@ lean_ctor_set(x_19, 0, x_10);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_16);
 lean_ctor_set(x_19, 3, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_21 = lean_array_push(x_20, x_14);
 x_22 = lean_array_push(x_21, x_19);
 x_23 = l_Lean_Parser_Tactic_exact___closed__2;
@@ -7166,9 +7201,9 @@ x_24 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_24, 0, x_10);
 lean_ctor_set(x_24, 1, x_23);
 lean_ctor_set(x_24, 2, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_26 = lean_array_push(x_25, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_28 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_28, 0, x_10);
@@ -7211,7 +7246,7 @@ lean_ctor_set(x_42, 0, x_32);
 lean_ctor_set(x_42, 1, x_40);
 lean_ctor_set(x_42, 2, x_39);
 lean_ctor_set(x_42, 3, x_41);
-x_43 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_43 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_44 = lean_array_push(x_43, x_37);
 x_45 = lean_array_push(x_44, x_42);
 x_46 = l_Lean_Parser_Tactic_exact___closed__2;
@@ -7220,9 +7255,9 @@ x_47 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_47, 0, x_32);
 lean_ctor_set(x_47, 1, x_46);
 lean_ctor_set(x_47, 2, x_45);
-x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_49 = lean_array_push(x_48, x_47);
-x_50 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_50 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_32);
 x_51 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_51, 0, x_32);
@@ -8369,21 +8404,12 @@ return x_1;
 static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(4u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string_from_bytes(";", 1);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -8391,7 +8417,7 @@ x_1 = lean_mk_string_from_bytes("try", 3);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -8399,7 +8425,7 @@ x_1 = lean_mk_string_from_bytes("with_reducible", 14);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6() {
+static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -8551,7 +8577,7 @@ lean_ctor_set(x_32, 1, x_31);
 x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 x_34 = l_Array_appendCore___rarg(x_33, x_24);
 lean_dec(x_24);
-x_35 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_35 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_26);
 x_36 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_36, 0, x_26);
@@ -8571,9 +8597,9 @@ x_43 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_43, 0, x_26);
 lean_ctor_set(x_43, 1, x_16);
 lean_ctor_set(x_43, 2, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_45 = lean_array_push(x_44, x_30);
-x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_26);
 x_47 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_47, 0, x_26);
@@ -8588,12 +8614,12 @@ lean_inc(x_26);
 x_51 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_51, 0, x_26);
 lean_ctor_set(x_51, 1, x_50);
-x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4;
+x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
 lean_inc(x_26);
 x_53 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_53, 0, x_26);
 lean_ctor_set(x_53, 1, x_52);
-x_54 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5;
+x_54 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4;
 lean_inc(x_26);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_26);
@@ -8603,7 +8629,7 @@ lean_inc(x_26);
 x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_26);
 lean_ctor_set(x_57, 1, x_56);
-x_58 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_58 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_59 = lean_array_push(x_58, x_57);
 x_60 = l_Lean_Parser_Tactic_tacticRfl___closed__2;
 lean_inc(x_26);
@@ -8618,7 +8644,7 @@ lean_ctor_set(x_63, 0, x_26);
 lean_ctor_set(x_63, 1, x_35);
 lean_ctor_set(x_63, 2, x_62);
 x_64 = lean_array_push(x_58, x_63);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_26);
 x_66 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_66, 0, x_26);
@@ -8631,7 +8657,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_26);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_71 = lean_array_push(x_70, x_55);
 x_72 = lean_array_push(x_71, x_69);
 x_73 = l_Lean_Parser_Tactic_withReducible___closed__2;
@@ -8764,7 +8790,7 @@ x_116 = lean_array_push(x_115, x_43);
 if (lean_obj_tag(x_18) == 0)
 {
 lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
-x_117 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6;
+x_117 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5;
 lean_inc(x_26);
 x_118 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_118, 0, x_26);
@@ -9011,9 +9037,23 @@ static lean_object* _init_l_Lean_Parser_Tactic_injections___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
+x_2 = l_Lean_Parser_Tactic_injections___closed__3;
+x_3 = l_Lean_Parser_Tactic_intros___closed__6;
+x_4 = lean_alloc_ctor(2, 3, 0);
+lean_ctor_set(x_4, 0, x_1);
+lean_ctor_set(x_4, 1, x_2);
+lean_ctor_set(x_4, 2, x_3);
+return x_4;
+}
+}
+static lean_object* _init_l_Lean_Parser_Tactic_injections___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_injections___closed__2;
-x_2 = lean_unsigned_to_nat(1024u);
-x_3 = l_Lean_Parser_Tactic_injections___closed__3;
+x_2 = lean_unsigned_to_nat(1022u);
+x_3 = l_Lean_Parser_Tactic_injections___closed__4;
 x_4 = lean_alloc_ctor(3, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -9025,7 +9065,7 @@ static lean_object* _init_l_Lean_Parser_Tactic_injections() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Parser_Tactic_injections___closed__4;
+x_1 = l_Lean_Parser_Tactic_injections___closed__5;
 return x_1;
 }
 }
@@ -9139,7 +9179,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_discharger___closed__9;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -10343,7 +10383,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRefine__lift____1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -10407,7 +10447,7 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = lean_array_push(x_22, x_9);
 x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRefine__lift____1___closed__2;
@@ -10424,7 +10464,7 @@ x_29 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_29, 0, x_12);
 lean_ctor_set(x_29, 1, x_28);
 lean_ctor_set(x_29, 2, x_27);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_31 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_31, 0, x_12);
@@ -10434,7 +10474,7 @@ lean_inc(x_12);
 x_33 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_33, 0, x_12);
 lean_ctor_set(x_33, 1, x_32);
-x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_35 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_12);
 x_36 = lean_alloc_ctor(1, 3, 0);
@@ -10458,9 +10498,9 @@ x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
 lean_ctor_set(x_45, 1, x_34);
 lean_ctor_set(x_45, 2, x_44);
-x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_47 = lean_array_push(x_46, x_45);
-x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_12);
 x_49 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_49, 0, x_12);
@@ -10556,7 +10596,7 @@ lean_inc(x_75);
 x_84 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_84, 0, x_75);
 lean_ctor_set(x_84, 1, x_83);
-x_85 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_85 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_86 = lean_array_push(x_85, x_84);
 x_87 = lean_array_push(x_86, x_9);
 x_88 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRefine__lift____1___closed__2;
@@ -10573,7 +10613,7 @@ x_93 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_93, 0, x_75);
 lean_ctor_set(x_93, 1, x_92);
 lean_ctor_set(x_93, 2, x_91);
-x_94 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_94 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_75);
 x_95 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_95, 0, x_75);
@@ -10583,7 +10623,7 @@ lean_inc(x_75);
 x_97 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_97, 0, x_75);
 lean_ctor_set(x_97, 1, x_96);
-x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_99 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_75);
 x_100 = lean_alloc_ctor(1, 3, 0);
@@ -10607,9 +10647,9 @@ x_109 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_109, 0, x_75);
 lean_ctor_set(x_109, 1, x_98);
 lean_ctor_set(x_109, 2, x_108);
-x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_111 = lean_array_push(x_110, x_109);
-x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_75);
 x_113 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_113, 0, x_75);
@@ -10804,7 +10844,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__2;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -10822,7 +10862,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -10876,7 +10916,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
@@ -10886,20 +10926,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -10908,7 +10948,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_9);
 x_35 = lean_array_push(x_34, x_18);
@@ -10928,7 +10968,7 @@ lean_ctor_set(x_42, 0, x_12);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_40);
 x_43 = lean_array_push(x_23, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
@@ -10961,7 +11001,7 @@ lean_inc(x_49);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_49);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
@@ -10971,20 +11011,20 @@ lean_inc(x_49);
 x_58 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_58, 0, x_49);
 lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_60 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_60, 0, x_49);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_62 = lean_array_push(x_61, x_60);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_64 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_64, 0, x_49);
 lean_ctor_set(x_64, 1, x_63);
 lean_ctor_set(x_64, 2, x_62);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_66 = lean_array_push(x_65, x_58);
 x_67 = lean_array_push(x_66, x_64);
 x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -10993,7 +11033,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_49);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_71 = lean_array_push(x_70, x_54);
 x_72 = lean_array_push(x_71, x_9);
 x_73 = lean_array_push(x_72, x_56);
@@ -11013,7 +11053,7 @@ lean_ctor_set(x_80, 0, x_49);
 lean_ctor_set(x_80, 1, x_79);
 lean_ctor_set(x_80, 2, x_78);
 x_81 = lean_array_push(x_61, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_49);
 x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_49);
@@ -11147,7 +11187,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSuffices____1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -11193,7 +11233,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
@@ -11203,20 +11243,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11225,7 +11265,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_9);
 x_35 = lean_array_push(x_34, x_18);
@@ -11245,7 +11285,7 @@ lean_ctor_set(x_42, 0, x_12);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_40);
 x_43 = lean_array_push(x_23, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
@@ -11278,7 +11318,7 @@ lean_inc(x_49);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_49);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
@@ -11288,20 +11328,20 @@ lean_inc(x_49);
 x_58 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_58, 0, x_49);
 lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_60 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_60, 0, x_49);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_62 = lean_array_push(x_61, x_60);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_64 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_64, 0, x_49);
 lean_ctor_set(x_64, 1, x_63);
 lean_ctor_set(x_64, 2, x_62);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_66 = lean_array_push(x_65, x_58);
 x_67 = lean_array_push(x_66, x_64);
 x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11310,7 +11350,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_49);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_71 = lean_array_push(x_70, x_54);
 x_72 = lean_array_push(x_71, x_9);
 x_73 = lean_array_push(x_72, x_56);
@@ -11330,7 +11370,7 @@ lean_ctor_set(x_80, 0, x_49);
 lean_ctor_set(x_80, 1, x_79);
 lean_ctor_set(x_80, 2, x_78);
 x_81 = lean_array_push(x_61, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_49);
 x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_49);
@@ -11464,7 +11504,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticLet____1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -11510,7 +11550,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
@@ -11520,20 +11560,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11542,7 +11582,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_9);
 x_35 = lean_array_push(x_34, x_18);
@@ -11562,7 +11602,7 @@ lean_ctor_set(x_42, 0, x_12);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_40);
 x_43 = lean_array_push(x_23, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
@@ -11595,7 +11635,7 @@ lean_inc(x_49);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_49);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
@@ -11605,20 +11645,20 @@ lean_inc(x_49);
 x_58 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_58, 0, x_49);
 lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_60 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_60, 0, x_49);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_62 = lean_array_push(x_61, x_60);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_64 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_64, 0, x_49);
 lean_ctor_set(x_64, 1, x_63);
 lean_ctor_set(x_64, 2, x_62);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_66 = lean_array_push(x_65, x_58);
 x_67 = lean_array_push(x_66, x_64);
 x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11627,7 +11667,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_49);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_71 = lean_array_push(x_70, x_54);
 x_72 = lean_array_push(x_71, x_9);
 x_73 = lean_array_push(x_72, x_56);
@@ -11647,7 +11687,7 @@ lean_ctor_set(x_80, 0, x_49);
 lean_ctor_set(x_80, 1, x_79);
 lean_ctor_set(x_80, 2, x_78);
 x_81 = lean_array_push(x_61, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_49);
 x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_49);
@@ -11753,7 +11793,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticShow____1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -11771,7 +11811,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticShow____1___closed__3;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -11835,20 +11875,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11884,7 +11924,7 @@ lean_ctor_set(x_45, 0, x_12);
 lean_ctor_set(x_45, 1, x_44);
 lean_ctor_set(x_45, 2, x_43);
 x_46 = lean_array_push(x_23, x_45);
-x_47 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_47 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_48 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_48, 0, x_12);
@@ -11927,20 +11967,20 @@ lean_inc(x_52);
 x_61 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_61, 0, x_52);
 lean_ctor_set(x_61, 1, x_60);
-x_62 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_62 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_52);
 x_63 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_63, 0, x_52);
 lean_ctor_set(x_63, 1, x_62);
-x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_65 = lean_array_push(x_64, x_63);
-x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_52);
 x_67 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_67, 0, x_52);
 lean_ctor_set(x_67, 1, x_66);
 lean_ctor_set(x_67, 2, x_65);
-x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_69 = lean_array_push(x_68, x_61);
 x_70 = lean_array_push(x_69, x_67);
 x_71 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -11976,7 +12016,7 @@ lean_ctor_set(x_86, 0, x_52);
 lean_ctor_set(x_86, 1, x_85);
 lean_ctor_set(x_86, 2, x_84);
 x_87 = lean_array_push(x_64, x_86);
-x_88 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_88 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_52);
 x_89 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_89, 0, x_52);
@@ -12150,7 +12190,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic_letrec___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -12209,7 +12249,7 @@ lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_20 = lean_array_push(x_19, x_16);
 x_21 = lean_array_push(x_20, x_18);
 x_22 = l_Lean_Parser_Tactic_first___closed__8;
@@ -12218,7 +12258,7 @@ x_23 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_23, 0, x_12);
 lean_ctor_set(x_23, 1, x_22);
 lean_ctor_set(x_23, 2, x_21);
-x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_25 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_25, 0, x_12);
@@ -12228,14 +12268,14 @@ lean_inc(x_12);
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_12);
 lean_ctor_set(x_27, 1, x_26);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_12);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_31 = lean_array_push(x_30, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_33 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_33, 0, x_12);
@@ -12249,7 +12289,7 @@ x_37 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_37, 0, x_12);
 lean_ctor_set(x_37, 1, x_36);
 lean_ctor_set(x_37, 2, x_35);
-x_38 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_38 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_39 = lean_array_push(x_38, x_23);
 x_40 = lean_array_push(x_39, x_9);
 x_41 = lean_array_push(x_40, x_25);
@@ -12293,7 +12333,7 @@ lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
 lean_ctor_set(x_56, 1, x_55);
-x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_58 = lean_array_push(x_57, x_54);
 x_59 = lean_array_push(x_58, x_56);
 x_60 = l_Lean_Parser_Tactic_first___closed__8;
@@ -12302,7 +12342,7 @@ x_61 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_61, 0, x_49);
 lean_ctor_set(x_61, 1, x_60);
 lean_ctor_set(x_61, 2, x_59);
-x_62 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_62 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_63 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_63, 0, x_49);
@@ -12312,14 +12352,14 @@ lean_inc(x_49);
 x_65 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_65, 0, x_49);
 lean_ctor_set(x_65, 1, x_64);
-x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_67 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_67, 0, x_49);
 lean_ctor_set(x_67, 1, x_66);
-x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_69 = lean_array_push(x_68, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_71 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_71, 0, x_49);
@@ -12333,7 +12373,7 @@ x_75 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_75, 0, x_49);
 lean_ctor_set(x_75, 1, x_74);
 lean_ctor_set(x_75, 2, x_73);
-x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_77 = lean_array_push(x_76, x_61);
 x_78 = lean_array_push(x_77, x_9);
 x_79 = lean_array_push(x_78, x_63);
@@ -12483,7 +12523,7 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = lean_array_push(x_22, x_9);
 x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRefine__lift____1___closed__2;
@@ -12500,7 +12540,7 @@ x_29 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_29, 0, x_12);
 lean_ctor_set(x_29, 1, x_28);
 lean_ctor_set(x_29, 2, x_27);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_31 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_31, 0, x_12);
@@ -12510,7 +12550,7 @@ lean_inc(x_12);
 x_33 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_33, 0, x_12);
 lean_ctor_set(x_33, 1, x_32);
-x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_35 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_12);
 x_36 = lean_alloc_ctor(1, 3, 0);
@@ -12534,9 +12574,9 @@ x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
 lean_ctor_set(x_45, 1, x_34);
 lean_ctor_set(x_45, 2, x_44);
-x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_46 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_47 = lean_array_push(x_46, x_45);
-x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_12);
 x_49 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_49, 0, x_12);
@@ -12632,7 +12672,7 @@ lean_inc(x_75);
 x_84 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_84, 0, x_75);
 lean_ctor_set(x_84, 1, x_83);
-x_85 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_85 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_86 = lean_array_push(x_85, x_84);
 x_87 = lean_array_push(x_86, x_9);
 x_88 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticRefine__lift____1___closed__2;
@@ -12649,7 +12689,7 @@ x_93 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_93, 0, x_75);
 lean_ctor_set(x_93, 1, x_92);
 lean_ctor_set(x_93, 2, x_91);
-x_94 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_94 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_75);
 x_95 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_95, 0, x_75);
@@ -12659,7 +12699,7 @@ lean_inc(x_75);
 x_97 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_97, 0, x_75);
 lean_ctor_set(x_97, 1, x_96);
-x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_99 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_75);
 x_100 = lean_alloc_ctor(1, 3, 0);
@@ -12683,9 +12723,9 @@ x_109 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_109, 0, x_75);
 lean_ctor_set(x_109, 1, x_98);
 lean_ctor_set(x_109, 2, x_108);
-x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_111 = lean_array_push(x_110, x_109);
-x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_75);
 x_113 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_113, 0, x_75);
@@ -12880,7 +12920,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
@@ -12890,20 +12930,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -12912,7 +12952,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_9);
 x_35 = lean_array_push(x_34, x_18);
@@ -12932,7 +12972,7 @@ lean_ctor_set(x_42, 0, x_12);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_40);
 x_43 = lean_array_push(x_23, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
@@ -12965,7 +13005,7 @@ lean_inc(x_49);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_49);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
@@ -12975,20 +13015,20 @@ lean_inc(x_49);
 x_58 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_58, 0, x_49);
 lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_60 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_60, 0, x_49);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_62 = lean_array_push(x_61, x_60);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_64 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_64, 0, x_49);
 lean_ctor_set(x_64, 1, x_63);
 lean_ctor_set(x_64, 2, x_62);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_66 = lean_array_push(x_65, x_58);
 x_67 = lean_array_push(x_66, x_64);
 x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -12997,7 +13037,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_49);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_71 = lean_array_push(x_70, x_54);
 x_72 = lean_array_push(x_71, x_9);
 x_73 = lean_array_push(x_72, x_56);
@@ -13017,7 +13057,7 @@ lean_ctor_set(x_80, 0, x_49);
 lean_ctor_set(x_80, 1, x_79);
 lean_ctor_set(x_80, 2, x_78);
 x_81 = lean_array_push(x_61, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_49);
 x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_49);
@@ -13143,7 +13183,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic_tacticHave_____closed__5;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -13161,7 +13201,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave_x27___x3a_x3d____1___closed__2;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -13179,7 +13219,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave_x27___x3a_x3d____1___closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -13238,14 +13278,14 @@ lean_inc(x_14);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_14);
 x_19 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_19, 0, x_14);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_21 = lean_array_push(x_20, x_9);
 x_22 = lean_array_push(x_21, x_19);
 lean_inc(x_14);
@@ -13258,14 +13298,14 @@ lean_inc(x_14);
 x_25 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_25, 0, x_14);
 lean_ctor_set(x_25, 1, x_24);
-x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_14);
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_14);
 lean_ctor_set(x_27, 1, x_26);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_29 = lean_array_push(x_28, x_27);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_14);
 x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_14);
@@ -13290,7 +13330,7 @@ lean_inc(x_14);
 x_39 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_39, 0, x_14);
 lean_ctor_set(x_39, 1, x_38);
-x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_41 = lean_array_push(x_40, x_23);
 x_42 = lean_array_push(x_41, x_37);
 x_43 = lean_array_push(x_42, x_39);
@@ -13344,14 +13384,14 @@ lean_inc(x_59);
 x_62 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_62, 0, x_59);
 lean_ctor_set(x_62, 1, x_61);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_59);
 x_65 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_65, 0, x_59);
 lean_ctor_set(x_65, 1, x_63);
 lean_ctor_set(x_65, 2, x_64);
-x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_67 = lean_array_push(x_66, x_9);
 x_68 = lean_array_push(x_67, x_65);
 lean_inc(x_59);
@@ -13364,14 +13404,14 @@ lean_inc(x_59);
 x_71 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_71, 0, x_59);
 lean_ctor_set(x_71, 1, x_70);
-x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_59);
 x_73 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_73, 0, x_59);
 lean_ctor_set(x_73, 1, x_72);
-x_74 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_74 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_75 = lean_array_push(x_74, x_73);
-x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_59);
 x_77 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_77, 0, x_59);
@@ -13396,7 +13436,7 @@ lean_inc(x_59);
 x_85 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_85, 0, x_59);
 lean_ctor_set(x_85, 1, x_84);
-x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_86 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_87 = lean_array_push(x_86, x_69);
 x_88 = lean_array_push(x_87, x_83);
 x_89 = lean_array_push(x_88, x_85);
@@ -13556,7 +13596,7 @@ lean_inc(x_12);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
@@ -13566,20 +13606,20 @@ lean_inc(x_12);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_12);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_12);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_12);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_28 = lean_array_push(x_27, x_20);
 x_29 = lean_array_push(x_28, x_26);
 x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -13588,7 +13628,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_9);
 x_35 = lean_array_push(x_34, x_18);
@@ -13608,7 +13648,7 @@ lean_ctor_set(x_42, 0, x_12);
 lean_ctor_set(x_42, 1, x_41);
 lean_ctor_set(x_42, 2, x_40);
 x_43 = lean_array_push(x_23, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_45 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_45, 0, x_12);
@@ -13641,7 +13681,7 @@ lean_inc(x_49);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_49);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_49);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_49);
@@ -13651,20 +13691,20 @@ lean_inc(x_49);
 x_58 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_58, 0, x_49);
 lean_ctor_set(x_58, 1, x_57);
-x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_59 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_49);
 x_60 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_60, 0, x_49);
 lean_ctor_set(x_60, 1, x_59);
-x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_61 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_62 = lean_array_push(x_61, x_60);
-x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_63 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_49);
 x_64 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_64, 0, x_49);
 lean_ctor_set(x_64, 1, x_63);
 lean_ctor_set(x_64, 2, x_62);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_66 = lean_array_push(x_65, x_58);
 x_67 = lean_array_push(x_66, x_64);
 x_68 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -13673,7 +13713,7 @@ x_69 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_69, 0, x_49);
 lean_ctor_set(x_69, 1, x_68);
 lean_ctor_set(x_69, 2, x_67);
-x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
+x_70 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11;
 x_71 = lean_array_push(x_70, x_54);
 x_72 = lean_array_push(x_71, x_9);
 x_73 = lean_array_push(x_72, x_56);
@@ -13693,7 +13733,7 @@ lean_ctor_set(x_80, 0, x_49);
 lean_ctor_set(x_80, 1, x_79);
 lean_ctor_set(x_80, 2, x_78);
 x_81 = lean_array_push(x_61, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_49);
 x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_49);
@@ -14015,7 +14055,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_binderIdent___closed__6;
 x_2 = l_Lean_Parser_Tactic_inductionAlt___closed__13;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -15015,7 +15055,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_tacticRepeat_____closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -15114,7 +15154,7 @@ x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_12);
 lean_ctor_set(x_26, 1, x_25);
 lean_ctor_set(x_26, 2, x_24);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_12);
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_12);
@@ -15124,7 +15164,7 @@ lean_inc(x_12);
 x_30 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_30, 0, x_12);
 lean_ctor_set(x_30, 1, x_29);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_32 = lean_array_push(x_31, x_30);
 x_33 = lean_array_push(x_32, x_9);
 lean_inc(x_12);
@@ -15135,15 +15175,15 @@ lean_ctor_set(x_34, 2, x_33);
 x_35 = lean_array_push(x_21, x_26);
 x_36 = lean_array_push(x_35, x_28);
 x_37 = lean_array_push(x_36, x_34);
-x_38 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_38 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_39 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_39, 0, x_12);
 lean_ctor_set(x_39, 1, x_38);
 lean_ctor_set(x_39, 2, x_37);
-x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_40 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_41 = lean_array_push(x_40, x_39);
-x_42 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_42 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_12);
 x_43 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_43, 0, x_12);
@@ -15257,7 +15297,7 @@ x_86 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_86, 0, x_71);
 lean_ctor_set(x_86, 1, x_85);
 lean_ctor_set(x_86, 2, x_84);
-x_87 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_87 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_71);
 x_88 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_88, 0, x_71);
@@ -15267,7 +15307,7 @@ lean_inc(x_71);
 x_90 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_90, 0, x_71);
 lean_ctor_set(x_90, 1, x_89);
-x_91 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_91 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_92 = lean_array_push(x_91, x_90);
 x_93 = lean_array_push(x_92, x_9);
 lean_inc(x_71);
@@ -15278,15 +15318,15 @@ lean_ctor_set(x_94, 2, x_93);
 x_95 = lean_array_push(x_81, x_86);
 x_96 = lean_array_push(x_95, x_88);
 x_97 = lean_array_push(x_96, x_94);
-x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_98 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_71);
 x_99 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_99, 0, x_71);
 lean_ctor_set(x_99, 1, x_98);
 lean_ctor_set(x_99, 2, x_97);
-x_100 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_100 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_101 = lean_array_push(x_100, x_99);
-x_102 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_102 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_71);
 x_103 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_103, 0, x_71);
@@ -15657,7 +15697,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic_first___closed__8;
-x_2 = l_Lean_Parser_Tactic_case___closed__10;
+x_2 = l_Lean_Parser_Tactic_case___closed__12;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -15735,7 +15775,7 @@ lean_inc(x_10);
 x_14 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_14, 0, x_10);
 lean_ctor_set(x_14, 1, x_13);
-x_15 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_15 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_16 = lean_array_push(x_15, x_14);
 x_17 = l_Lean_Parser_Tactic_tacticSorry___closed__2;
 lean_inc(x_10);
@@ -15744,14 +15784,14 @@ lean_ctor_set(x_18, 0, x_10);
 lean_ctor_set(x_18, 1, x_17);
 lean_ctor_set(x_18, 2, x_16);
 x_19 = lean_array_push(x_15, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_21 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_21, 0, x_10);
 lean_ctor_set(x_21, 1, x_20);
 lean_ctor_set(x_21, 2, x_19);
 x_22 = lean_array_push(x_15, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_10);
 x_24 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_24, 0, x_10);
@@ -15764,7 +15804,7 @@ x_27 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_27, 0, x_10);
 lean_ctor_set(x_27, 1, x_26);
 lean_ctor_set(x_27, 2, x_25);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_29 = lean_array_push(x_28, x_12);
 x_30 = lean_array_push(x_29, x_27);
 x_31 = l_Lean_Parser_Tactic_tacticRepeat_____closed__2;
@@ -15806,7 +15846,7 @@ lean_inc(x_38);
 x_43 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_43, 0, x_38);
 lean_ctor_set(x_43, 1, x_42);
-x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_45 = lean_array_push(x_44, x_43);
 x_46 = l_Lean_Parser_Tactic_tacticSorry___closed__2;
 lean_inc(x_38);
@@ -15815,14 +15855,14 @@ lean_ctor_set(x_47, 0, x_38);
 lean_ctor_set(x_47, 1, x_46);
 lean_ctor_set(x_47, 2, x_45);
 x_48 = lean_array_push(x_44, x_47);
-x_49 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_49 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_38);
 x_50 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_50, 0, x_38);
 lean_ctor_set(x_50, 1, x_49);
 lean_ctor_set(x_50, 2, x_48);
 x_51 = lean_array_push(x_44, x_50);
-x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_52 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_38);
 x_53 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_53, 0, x_38);
@@ -15835,7 +15875,7 @@ x_56 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_56, 0, x_38);
 lean_ctor_set(x_56, 1, x_55);
 lean_ctor_set(x_56, 2, x_54);
-x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_57 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_58 = lean_array_push(x_57, x_41);
 x_59 = lean_array_push(x_58, x_56);
 x_60 = l_Lean_Parser_Tactic_tacticRepeat_____closed__2;
@@ -15968,7 +16008,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_assumption___closed__2;
 x_16 = lean_alloc_ctor(1, 3, 0);
@@ -15991,7 +16031,7 @@ lean_inc(x_17);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_17);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = l_Lean_Parser_Tactic_assumption___closed__2;
 x_24 = lean_alloc_ctor(1, 3, 0);
@@ -16036,7 +16076,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_tacticRfl___closed__2;
 x_16 = lean_alloc_ctor(1, 3, 0);
@@ -16059,7 +16099,7 @@ lean_inc(x_17);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_17);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = l_Lean_Parser_Tactic_tacticRfl___closed__2;
 x_24 = lean_alloc_ctor(1, 3, 0);
@@ -16104,7 +16144,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_contradiction___closed__2;
 x_16 = lean_alloc_ctor(1, 3, 0);
@@ -16127,7 +16167,7 @@ lean_inc(x_17);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_17);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = l_Lean_Parser_Tactic_contradiction___closed__2;
 x_24 = lean_alloc_ctor(1, 3, 0);
@@ -16190,7 +16230,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTrivial__4___closed__2;
 x_16 = lean_alloc_ctor(1, 3, 0);
@@ -16213,7 +16253,7 @@ lean_inc(x_17);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_17);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTrivial__4___closed__2;
 x_24 = lean_alloc_ctor(1, 3, 0);
@@ -16357,7 +16397,7 @@ lean_ctor_set(x_19, 0, x_10);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_16);
 lean_ctor_set(x_19, 3, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_21 = lean_array_push(x_20, x_14);
 x_22 = lean_array_push(x_21, x_19);
 x_23 = l_Lean_Parser_Tactic_apply___closed__2;
@@ -16396,7 +16436,7 @@ lean_ctor_set(x_35, 0, x_25);
 lean_ctor_set(x_35, 1, x_33);
 lean_ctor_set(x_35, 2, x_32);
 lean_ctor_set(x_35, 3, x_34);
-x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_37 = lean_array_push(x_36, x_30);
 x_38 = lean_array_push(x_37, x_35);
 x_39 = l_Lean_Parser_Tactic_apply___closed__2;
@@ -16549,7 +16589,7 @@ lean_ctor_set(x_19, 0, x_10);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_16);
 lean_ctor_set(x_19, 3, x_18);
-x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_20 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_21 = lean_array_push(x_20, x_14);
 x_22 = lean_array_push(x_21, x_19);
 x_23 = l_Lean_Parser_Tactic_apply___closed__2;
@@ -16568,7 +16608,7 @@ lean_inc(x_10);
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_10);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_30 = lean_array_push(x_29, x_28);
 lean_inc(x_10);
 x_31 = lean_alloc_ctor(1, 3, 0);
@@ -16615,7 +16655,7 @@ lean_ctor_set(x_48, 0, x_38);
 lean_ctor_set(x_48, 1, x_46);
 lean_ctor_set(x_48, 2, x_45);
 lean_ctor_set(x_48, 3, x_47);
-x_49 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_49 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_50 = lean_array_push(x_49, x_43);
 x_51 = lean_array_push(x_50, x_48);
 x_52 = l_Lean_Parser_Tactic_apply___closed__2;
@@ -16634,7 +16674,7 @@ lean_inc(x_38);
 x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_38);
 lean_ctor_set(x_57, 1, x_56);
-x_58 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_58 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_59 = lean_array_push(x_58, x_57);
 lean_inc(x_38);
 x_60 = lean_alloc_ctor(1, 3, 0);
@@ -16702,7 +16742,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_tacticUnhygienic_____closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -16842,7 +16882,7 @@ lean_inc(x_12);
 x_25 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_25, 0, x_12);
 lean_ctor_set(x_25, 1, x_24);
-x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_26 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_27 = lean_array_push(x_26, x_16);
 x_28 = lean_array_push(x_27, x_21);
 x_29 = lean_array_push(x_28, x_23);
@@ -16854,9 +16894,9 @@ x_33 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_33, 0, x_12);
 lean_ctor_set(x_33, 1, x_32);
 lean_ctor_set(x_33, 2, x_31);
-x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_34 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_35 = lean_array_push(x_34, x_33);
-x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_37 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_37, 0, x_12);
@@ -16909,7 +16949,7 @@ lean_inc(x_41);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_41);
 lean_ctor_set(x_55, 1, x_54);
-x_56 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_56 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_57 = lean_array_push(x_56, x_46);
 x_58 = lean_array_push(x_57, x_51);
 x_59 = lean_array_push(x_58, x_53);
@@ -16921,9 +16961,9 @@ x_63 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_63, 0, x_41);
 lean_ctor_set(x_63, 1, x_62);
 lean_ctor_set(x_63, 2, x_61);
-x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_65 = lean_array_push(x_64, x_63);
-x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_41);
 x_67 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_67, 0, x_41);
@@ -17073,7 +17113,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_Parser_Tactic_withAnnotateState___closed__8;
 x_2 = l_Lean_Parser_Tactic_checkpoint___closed__4;
-x_3 = l_Lean_Parser_Tactic_case___closed__10;
+x_3 = l_Lean_Parser_Tactic_case___closed__12;
 x_4 = lean_alloc_ctor(2, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -17185,7 +17225,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_10);
@@ -17194,7 +17234,7 @@ lean_ctor_set(x_16, 0, x_10);
 lean_ctor_set(x_16, 1, x_15);
 lean_ctor_set(x_16, 2, x_14);
 x_17 = lean_array_push(x_13, x_16);
-x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_18 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_19 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_19, 0, x_10);
@@ -17222,7 +17262,7 @@ lean_inc(x_23);
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_23);
 lean_ctor_set(x_26, 1, x_25);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_28 = lean_array_push(x_27, x_26);
 x_29 = l_Lean_Parser_Tactic_skip___closed__2;
 lean_inc(x_23);
@@ -17231,7 +17271,7 @@ lean_ctor_set(x_30, 0, x_23);
 lean_ctor_set(x_30, 1, x_29);
 lean_ctor_set(x_30, 2, x_28);
 x_31 = lean_array_push(x_27, x_30);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_23);
 x_33 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_33, 0, x_23);
@@ -17403,7 +17443,7 @@ static lean_object* _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRu
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticExists___x2c_x2c__1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -17486,20 +17526,20 @@ lean_inc(x_13);
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_13);
 lean_ctor_set(x_26, 1, x_25);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_13);
 x_28 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_28, 0, x_13);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_29 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_30 = lean_array_push(x_29, x_28);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_13);
 x_32 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_32, 0, x_13);
 lean_ctor_set(x_32, 1, x_31);
 lean_ctor_set(x_32, 2, x_30);
-x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_34 = lean_array_push(x_33, x_26);
 x_35 = lean_array_push(x_34, x_32);
 x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -17509,7 +17549,7 @@ lean_ctor_set(x_37, 0, x_13);
 lean_ctor_set(x_37, 1, x_36);
 lean_ctor_set(x_37, 2, x_35);
 x_38 = lean_array_push(x_24, x_37);
-x_39 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_39 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_13);
 x_40 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_40, 0, x_13);
@@ -17538,12 +17578,12 @@ x_52 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_52, 0, x_13);
 lean_ctor_set(x_52, 1, x_51);
 lean_ctor_set(x_52, 2, x_50);
-x_53 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_53 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_13);
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_13);
 lean_ctor_set(x_54, 1, x_53);
-x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4;
+x_55 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
 lean_inc(x_13);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_13);
@@ -17567,7 +17607,7 @@ lean_ctor_set(x_63, 0, x_13);
 lean_ctor_set(x_63, 1, x_39);
 lean_ctor_set(x_63, 2, x_62);
 x_64 = lean_array_push(x_29, x_63);
-x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_65 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_13);
 x_66 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_66, 0, x_13);
@@ -17661,20 +17701,20 @@ lean_inc(x_89);
 x_103 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_103, 0, x_89);
 lean_ctor_set(x_103, 1, x_102);
-x_104 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
+x_104 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__6;
 lean_inc(x_89);
 x_105 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_105, 0, x_89);
 lean_ctor_set(x_105, 1, x_104);
-x_106 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_106 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_107 = lean_array_push(x_106, x_105);
-x_108 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__3;
+x_108 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
 lean_inc(x_89);
 x_109 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_109, 0, x_89);
 lean_ctor_set(x_109, 1, x_108);
 lean_ctor_set(x_109, 2, x_107);
-x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_110 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_111 = lean_array_push(x_110, x_103);
 x_112 = lean_array_push(x_111, x_109);
 x_113 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticHave____1___closed__5;
@@ -17684,7 +17724,7 @@ lean_ctor_set(x_114, 0, x_89);
 lean_ctor_set(x_114, 1, x_113);
 lean_ctor_set(x_114, 2, x_112);
 x_115 = lean_array_push(x_101, x_114);
-x_116 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_116 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_89);
 x_117 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_117, 0, x_89);
@@ -17713,12 +17753,12 @@ x_129 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_129, 0, x_89);
 lean_ctor_set(x_129, 1, x_128);
 lean_ctor_set(x_129, 2, x_127);
-x_130 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_130 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_89);
 x_131 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_131, 0, x_89);
 lean_ctor_set(x_131, 1, x_130);
-x_132 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4;
+x_132 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
 lean_inc(x_89);
 x_133 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_133, 0, x_89);
@@ -17742,7 +17782,7 @@ lean_ctor_set(x_140, 0, x_89);
 lean_ctor_set(x_140, 1, x_116);
 lean_ctor_set(x_140, 2, x_139);
 x_141 = lean_array_push(x_106, x_140);
-x_142 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_142 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_89);
 x_143 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_143, 0, x_89);
@@ -18118,7 +18158,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__term_u2039___u
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l_Lean_Parser_Tactic_paren___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18136,7 +18176,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__term_u2039___u
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__2;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18162,7 +18202,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__term_u2039___u
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__5;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18213,7 +18253,7 @@ lean_inc(x_12);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_12);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_19 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_20 = lean_array_push(x_19, x_18);
 x_21 = l_Lean_Parser_Tactic_assumption___closed__2;
 lean_inc(x_12);
@@ -18222,14 +18262,14 @@ lean_ctor_set(x_22, 0, x_12);
 lean_ctor_set(x_22, 1, x_21);
 lean_ctor_set(x_22, 2, x_20);
 x_23 = lean_array_push(x_19, x_22);
-x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_12);
 x_25 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_25, 0, x_12);
 lean_ctor_set(x_25, 1, x_24);
 lean_ctor_set(x_25, 2, x_23);
 x_26 = lean_array_push(x_19, x_25);
-x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_27 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_12);
 x_28 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_28, 0, x_12);
@@ -18242,7 +18282,7 @@ x_31 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_31, 0, x_12);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
-x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_32 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_33 = lean_array_push(x_32, x_16);
 x_34 = lean_array_push(x_33, x_31);
 x_35 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__3;
@@ -18317,7 +18357,7 @@ lean_inc(x_56);
 x_63 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_63, 0, x_56);
 lean_ctor_set(x_63, 1, x_62);
-x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_64 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_65 = lean_array_push(x_64, x_63);
 x_66 = l_Lean_Parser_Tactic_assumption___closed__2;
 lean_inc(x_56);
@@ -18326,14 +18366,14 @@ lean_ctor_set(x_67, 0, x_56);
 lean_ctor_set(x_67, 1, x_66);
 lean_ctor_set(x_67, 2, x_65);
 x_68 = lean_array_push(x_64, x_67);
-x_69 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_69 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_56);
 x_70 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_70, 0, x_56);
 lean_ctor_set(x_70, 1, x_69);
 lean_ctor_set(x_70, 2, x_68);
 x_71 = lean_array_push(x_64, x_70);
-x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_72 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_56);
 x_73 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_73, 0, x_56);
@@ -18346,7 +18386,7 @@ x_76 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_76, 0, x_56);
 lean_ctor_set(x_76, 1, x_75);
 lean_ctor_set(x_76, 2, x_74);
-x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_77 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_78 = lean_array_push(x_77, x_61);
 x_79 = lean_array_push(x_78, x_76);
 x_80 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__3;
@@ -18493,7 +18533,7 @@ lean_inc(x_10);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_13 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_14 = lean_array_push(x_13, x_12);
 x_15 = l_Lean_Parser_Tactic_tacticTrivial___closed__2;
 x_16 = lean_alloc_ctor(1, 3, 0);
@@ -18516,7 +18556,7 @@ lean_inc(x_17);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_17);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_21 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_22 = lean_array_push(x_21, x_20);
 x_23 = l_Lean_Parser_Tactic_tacticTrivial___closed__2;
 x_24 = lean_alloc_ctor(1, 3, 0);
@@ -18543,7 +18583,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__tacticGet__ele
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18569,7 +18609,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__tacticGet__ele
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18587,7 +18627,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__tacticGet__ele
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__6;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18721,7 +18761,7 @@ static lean_object* _init_l___aux__Init__Tactics______macroRules__tacticGet__ele
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
+x_1 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__4;
 x_2 = l___aux__Init__Tactics______macroRules__tacticGet__elem__tactic__trivial__2___closed__19;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -18800,7 +18840,7 @@ lean_inc(x_10);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_10);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_23 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_10);
 x_25 = lean_alloc_ctor(1, 3, 0);
@@ -18819,7 +18859,7 @@ lean_ctor_set(x_30, 0, x_10);
 lean_ctor_set(x_30, 1, x_29);
 lean_ctor_set(x_30, 2, x_27);
 lean_ctor_set(x_30, 3, x_28);
-x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_31 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_32 = lean_array_push(x_31, x_30);
 lean_inc(x_25);
 x_33 = lean_array_push(x_32, x_25);
@@ -18850,7 +18890,7 @@ x_46 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_46, 0, x_10);
 lean_ctor_set(x_46, 1, x_45);
 lean_ctor_set(x_46, 2, x_44);
-x_47 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_47 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_48 = lean_array_push(x_47, x_46);
 lean_inc(x_10);
 x_49 = lean_alloc_ctor(1, 3, 0);
@@ -18890,7 +18930,7 @@ lean_inc(x_10);
 x_65 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_65, 0, x_10);
 lean_ctor_set(x_65, 1, x_64);
-x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_66 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_67 = lean_array_push(x_66, x_16);
 x_68 = lean_array_push(x_67, x_18);
 x_69 = lean_array_push(x_68, x_20);
@@ -18923,7 +18963,7 @@ x_83 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_83, 0, x_10);
 lean_ctor_set(x_83, 1, x_82);
 lean_ctor_set(x_83, 2, x_81);
-x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_10);
 x_85 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_85, 0, x_10);
@@ -18995,7 +19035,7 @@ lean_inc(x_98);
 x_111 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_111, 0, x_98);
 lean_ctor_set(x_111, 1, x_110);
-x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_112 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 x_113 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__8;
 lean_inc(x_98);
 x_114 = lean_alloc_ctor(1, 3, 0);
@@ -19014,7 +19054,7 @@ lean_ctor_set(x_119, 0, x_98);
 lean_ctor_set(x_119, 1, x_118);
 lean_ctor_set(x_119, 2, x_116);
 lean_ctor_set(x_119, 3, x_117);
-x_120 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_120 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_121 = lean_array_push(x_120, x_119);
 lean_inc(x_114);
 x_122 = lean_array_push(x_121, x_114);
@@ -19045,7 +19085,7 @@ x_135 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_135, 0, x_98);
 lean_ctor_set(x_135, 1, x_134);
 lean_ctor_set(x_135, 2, x_133);
-x_136 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_136 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_137 = lean_array_push(x_136, x_135);
 lean_inc(x_98);
 x_138 = lean_alloc_ctor(1, 3, 0);
@@ -19085,7 +19125,7 @@ lean_inc(x_98);
 x_154 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_154, 0, x_98);
 lean_ctor_set(x_154, 1, x_153);
-x_155 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10;
+x_155 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4;
 x_156 = lean_array_push(x_155, x_105);
 x_157 = lean_array_push(x_156, x_107);
 x_158 = lean_array_push(x_157, x_109);
@@ -19118,7 +19158,7 @@ x_172 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_172, 0, x_98);
 lean_ctor_set(x_172, 1, x_171);
 lean_ctor_set(x_172, 2, x_170);
-x_173 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__3;
+x_173 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__2;
 lean_inc(x_98);
 x_174 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_174, 0, x_98);
@@ -19265,7 +19305,7 @@ lean_inc(x_10);
 x_16 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_16, 0, x_10);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_17 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_18 = lean_array_push(x_17, x_16);
 x_19 = l_tacticGet__elem__tactic__trivial___closed__2;
 lean_inc(x_10);
@@ -19274,14 +19314,14 @@ lean_ctor_set(x_20, 0, x_10);
 lean_ctor_set(x_20, 1, x_19);
 lean_ctor_set(x_20, 2, x_18);
 x_21 = lean_array_push(x_17, x_20);
-x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_22 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_10);
 x_23 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_23, 0, x_10);
 lean_ctor_set(x_23, 1, x_22);
 lean_ctor_set(x_23, 2, x_21);
 x_24 = lean_array_push(x_17, x_23);
-x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_25 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_10);
 x_26 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_26, 0, x_10);
@@ -19294,7 +19334,7 @@ x_29 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_29, 0, x_10);
 lean_ctor_set(x_29, 1, x_28);
 lean_ctor_set(x_29, 2, x_27);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_31 = lean_array_push(x_30, x_14);
 lean_inc(x_31);
 x_32 = lean_array_push(x_31, x_29);
@@ -19412,7 +19452,7 @@ lean_inc(x_68);
 x_75 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_75, 0, x_68);
 lean_ctor_set(x_75, 1, x_74);
-x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_76 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_77 = lean_array_push(x_76, x_75);
 x_78 = l_tacticGet__elem__tactic__trivial___closed__2;
 lean_inc(x_68);
@@ -19421,14 +19461,14 @@ lean_ctor_set(x_79, 0, x_68);
 lean_ctor_set(x_79, 1, x_78);
 lean_ctor_set(x_79, 2, x_77);
 x_80 = lean_array_push(x_76, x_79);
-x_81 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_81 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_68);
 x_82 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_82, 0, x_68);
 lean_ctor_set(x_82, 1, x_81);
 lean_ctor_set(x_82, 2, x_80);
 x_83 = lean_array_push(x_76, x_82);
-x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_84 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_68);
 x_85 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_85, 0, x_68);
@@ -19441,7 +19481,7 @@ x_88 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_88, 0, x_68);
 lean_ctor_set(x_88, 1, x_87);
 lean_ctor_set(x_88, 2, x_86);
-x_89 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_89 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_90 = lean_array_push(x_89, x_73);
 lean_inc(x_90);
 x_91 = lean_array_push(x_90, x_88);
@@ -19821,7 +19861,7 @@ lean_inc(x_14);
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_14);
 lean_ctor_set(x_27, 1, x_26);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_29 = lean_array_push(x_28, x_27);
 x_30 = l_tacticGet__elem__tactic___closed__2;
 lean_inc(x_14);
@@ -19830,14 +19870,14 @@ lean_ctor_set(x_31, 0, x_14);
 lean_ctor_set(x_31, 1, x_30);
 lean_ctor_set(x_31, 2, x_29);
 x_32 = lean_array_push(x_28, x_31);
-x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_14);
 x_34 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_34, 0, x_14);
 lean_ctor_set(x_34, 1, x_33);
 lean_ctor_set(x_34, 2, x_32);
 x_35 = lean_array_push(x_28, x_34);
-x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_36 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_14);
 x_37 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_37, 0, x_14);
@@ -19850,7 +19890,7 @@ x_40 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_40, 0, x_14);
 lean_ctor_set(x_40, 1, x_39);
 lean_ctor_set(x_40, 2, x_38);
-x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_41 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_42 = lean_array_push(x_41, x_25);
 x_43 = lean_array_push(x_42, x_40);
 x_44 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__3;
@@ -19943,7 +19983,7 @@ lean_inc(x_67);
 x_81 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_81, 0, x_67);
 lean_ctor_set(x_81, 1, x_80);
-x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__5;
+x_82 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
 x_83 = lean_array_push(x_82, x_81);
 x_84 = l_tacticGet__elem__tactic___closed__2;
 lean_inc(x_67);
@@ -19952,14 +19992,14 @@ lean_ctor_set(x_85, 0, x_67);
 lean_ctor_set(x_85, 1, x_84);
 lean_ctor_set(x_85, 2, x_83);
 x_86 = lean_array_push(x_82, x_85);
-x_87 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_87 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_67);
 x_88 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_88, 0, x_67);
 lean_ctor_set(x_88, 1, x_87);
 lean_ctor_set(x_88, 2, x_86);
 x_89 = lean_array_push(x_82, x_88);
-x_90 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6;
+x_90 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5;
 lean_inc(x_67);
 x_91 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_91, 0, x_67);
@@ -19972,7 +20012,7 @@ x_94 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_94, 0, x_67);
 lean_ctor_set(x_94, 1, x_93);
 lean_ctor_set(x_94, 2, x_92);
-x_95 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_95 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_96 = lean_array_push(x_95, x_79);
 x_97 = lean_array_push(x_96, x_94);
 x_98 = l___aux__Init__Tactics______macroRules__term_u2039___u203a__1___closed__3;
@@ -20032,22 +20072,6 @@ return x_121;
 }
 }
 }
-LEAN_EXPORT lean_object* l_getElem_x27___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = lean_apply_3(x_1, x_2, x_3, lean_box(0));
-return x_5;
-}
-}
-LEAN_EXPORT lean_object* l_getElem_x27(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = lean_alloc_closure((void*)(l_getElem_x27___rarg), 4, 0);
-return x_5;
-}
-}
 static lean_object* _init_l_term_____x5b___x5d_x27_____closed__1() {
 _start:
 {
@@ -20136,93 +20160,6 @@ x_1 = l_term_____x5b___x5d_x27_____closed__7;
 return x_1;
 }
 }
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("getElem'", 8);
-return x_1;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1;
-x_2 = lean_string_utf8_byte_size(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1;
-x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2;
-x_4 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_4, 0, x_1);
-lean_ctor_set(x_4, 1, x_2);
-lean_ctor_set(x_4, 2, x_3);
-return x_4;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-static lean_object* _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5;
-x_2 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
-return x_3;
-}
-}
 LEAN_EXPORT lean_object* l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -20263,10 +20200,10 @@ lean_inc(x_17);
 x_18 = lean_ctor_get(x_2, 1);
 lean_inc(x_18);
 lean_dec(x_2);
-x_19 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4;
+x_19 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__4;
 x_20 = l_Lean_addMacroScope(x_18, x_19, x_17);
-x_21 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3;
-x_22 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8;
+x_21 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__3;
+x_22 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__9;
 lean_inc(x_16);
 x_23 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_23, 0, x_16);
@@ -20277,13 +20214,13 @@ x_24 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__
 x_25 = lean_array_push(x_24, x_9);
 x_26 = lean_array_push(x_25, x_11);
 x_27 = lean_array_push(x_26, x_13);
-x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_28 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_16);
 x_29 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_29, 0, x_16);
 lean_ctor_set(x_29, 1, x_28);
 lean_ctor_set(x_29, 2, x_27);
-x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_30 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_31 = lean_array_push(x_30, x_23);
 x_32 = lean_array_push(x_31, x_29);
 x_33 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__2;
@@ -20307,10 +20244,10 @@ lean_inc(x_37);
 x_38 = lean_ctor_get(x_2, 1);
 lean_inc(x_38);
 lean_dec(x_2);
-x_39 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4;
+x_39 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__4;
 x_40 = l_Lean_addMacroScope(x_38, x_39, x_37);
-x_41 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3;
-x_42 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8;
+x_41 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__3;
+x_42 = l___aux__Init__Tactics______macroRules__term_____x5b___x5d__1___closed__9;
 lean_inc(x_35);
 x_43 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_43, 0, x_35);
@@ -20321,13 +20258,13 @@ x_44 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__
 x_45 = lean_array_push(x_44, x_9);
 x_46 = lean_array_push(x_45, x_11);
 x_47 = lean_array_push(x_46, x_13);
-x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__7;
+x_48 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__2;
 lean_inc(x_35);
 x_49 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_49, 0, x_35);
 lean_ctor_set(x_49, 1, x_48);
 lean_ctor_set(x_49, 2, x_47);
-x_50 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4;
+x_50 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9;
 x_51 = lean_array_push(x_50, x_43);
 x_52 = lean_array_push(x_51, x_49);
 x_53 = l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticSorry__1___closed__2;
@@ -20700,6 +20637,10 @@ l_Lean_Parser_Tactic_case___closed__11 = _init_l_Lean_Parser_Tactic_case___close
 lean_mark_persistent(l_Lean_Parser_Tactic_case___closed__11);
 l_Lean_Parser_Tactic_case___closed__12 = _init_l_Lean_Parser_Tactic_case___closed__12();
 lean_mark_persistent(l_Lean_Parser_Tactic_case___closed__12);
+l_Lean_Parser_Tactic_case___closed__13 = _init_l_Lean_Parser_Tactic_case___closed__13();
+lean_mark_persistent(l_Lean_Parser_Tactic_case___closed__13);
+l_Lean_Parser_Tactic_case___closed__14 = _init_l_Lean_Parser_Tactic_case___closed__14();
+lean_mark_persistent(l_Lean_Parser_Tactic_case___closed__14);
 l_Lean_Parser_Tactic_case = _init_l_Lean_Parser_Tactic_case();
 lean_mark_persistent(l_Lean_Parser_Tactic_case);
 l_Lean_Parser_Tactic_case_x27___closed__1 = _init_l_Lean_Parser_Tactic_case_x27___closed__1();
@@ -20718,8 +20659,6 @@ l_Lean_Parser_Tactic_case_x27___closed__7 = _init_l_Lean_Parser_Tactic_case_x27_
 lean_mark_persistent(l_Lean_Parser_Tactic_case_x27___closed__7);
 l_Lean_Parser_Tactic_case_x27___closed__8 = _init_l_Lean_Parser_Tactic_case_x27___closed__8();
 lean_mark_persistent(l_Lean_Parser_Tactic_case_x27___closed__8);
-l_Lean_Parser_Tactic_case_x27___closed__9 = _init_l_Lean_Parser_Tactic_case_x27___closed__9();
-lean_mark_persistent(l_Lean_Parser_Tactic_case_x27___closed__9);
 l_Lean_Parser_Tactic_case_x27 = _init_l_Lean_Parser_Tactic_case_x27();
 lean_mark_persistent(l_Lean_Parser_Tactic_case_x27);
 l_Lean_Parser_Tactic_tacticNext___x3d_x3e_____closed__1 = _init_l_Lean_Parser_Tactic_tacticNext___x3d_x3e_____closed__1();
@@ -20760,6 +20699,8 @@ l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic_
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__9);
 l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10();
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__10);
+l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11();
+lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticNext___x3d_x3e____1___closed__11);
 l_Lean_Parser_Tactic_allGoals___closed__1 = _init_l_Lean_Parser_Tactic_allGoals___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_allGoals___closed__1);
 l_Lean_Parser_Tactic_allGoals___closed__2 = _init_l_Lean_Parser_Tactic_allGoals___closed__2();
@@ -21032,8 +20973,6 @@ l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic_
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__4);
 l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5();
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__5);
-l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tacticTry____1___closed__6);
 l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e_____closed__1 = _init_l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e_____closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e_____closed__1);
 l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e_____closed__2 = _init_l_Lean_Parser_Tactic_tactic___x3c_x3b_x3e_____closed__2();
@@ -21054,6 +20993,8 @@ l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic_
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__2);
 l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__3 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__3();
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__3);
+l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4();
+lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__tactic___x3c_x3b_x3e____1___closed__4);
 l_Lean_Parser_Tactic_refl___closed__1 = _init_l_Lean_Parser_Tactic_refl___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_refl___closed__1);
 l_Lean_Parser_Tactic_refl___closed__2 = _init_l_Lean_Parser_Tactic_refl___closed__2();
@@ -21426,8 +21367,6 @@ l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic_
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__4);
 l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5();
 lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__5);
-l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6 = _init_l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6();
-lean_mark_persistent(l_Lean_Parser_Tactic___aux__Init__Tactics______macroRules__Lean__Parser__Tactic__rwSeq__1___closed__6);
 l_Lean_Parser_Tactic_injection___closed__1 = _init_l_Lean_Parser_Tactic_injection___closed__1();
 lean_mark_persistent(l_Lean_Parser_Tactic_injection___closed__1);
 l_Lean_Parser_Tactic_injection___closed__2 = _init_l_Lean_Parser_Tactic_injection___closed__2();
@@ -21458,6 +21397,8 @@ l_Lean_Parser_Tactic_injections___closed__3 = _init_l_Lean_Parser_Tactic_injecti
 lean_mark_persistent(l_Lean_Parser_Tactic_injections___closed__3);
 l_Lean_Parser_Tactic_injections___closed__4 = _init_l_Lean_Parser_Tactic_injections___closed__4();
 lean_mark_persistent(l_Lean_Parser_Tactic_injections___closed__4);
+l_Lean_Parser_Tactic_injections___closed__5 = _init_l_Lean_Parser_Tactic_injections___closed__5();
+lean_mark_persistent(l_Lean_Parser_Tactic_injections___closed__5);
 l_Lean_Parser_Tactic_injections = _init_l_Lean_Parser_Tactic_injections();
 lean_mark_persistent(l_Lean_Parser_Tactic_injections);
 l_Lean_Parser_Tactic_discharger___closed__1 = _init_l_Lean_Parser_Tactic_discharger___closed__1();
@@ -22552,22 +22493,6 @@ l_term_____x5b___x5d_x27_____closed__7 = _init_l_term_____x5b___x5d_x27_____clos
 lean_mark_persistent(l_term_____x5b___x5d_x27_____closed__7);
 l_term_____x5b___x5d_x27__ = _init_l_term_____x5b___x5d_x27__();
 lean_mark_persistent(l_term_____x5b___x5d_x27__);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__1);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__2);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__3);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__4);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__5);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__6);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__7);
-l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8 = _init_l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8();
-lean_mark_persistent(l___aux__Init__Tactics______macroRules__term_____x5b___x5d_x27____1___closed__8);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Attributes.c b/stage0/stdlib/Lean/Attributes.c
index fdfc872f26..fc223c71f1 100644
--- a/stage0/stdlib/Lean/Attributes.c
+++ b/stage0/stdlib/Lean/Attributes.c
@@ -33,6 +33,7 @@ LEAN_EXPORT lean_object* l_Lean_registerTagAttribute___lambda__8___boxed(lean_ob
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__31;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute___lambda__4___boxed(lean_object*);
 static lean_object* l_Lean_mkAttributeImplOfBuilder___closed__1;
+LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Std_AssocList_contains___at_Lean_registerAttributeImplBuilder___spec__2(lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute___lambda__1(lean_object*, lean_object*, lean_object*);
@@ -42,7 +43,6 @@ lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*
 lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Attribute_add___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_NameSet_instInhabitedNameSet;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_ParametricAttribute_getParam_x3f___spec__1(lean_object*);
@@ -98,6 +98,7 @@ static lean_object* l_Lean_isAttribute___closed__1;
 static lean_object* l_Lean_getAttrParamOptPrio___closed__1;
 LEAN_EXPORT lean_object* l_Lean_instMonadLiftImportMAttrM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
+static lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1;
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__7;
 static lean_object* l_Lean_getBuiltinAttributeNames___closed__1;
 LEAN_EXPORT lean_object* l_Lean_registerParametricAttribute___rarg___lambda__2(lean_object*, lean_object*);
@@ -139,6 +140,7 @@ LEAN_EXPORT uint8_t l_Array_qsort_sort___at_Lean_registerParametricAttribute___s
 LEAN_EXPORT lean_object* l___auto____x40_Lean_Attributes___hyg_97_;
 LEAN_EXPORT lean_object* l___auto____x40_Lean_Attributes___hyg_1239_;
 LEAN_EXPORT lean_object* l___auto____x40_Lean_Attributes___hyg_2497_;
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerTagAttribute___lambda__6___closed__4;
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__15;
 LEAN_EXPORT lean_object* l_Lean_ParametricAttributeImpl_afterSet___default___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -161,7 +163,6 @@ static lean_object* l_Lean_registerTagAttribute___lambda__4___closed__3;
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__10;
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__32;
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_registerEnumAttributes___spec__3___rarg___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_AttributeImpl_erase___default___rarg___closed__2;
 static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3750____closed__6;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_EnumAttributes_getValue___spec__1___rarg___boxed(lean_object*, lean_object*);
@@ -253,6 +254,7 @@ static lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3750____closed__2
 LEAN_EXPORT lean_object* l_Lean_instInhabitedAttributeImpl___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ParametricAttribute_setParam(lean_object*);
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_registerBuiltinAttribute___spec__2___closed__3;
+lean_object* l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(lean_object*, lean_object*);
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__3;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute;
 LEAN_EXPORT lean_object* l_Lean_AttributeImpl_erase___default(lean_object*);
@@ -299,6 +301,7 @@ lean_object* l_Std_RBNode_fold___at_Std_RBMap_size___spec__1___rarg(lean_object*
 LEAN_EXPORT uint8_t l_Lean_instInhabitedAttributeApplicationTime;
 LEAN_EXPORT lean_object* l_IO_ofExcept___at_Lean_mkAttributeImplOfBuilder___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static uint32_t l_Lean_instInhabitedTagAttribute___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedTagAttribute___lambda__4(lean_object*);
 static lean_object* l_Lean_registerAttributeImplBuilder___closed__2;
@@ -319,19 +322,16 @@ size_t lean_usize_land(size_t, size_t);
 static lean_object* l_Lean_registerTagAttribute___lambda__4___closed__2;
 static lean_object* l_Lean_mkAttributeImplOfConstantUnsafe___closed__4;
 LEAN_EXPORT lean_object* l_Lean_ParametricAttribute_setParam___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Attribute_add(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_IO_ofExcept___at_Lean_mkAttributeImplOfBuilder___spec__3___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Attribute_Builtin_getPrio___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Attribute_add___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__25;
-LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1(lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Attributes_0__Lean_AttributeExtension_addImported___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getAttributeImpl___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_registerBuiltinAttribute___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Attributes___hyg_3750____lambda__2___boxed(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_registerAttributeImplBuilder___spec__6(lean_object*, lean_object*, lean_object*);
 static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__4;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_updateEnvAttributesImpl___spec__1(lean_object*, lean_object*, lean_object*);
@@ -346,7 +346,6 @@ static lean_object* l___auto____x40_Lean_Attributes___hyg_97____closed__27;
 static lean_object* l_Lean_registerEnumAttributes___rarg___lambda__3___closed__3;
 extern uint8_t l_instInhabitedBool;
 LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_registerBuiltinAttribute___spec__5(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkAttributeImplOfConstantUnsafe(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedAttributeImpl___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_registerBuiltinAttribute___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -497,6 +496,7 @@ static lean_object* l_Lean_registerBuiltinAttribute___closed__1;
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnumAttributes_getValue(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnumAttributes___rarg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Attribute_Builtin_getId(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3874,32 +3874,7 @@ x_1 = l___auto____x40_Lean_Attributes___hyg_97____closed__33;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_registerTagAttribute___spec__1(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_3 = lean_ctor_get(x_2, 0);
-lean_inc(x_3);
-x_4 = lean_ctor_get(x_2, 1);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_2, 3);
-lean_inc(x_5);
-lean_dec(x_2);
-x_6 = l_Std_RBNode_fold___at_Lean_registerTagAttribute___spec__1(x_1, x_3);
-x_7 = lean_array_push(x_6, x_4);
-x_1 = x_7;
-x_2 = x_5;
-goto _start;
-}
-}
-}
-static lean_object* _init_l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1() {
+static lean_object* _init_l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -3910,7 +3885,7 @@ lean_ctor_set(x_2, 1, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(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; 
@@ -3928,7 +3903,7 @@ x_9 = lean_ctor_get(x_6, 4);
 lean_dec(x_9);
 x_10 = lean_ctor_get(x_6, 0);
 lean_dec(x_10);
-x_11 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1;
+x_11 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1;
 lean_ctor_set(x_6, 4, x_11);
 lean_ctor_set(x_6, 0, x_1);
 x_12 = lean_st_ref_set(x_3, x_6, x_7);
@@ -3969,7 +3944,7 @@ lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_dec(x_6);
-x_24 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1;
+x_24 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1;
 x_25 = lean_alloc_ctor(0, 7, 0);
 lean_ctor_set(x_25, 0, x_1);
 lean_ctor_set(x_25, 1, x_19);
@@ -4001,7 +3976,7 @@ return x_30;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; uint8_t x_7; 
@@ -4064,7 +4039,7 @@ _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; 
 x_2 = l___auto____x40_Lean_Attributes___hyg_97____closed__9;
-x_3 = l_Std_RBNode_fold___at_Lean_registerTagAttribute___spec__1(x_2, x_1);
+x_3 = l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(x_2, x_1);
 x_4 = lean_array_get_size(x_3);
 x_5 = lean_unsigned_to_nat(1u);
 x_6 = lean_nat_sub(x_4, x_5);
@@ -4177,7 +4152,7 @@ x_13 = lean_ctor_get(x_11, 0);
 lean_inc(x_13);
 lean_dec(x_11);
 x_14 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_3, x_13, x_2);
-x_15 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_14, x_5, x_6, x_12);
+x_15 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_14, x_5, x_6, x_12);
 lean_dec(x_6);
 lean_dec(x_5);
 return x_15;
@@ -4285,7 +4260,7 @@ x_19 = l_Lean_registerTagAttribute___lambda__6___closed__4;
 x_20 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_20, 0, x_18);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_20, x_6, x_7, x_11);
+x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_20, x_6, x_7, x_11);
 lean_dec(x_7);
 lean_dec(x_6);
 x_22 = !lean_is_exclusive(x_21);
@@ -4357,7 +4332,7 @@ x_17 = l_Lean_registerTagAttribute___lambda__7___closed__2;
 x_18 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_18, x_7, x_8, x_11);
+x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_18, x_7, x_8, x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 x_20 = !lean_is_exclusive(x_19);
@@ -4604,21 +4579,21 @@ return x_34;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__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_setEnv___at_Lean_registerTagAttribute___spec__2(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__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_throwError___at_Lean_registerTagAttribute___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2___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_throwError___at_Lean_registerTagAttribute___spec__3(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_5;
@@ -5220,7 +5195,7 @@ lean_ctor_set(x_14, 0, x_2);
 lean_ctor_set(x_14, 1, x_12);
 lean_inc(x_5);
 x_15 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_5, x_14);
-x_16 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_15, x_7, x_8, x_13);
+x_16 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_15, x_7, x_8, x_13);
 x_17 = lean_ctor_get(x_16, 1);
 lean_inc(x_17);
 lean_dec(x_16);
@@ -5243,7 +5218,7 @@ lean_object* x_20; lean_object* x_21;
 x_20 = lean_ctor_get(x_19, 1);
 lean_inc(x_20);
 lean_dec(x_19);
-x_21 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_5, x_7, x_8, x_20);
+x_21 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_5, x_7, x_8, x_20);
 lean_dec(x_8);
 lean_dec(x_7);
 return x_21;
@@ -5323,7 +5298,7 @@ x_20 = l_Lean_registerTagAttribute___lambda__6___closed__4;
 x_21 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_21, 0, x_19);
 lean_ctor_set(x_21, 1, x_20);
-x_22 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_21, x_7, x_8, x_12);
+x_22 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_21, x_7, x_8, x_12);
 lean_dec(x_8);
 lean_dec(x_7);
 x_23 = !lean_is_exclusive(x_22);
@@ -5370,7 +5345,7 @@ x_15 = l_Lean_registerTagAttribute___lambda__7___closed__2;
 x_16 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_16, x_7, x_8, x_9);
+x_17 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_16, x_7, x_8, x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 x_18 = !lean_is_exclusive(x_17);
@@ -6483,7 +6458,7 @@ x_12 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_12, 0, x_2);
 lean_ctor_set(x_12, 1, x_3);
 x_13 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_4, x_5, x_12);
-x_14 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_13, x_7, x_8, x_11);
+x_14 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_13, x_7, x_8, x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 return x_14;
@@ -6562,7 +6537,7 @@ x_20 = l_Lean_registerTagAttribute___lambda__6___closed__4;
 x_21 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_21, 0, x_19);
 lean_ctor_set(x_21, 1, x_20);
-x_22 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_21, x_7, x_8, x_12);
+x_22 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_21, x_7, x_8, x_12);
 lean_dec(x_8);
 lean_dec(x_7);
 x_23 = !lean_is_exclusive(x_22);
@@ -6618,7 +6593,7 @@ x_18 = l_Lean_registerTagAttribute___lambda__7___closed__2;
 x_19 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_19, 0, x_17);
 lean_ctor_set(x_19, 1, x_18);
-x_20 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_19, x_8, x_9, x_12);
+x_20 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_19, x_8, x_9, x_12);
 lean_dec(x_9);
 lean_dec(x_8);
 x_21 = !lean_is_exclusive(x_20);
@@ -10604,8 +10579,8 @@ l_Lean_instInhabitedTagAttribute = _init_l_Lean_instInhabitedTagAttribute();
 lean_mark_persistent(l_Lean_instInhabitedTagAttribute);
 l___auto____x40_Lean_Attributes___hyg_1239_ = _init_l___auto____x40_Lean_Attributes___hyg_1239_();
 lean_mark_persistent(l___auto____x40_Lean_Attributes___hyg_1239_);
-l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1 = _init_l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1();
-lean_mark_persistent(l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2___closed__1);
+l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1 = _init_l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1();
+lean_mark_persistent(l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1___closed__1);
 l_Lean_registerTagAttribute___lambda__4___closed__1 = _init_l_Lean_registerTagAttribute___lambda__4___closed__1();
 lean_mark_persistent(l_Lean_registerTagAttribute___lambda__4___closed__1);
 l_Lean_registerTagAttribute___lambda__4___closed__2 = _init_l_Lean_registerTagAttribute___lambda__4___closed__2();
diff --git a/stage0/stdlib/Lean/Class.c b/stage0/stdlib/Lean/Class.c
index 7fd90cb6dd..0d684a0cf4 100644
--- a/stage0/stdlib/Lean/Class.c
+++ b/stage0/stdlib/Lean/Class.c
@@ -23,7 +23,6 @@ lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_ClassState_addEntry___spec__9(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Class___hyg_78____spec__3(lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ClassState_switch(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insert___at_Lean_ClassState_addEntry___spec__2(lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -117,6 +116,7 @@ size_t lean_usize_mul(size_t, size_t);
 static lean_object* l_Lean_initFn____x40_Lean_Class___hyg_588____closed__17;
 LEAN_EXPORT lean_object* l_Lean_addClass___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Class___hyg_78____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_getOutParamPositions_x3f___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Class___hyg_588____closed__13;
 size_t lean_usize_of_nat(lean_object*);
@@ -131,7 +131,6 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_initFn____x40_Lean_Class___
 LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_ClassState_addEntry___spec__11(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getOutParamPositions_x3f(lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Class___hyg_588____closed__4;
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvar___override(lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at_Lean_ClassState_addEntry___spec__8(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_getOutParamPositions_x3f___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -196,6 +195,7 @@ LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_isClass___spec__2(lean_o
 static lean_object* l_Lean_initFn____x40_Lean_Class___hyg_588____lambda__3___closed__1;
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_addClass___lambda__2___closed__4;
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Class___hyg_588____lambda__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_ClassEntry_lt(lean_object* x_1, lean_object* x_2) {
@@ -2826,7 +2826,7 @@ lean_inc(x_9);
 x_10 = lean_ctor_get(x_8, 1);
 lean_inc(x_10);
 lean_dec(x_8);
-x_11 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_9, x_4, x_5, x_10);
+x_11 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_9, x_4, x_5, x_10);
 return x_11;
 }
 else
@@ -2900,7 +2900,7 @@ lean_object* x_15; lean_object* x_16; uint8_t x_17;
 lean_dec(x_10);
 lean_dec(x_1);
 x_15 = l_Lean_initFn____x40_Lean_Class___hyg_588____lambda__2___closed__2;
-x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_15, x_4, x_5, x_12);
+x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_15, x_4, x_5, x_12);
 lean_dec(x_5);
 lean_dec(x_4);
 x_17 = !lean_is_exclusive(x_16);
diff --git a/stage0/stdlib/Lean/Compiler/CSimpAttr.c b/stage0/stdlib/Lean/Compiler/CSimpAttr.c
index 0a32318af6..3f18acd3b0 100644
--- a/stage0/stdlib/Lean/Compiler/CSimpAttr.c
+++ b/stage0/stdlib/Lean/Compiler/CSimpAttr.c
@@ -146,12 +146,12 @@ static lean_object* l_Lean_Compiler_CSimp_initFn____x40_Lean_Compiler_CSimpAttr_
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_CSimp_initFn____x40_Lean_Compiler_CSimpAttr___hyg_123____spec__4(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(lean_object*);
 static lean_object* l_Lean_Compiler_CSimp_State_thmNames___default___closed__1;
 LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_Compiler_CSimp_initFn____x40_Lean_Compiler_CSimpAttr___hyg_123____spec__9(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_CSimp_initFn____x40_Lean_Compiler_CSimpAttr___hyg_437____closed__22;
 static lean_object* l_Lean_Compiler_CSimp_initFn____x40_Lean_Compiler_CSimpAttr___hyg_123____closed__3;
 lean_object* lean_mk_array(lean_object*, lean_object*);
+lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_CSimp_add___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Attribute_Builtin_ensureNoArgs(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -357,7 +357,7 @@ lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6;
 x_3 = lean_ctor_get(x_1, 0);
 x_4 = lean_ctor_get(x_1, 1);
 x_5 = l_Lean_SMap_switch___at_Lean_Compiler_CSimp_State_switch___spec__1(x_3);
-x_6 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(x_4);
+x_6 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(x_4);
 lean_ctor_set(x_1, 1, x_6);
 lean_ctor_set(x_1, 0, x_5);
 return x_1;
@@ -371,7 +371,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_dec(x_1);
 x_9 = l_Lean_SMap_switch___at_Lean_Compiler_CSimp_State_switch___spec__1(x_7);
-x_10 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(x_8);
+x_10 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(x_8);
 x_11 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_11, 0, x_9);
 lean_ctor_set(x_11, 1, x_10);
diff --git a/stage0/stdlib/Lean/Compiler/ExportAttr.c b/stage0/stdlib/Lean/Compiler/ExportAttr.c
index cbc6b7ab8f..53c139c721 100644
--- a/stage0/stdlib/Lean/Compiler/ExportAttr.c
+++ b/stage0/stdlib/Lean/Compiler/ExportAttr.c
@@ -19,7 +19,6 @@ LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86_
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____closed__12;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____closed__7;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_ExportAttr_0__Lean_isValidCppId___lambda__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_ExportAttr_0__Lean_isValidCppName___boxed(lean_object*);
@@ -65,6 +64,7 @@ static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____cl
 lean_object* l_Lean_registerParametricAttribute___rarg(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____closed__11;
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Attribute_Builtin_getId(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_ExportAttr_0__Lean_isValidCppId___lambda__1(uint32_t x_1) {
 _start:
@@ -291,7 +291,7 @@ lean_object* x_11; lean_object* x_12; uint8_t x_13;
 lean_free_object(x_6);
 lean_dec(x_8);
 x_11 = l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____lambda__2___closed__2;
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_3, x_4, x_9);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_3, x_4, x_9);
 lean_dec(x_4);
 lean_dec(x_3);
 x_13 = !lean_is_exclusive(x_12);
@@ -335,7 +335,7 @@ if (x_19 == 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; 
 lean_dec(x_17);
 x_20 = l_Lean_initFn____x40_Lean_Compiler_ExportAttr___hyg_86____lambda__2___closed__2;
-x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_20, x_3, x_4, x_18);
+x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_20, x_3, x_4, x_18);
 lean_dec(x_4);
 lean_dec(x_3);
 x_22 = lean_ctor_get(x_21, 0);
diff --git a/stage0/stdlib/Lean/Compiler/ExternAttr.c b/stage0/stdlib/Lean/Compiler/ExternAttr.c
index 3b85927df5..1f9f1b6e4f 100644
--- a/stage0/stdlib/Lean/Compiler/ExternAttr.c
+++ b/stage0/stdlib/Lean/Compiler/ExternAttr.c
@@ -118,6 +118,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_E
 lean_object* l_String_Iterator_next(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_ExternAttr_0__Lean_syntaxToExternAttrData___spec__3___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_ExternAttr_0__Lean_syntaxToExternAttrData(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
 lean_object* l_instBEqProd___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -127,7 +128,6 @@ extern lean_object* l_Lean_projectionFnInfoExt;
 static lean_object* l_Lean_mkSimpleFnCall___closed__3;
 LEAN_EXPORT lean_object* l_Lean_isExternC___boxed(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_ExternAttr_0__Lean_getExternConstArity___closed__11;
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Compiler_ExternAttr___hyg_659____closed__2;
 uint8_t lean_uint32_dec_eq(uint32_t, uint32_t);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Compiler_ExternAttr___hyg_659_(lean_object*);
@@ -826,7 +826,7 @@ lean_inc(x_18);
 x_19 = lean_ctor_get(x_17, 1);
 lean_inc(x_19);
 lean_dec(x_17);
-x_20 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_18, x_3, x_4, x_19);
+x_20 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_18, x_3, x_4, x_19);
 return x_20;
 }
 else
@@ -867,7 +867,7 @@ lean_inc(x_27);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
-x_29 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_27, x_3, x_4, x_28);
+x_29 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_27, x_3, x_4, x_28);
 return x_29;
 }
 else
@@ -940,7 +940,7 @@ lean_inc(x_45);
 x_46 = lean_ctor_get(x_44, 1);
 lean_inc(x_46);
 lean_dec(x_44);
-x_47 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_45, x_3, x_4, x_46);
+x_47 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_45, x_3, x_4, x_46);
 return x_47;
 }
 else
@@ -982,7 +982,7 @@ lean_inc(x_54);
 x_55 = lean_ctor_get(x_53, 1);
 lean_inc(x_55);
 lean_dec(x_53);
-x_56 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_54, x_3, x_4, x_55);
+x_56 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_54, x_3, x_4, x_55);
 return x_56;
 }
 else
diff --git a/stage0/stdlib/Lean/Compiler/ImplementedByAttr.c b/stage0/stdlib/Lean/Compiler/ImplementedByAttr.c
index f97b530d3e..8935d36983 100644
--- a/stage0/stdlib/Lean/Compiler/ImplementedByAttr.c
+++ b/stage0/stdlib/Lean/Compiler/ImplementedByAttr.c
@@ -22,7 +22,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_pushInfoLeaf___at_Lean_Compiler_initFn____x
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____lambda__1___closed__2;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterTRAux___at_Lean_resolveGlobalConstCore___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____lambda__5(lean_object*, lean_object*, lean_object*);
@@ -143,6 +142,7 @@ static lean_object* l_Lean_resolveGlobalConstNoOverload___at_Lean_Compiler_initF
 lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalConstCore___at_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalName___at_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -473,7 +473,7 @@ x_10 = l_Lean_getConstInfo___at_Lean_Compiler_initFn____x40_Lean_Compiler_Implem
 x_11 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_11, 0, x_9);
 lean_ctor_set(x_11, 1, x_10);
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_2, x_3, x_4);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_2, x_3, x_4);
 return x_12;
 }
 }
@@ -1560,7 +1560,7 @@ x_15 = l_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____
 x_16 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_16, x_5, x_6, x_7);
+x_17 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_16, x_5, x_6, x_7);
 x_18 = !lean_is_exclusive(x_17);
 if (x_18 == 0)
 {
@@ -1701,7 +1701,7 @@ x_32 = l_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____
 x_33 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_33, 0, x_31);
 lean_ctor_set(x_33, 1, x_32);
-x_34 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_33, x_6, x_7, x_8);
+x_34 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_33, x_6, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 x_35 = !lean_is_exclusive(x_34);
@@ -1883,7 +1883,7 @@ x_46 = l_Lean_Compiler_initFn____x40_Lean_Compiler_ImplementedByAttr___hyg_4____
 x_47 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_47, 0, x_45);
 lean_ctor_set(x_47, 1, x_46);
-x_48 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_47, x_3, x_4, x_18);
+x_48 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_47, x_3, x_4, x_18);
 lean_dec(x_4);
 lean_dec(x_3);
 x_49 = !lean_is_exclusive(x_48);
diff --git a/stage0/stdlib/Lean/Compiler/InitAttr.c b/stage0/stdlib/Lean/Compiler/InitAttr.c
index 28be0650a5..904bf4b047 100644
--- a/stage0/stdlib/Lean/Compiler/InitAttr.c
+++ b/stage0/stdlib/Lean/Compiler/InitAttr.c
@@ -34,7 +34,6 @@ lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_declareBuiltin___closed__6;
 static lean_object* l_Lean_getBuiltinInitFnNameFor_x3f___closed__1;
 LEAN_EXPORT lean_object* l_Lean_builtinInitAttr;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterTRAux___at_Lean_resolveGlobalConstCore___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalConstCore___at_Lean_registerInitAttrUnsafe___spec__9___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkConstWithLevelParams___at_Lean_registerInitAttrUnsafe___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -232,6 +231,7 @@ lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lea
 static lean_object* l___auto____x40_Lean_Compiler_InitAttr___hyg_791____closed__12;
 static lean_object* l_Lean_registerInitAttrUnsafe___lambda__1___closed__4;
 static lean_object* l_Lean_setEnv___at_Lean_declareBuiltin___spec__3___closed__2;
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 static lean_object* _init_l___private_Lean_Compiler_InitAttr_0__Lean_getIOTypeArg___closed__1() {
@@ -797,7 +797,7 @@ x_10 = l_Lean_getConstInfo___at_Lean_registerInitAttrUnsafe___spec__1___closed__
 x_11 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_11, 0, x_9);
 lean_ctor_set(x_11, 1, x_10);
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_2, x_3, x_4);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_2, x_3, x_4);
 return x_12;
 }
 }
@@ -2743,7 +2743,7 @@ x_21 = lean_array_get_size(x_2);
 x_22 = lean_unsigned_to_nat(0u);
 x_23 = l_Array_toSubarray___rarg(x_2, x_22, x_21);
 x_24 = lean_ctor_get(x_3, 0);
-x_25 = lean_ctor_get(x_24, 3);
+x_25 = lean_ctor_get(x_24, 4);
 x_26 = lean_ctor_get(x_25, 3);
 x_27 = lean_array_get_size(x_26);
 x_28 = lean_usize_of_nat(x_27);
diff --git a/stage0/stdlib/Lean/Compiler/InlineAttrs.c b/stage0/stdlib/Lean/Compiler/InlineAttrs.c
index 0231392acc..4a31fd137f 100644
--- a/stage0/stdlib/Lean/Compiler/InlineAttrs.c
+++ b/stage0/stdlib/Lean/Compiler/InlineAttrs.c
@@ -21,7 +21,6 @@ lean_object* l_Lean_stringToMessageData(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_InlineAttributeKind_toCtorIdx___boxed(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_initFn____x40_Lean_Compiler_InlineAttrs___hyg_216____closed__11;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isValidMacroInline___lambda__2___closed__5;
 LEAN_EXPORT lean_object* l_Lean_ofExcept___at_Lean_Compiler_initFn____x40_Lean_Compiler_InlineAttrs___hyg_216____spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isValidMacroInline___lambda__2___closed__3;
@@ -127,6 +126,7 @@ static lean_object* l___private_Lean_Compiler_InlineAttrs_0__Lean_Compiler_isVal
 lean_object* l_Lean_Expr_constName_x21(lean_object*);
 static lean_object* l_Lean_Compiler_initFn____x40_Lean_Compiler_InlineAttrs___hyg_216____closed__22;
 lean_object* l_Lean_registerEnumAttributes___rarg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_InlineAttributeKind_toCtorIdx(uint8_t x_1) {
 _start:
 {
@@ -858,7 +858,7 @@ x_6 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_6, 0, x_5);
 x_7 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
-x_8 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_7, x_2, x_3, x_4);
+x_8 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_7, x_2, x_3, x_4);
 return x_8;
 }
 else
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/CSE.c b/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
index 4b156981cf..9cd222c003 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/CSE.c
@@ -13,27 +13,31 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___boxed(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_CSE___hyg_979____closed__3;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_cse_goFunDecl(lean_object*, lean_object*, 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*);
-static lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(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_CSE___hyg_984____closed__3;
+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*);
 static lean_object* l_Lean_Compiler_LCNF_CSE_State_map___default___closed__3;
 uint8_t lean_usize_dec_eq(size_t, size_t);
+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_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_withNewScope(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, 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_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_sub(size_t, size_t);
+static lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_Code_cse_go___closed__2;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 static size_t l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__2;
 uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_replaceLet(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
@@ -46,90 +50,88 @@ LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___a
 lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_FunDeclCore_toExpr(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_getSubst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___lambda__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__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM;
+LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_cse___closed__1;
 size_t lean_uint64_to_usize(uint64_t);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_eraseFunDecl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse;
 LEAN_EXPORT lean_object* l_Std_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_Std_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_CSE_addEntry___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1;
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_replaceLet___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__3;
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_cse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t l_Lean_Expr_hash(lean_object*);
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 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*);
 static lean_object* l_Lean_Compiler_LCNF_CSE_State_subst___default___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_cse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*, uint8_t);
 size_t lean_usize_mul(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_CSE_State_map___default___closed__1;
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(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_replaceFun___boxed(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_CSE___hyg_979____closed__2;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Code_cse_go___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_land(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_Code_cse_go___closed__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Code_cse_go___spec__8(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_CSE___hyg_984____closed__2;
 static lean_object* l_Lean_Compiler_LCNF_cse___closed__3;
-static lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2;
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvar___override(lean_object*);
 size_t lean_ptr_addr(lean_object*);
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2(lean_object*, lean_object*);
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 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_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__4(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*);
-static lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_getSubst___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__3(lean_object*, size_t, 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_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_addEntry(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_cse;
 static lean_object* l_Lean_Compiler_LCNF_Code_cse___closed__1;
 static size_t l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, lean_object*);
+lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_State_subst___default;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__1;
 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_usize_to_nat(size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_withNewScope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2___rarg(lean_object*, lean_object*, 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(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__1;
+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* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_cse_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_State_map___default;
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Compiler_LCNF_CSE_addEntry___spec__3(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 static lean_object* _init_l_Lean_Compiler_LCNF_CSE_State_map___default___closed__1() {
 _start:
@@ -186,7 +188,7 @@ x_1 = l_Lean_Compiler_LCNF_CSE_State_subst___default___closed__1;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1(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_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
@@ -215,7 +217,7 @@ return x_12;
 }
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
@@ -264,15 +266,15 @@ return x_15;
 }
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2___rarg), 7, 0);
+x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2___rarg), 7, 0);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; 
@@ -284,39 +286,39 @@ lean_ctor_set(x_8, 1, x_6);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1___boxed), 5, 0);
+x_1 = lean_alloc_closure((void*)(l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1___boxed), 5, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___lambda__1___boxed), 6, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___lambda__1___boxed), 6, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM() {
+static lean_object* _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1;
-x_2 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__2___rarg), 7, 2);
+x_1 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1;
+x_2 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2;
+x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__2___rarg), 7, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1___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_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1___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_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___spec__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_StateRefT_x27_get___at_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___spec__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
@@ -324,11 +326,11 @@ lean_dec(x_1);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___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_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@@ -337,6 +339,98 @@ lean_dec(x_1);
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM(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; 
+x_7 = lean_st_ref_get(x_5, x_6);
+x_8 = lean_ctor_get(x_7, 1);
+lean_inc(x_8);
+lean_dec(x_7);
+x_9 = lean_st_ref_take(x_2, x_8);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = !lean_is_exclusive(x_10);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_13 = lean_ctor_get(x_10, 1);
+x_14 = lean_apply_1(x_1, x_13);
+lean_ctor_set(x_10, 1, x_14);
+x_15 = lean_st_ref_set(x_2, x_10, x_11);
+x_16 = !lean_is_exclusive(x_15);
+if (x_16 == 0)
+{
+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_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
+{
+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; 
+x_22 = lean_ctor_get(x_10, 0);
+x_23 = lean_ctor_get(x_10, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_10);
+x_24 = lean_apply_1(x_1, x_23);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_22);
+lean_ctor_set(x_25, 1, x_24);
+x_26 = lean_st_ref_set(x_2, x_25, x_11);
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+if (lean_is_exclusive(x_26)) {
+ lean_ctor_release(x_26, 0);
+ lean_ctor_release(x_26, 1);
+ x_28 = x_26;
+} else {
+ lean_dec_ref(x_26);
+ x_28 = lean_box(0);
+}
+x_29 = lean_box(0);
+if (lean_is_scalar(x_28)) {
+ x_30 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_30 = x_28;
+}
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_27);
+return x_30;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstStateM(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_getSubst(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -1260,33 +1354,33 @@ return x_2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_replaceLet(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_13; lean_object* x_14; uint8_t x_15; 
+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; uint8_t x_16; 
 x_8 = l_Lean_Compiler_LCNF_eraseLetDecl(x_1, x_4, x_5, x_6, x_7);
 x_9 = lean_ctor_get(x_8, 1);
 lean_inc(x_9);
 lean_dec(x_8);
-x_10 = lean_st_ref_get(x_6, x_9);
-x_11 = lean_ctor_get(x_10, 1);
-lean_inc(x_11);
-lean_dec(x_10);
-x_12 = lean_st_ref_take(x_3, x_11);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = !lean_is_exclusive(x_13);
-if (x_15 == 0)
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_16 = lean_ctor_get(x_13, 1);
-x_17 = lean_ctor_get(x_1, 0);
-lean_inc(x_17);
+x_10 = lean_ctor_get(x_1, 0);
+lean_inc(x_10);
 lean_dec(x_1);
+x_11 = lean_st_ref_get(x_6, x_9);
+x_12 = lean_ctor_get(x_11, 1);
+lean_inc(x_12);
+lean_dec(x_11);
+x_13 = lean_st_ref_take(x_3, x_12);
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = !lean_is_exclusive(x_14);
+if (x_16 == 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_14, 1);
 x_18 = l_Lean_Expr_fvar___override(x_2);
-x_19 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_16, x_17, x_18);
-lean_ctor_set(x_13, 1, x_19);
-x_20 = lean_st_ref_set(x_3, x_13, x_14);
+x_19 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_17, x_10, x_18);
+lean_ctor_set(x_14, 1, x_19);
+x_20 = lean_st_ref_set(x_3, x_14, x_15);
 x_21 = !lean_is_exclusive(x_20);
 if (x_21 == 0)
 {
@@ -1312,40 +1406,37 @@ return x_26;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_27 = lean_ctor_get(x_13, 0);
-x_28 = lean_ctor_get(x_13, 1);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_27 = lean_ctor_get(x_14, 0);
+x_28 = lean_ctor_get(x_14, 1);
 lean_inc(x_28);
 lean_inc(x_27);
-lean_dec(x_13);
-x_29 = lean_ctor_get(x_1, 0);
-lean_inc(x_29);
-lean_dec(x_1);
-x_30 = l_Lean_Expr_fvar___override(x_2);
-x_31 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_28, x_29, x_30);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_27);
-lean_ctor_set(x_32, 1, x_31);
-x_33 = lean_st_ref_set(x_3, x_32, x_14);
-x_34 = lean_ctor_get(x_33, 1);
-lean_inc(x_34);
-if (lean_is_exclusive(x_33)) {
- lean_ctor_release(x_33, 0);
- lean_ctor_release(x_33, 1);
- x_35 = x_33;
+lean_dec(x_14);
+x_29 = l_Lean_Expr_fvar___override(x_2);
+x_30 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_28, x_10, x_29);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_27);
+lean_ctor_set(x_31, 1, x_30);
+x_32 = lean_st_ref_set(x_3, x_31, x_15);
+x_33 = lean_ctor_get(x_32, 1);
+lean_inc(x_33);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ lean_ctor_release(x_32, 1);
+ x_34 = x_32;
 } else {
- lean_dec_ref(x_33);
- x_35 = lean_box(0);
+ lean_dec_ref(x_32);
+ x_34 = lean_box(0);
 }
-x_36 = lean_box(0);
-if (lean_is_scalar(x_35)) {
- x_37 = lean_alloc_ctor(0, 2, 0);
+x_35 = lean_box(0);
+if (lean_is_scalar(x_34)) {
+ x_36 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_37 = x_35;
+ x_36 = x_34;
 }
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_34);
-return x_37;
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_33);
+return x_36;
 }
 }
 }
@@ -1364,35 +1455,35 @@ return x_8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CSE_replaceFun(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-uint8_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+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; uint8_t x_17; 
 x_8 = 1;
 lean_inc(x_1);
 x_9 = l_Lean_Compiler_LCNF_eraseFunDecl(x_1, x_8, x_4, x_5, x_6, x_7);
 x_10 = lean_ctor_get(x_9, 1);
 lean_inc(x_10);
 lean_dec(x_9);
-x_11 = lean_st_ref_get(x_6, x_10);
-x_12 = lean_ctor_get(x_11, 1);
-lean_inc(x_12);
-lean_dec(x_11);
-x_13 = lean_st_ref_take(x_3, x_12);
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
-lean_dec(x_13);
-x_16 = !lean_is_exclusive(x_14);
-if (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; 
-x_17 = lean_ctor_get(x_14, 1);
-x_18 = lean_ctor_get(x_1, 0);
-lean_inc(x_18);
+x_11 = lean_ctor_get(x_1, 0);
+lean_inc(x_11);
 lean_dec(x_1);
+x_12 = lean_st_ref_get(x_6, x_10);
+x_13 = lean_ctor_get(x_12, 1);
+lean_inc(x_13);
+lean_dec(x_12);
+x_14 = lean_st_ref_take(x_3, x_13);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+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; uint8_t x_22; 
+x_18 = lean_ctor_get(x_15, 1);
 x_19 = l_Lean_Expr_fvar___override(x_2);
-x_20 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_17, x_18, x_19);
-lean_ctor_set(x_14, 1, x_20);
-x_21 = lean_st_ref_set(x_3, x_14, x_15);
+x_20 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_18, x_11, x_19);
+lean_ctor_set(x_15, 1, x_20);
+x_21 = lean_st_ref_set(x_3, x_15, x_16);
 x_22 = !lean_is_exclusive(x_21);
 if (x_22 == 0)
 {
@@ -1418,40 +1509,37 @@ return x_27;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_28 = lean_ctor_get(x_14, 0);
-x_29 = lean_ctor_get(x_14, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_28 = lean_ctor_get(x_15, 0);
+x_29 = lean_ctor_get(x_15, 1);
 lean_inc(x_29);
 lean_inc(x_28);
-lean_dec(x_14);
-x_30 = lean_ctor_get(x_1, 0);
-lean_inc(x_30);
-lean_dec(x_1);
-x_31 = l_Lean_Expr_fvar___override(x_2);
-x_32 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_29, x_30, x_31);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_32);
-x_34 = lean_st_ref_set(x_3, x_33, x_15);
-x_35 = lean_ctor_get(x_34, 1);
-lean_inc(x_35);
-if (lean_is_exclusive(x_34)) {
- lean_ctor_release(x_34, 0);
- lean_ctor_release(x_34, 1);
- x_36 = x_34;
+lean_dec(x_15);
+x_30 = l_Lean_Expr_fvar___override(x_2);
+x_31 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_29, x_11, x_30);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_28);
+lean_ctor_set(x_32, 1, x_31);
+x_33 = lean_st_ref_set(x_3, x_32, x_16);
+x_34 = lean_ctor_get(x_33, 1);
+lean_inc(x_34);
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_35 = x_33;
 } else {
- lean_dec_ref(x_34);
- x_36 = lean_box(0);
+ lean_dec_ref(x_33);
+ x_35 = lean_box(0);
 }
-x_37 = lean_box(0);
-if (lean_is_scalar(x_36)) {
- x_38 = lean_alloc_ctor(0, 2, 0);
+x_36 = lean_box(0);
+if (lean_is_scalar(x_35)) {
+ x_37 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_38 = x_36;
+ x_37 = x_35;
 }
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_35);
-return x_38;
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_34);
+return x_37;
 }
 }
 }
@@ -1467,28 +1555,28 @@ lean_dec(x_3);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___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 lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-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; 
-x_7 = lean_ctor_get(x_1, 2);
-lean_inc(x_7);
-x_8 = lean_st_ref_get(x_5, x_6);
-x_9 = lean_ctor_get(x_8, 1);
-lean_inc(x_9);
-lean_dec(x_8);
-x_10 = lean_st_ref_get(x_2, x_9);
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
+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; 
+x_8 = lean_ctor_get(x_2, 2);
+lean_inc(x_8);
+x_9 = lean_st_ref_get(x_6, x_7);
+x_10 = lean_ctor_get(x_9, 1);
+lean_inc(x_10);
+lean_dec(x_9);
+x_11 = lean_st_ref_get(x_3, x_10);
+x_12 = lean_ctor_get(x_11, 0);
 lean_inc(x_12);
-lean_dec(x_10);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_7);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_1, x_14, x_3, x_4, x_5, x_12);
-return x_15;
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_1, x_8);
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_2, x_15, x_4, x_5, x_6, x_13);
+return x_16;
 }
 }
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
@@ -1601,27 +1689,21 @@ x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1() {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2___boxed), 6, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; lean_object* x_8; 
-x_7 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1;
-x_8 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__3(x_1, x_7, x_2, x_3, x_4, x_5, x_6);
-return x_8;
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_box(x_1);
+x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2___boxed), 7, 1);
+lean_closure_set(x_9, 0, x_8);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__3(x_2, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_cse_goFunDecl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+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; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
 x_8 = lean_st_ref_get(x_5, x_6);
@@ -1637,322 +1719,323 @@ lean_dec(x_10);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_7);
-x_15 = lean_ctor_get(x_1, 2);
-lean_inc(x_15);
+x_14 = 0;
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_14, x_7);
+x_16 = lean_ctor_get(x_1, 2);
+lean_inc(x_16);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_16 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(x_15, x_2, x_3, x_4, x_5, x_12);
-if (lean_obj_tag(x_16) == 0)
+x_17 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(x_14, x_16, x_2, x_3, x_4, x_5, x_12);
+if (lean_obj_tag(x_17) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_18 = lean_ctor_get(x_17, 0);
 lean_inc(x_18);
-lean_dec(x_16);
-x_19 = lean_ctor_get(x_1, 4);
+x_19 = lean_ctor_get(x_17, 1);
 lean_inc(x_19);
-x_29 = lean_st_ref_get(x_5, x_18);
-x_30 = lean_ctor_get(x_29, 1);
-lean_inc(x_30);
-lean_dec(x_29);
-x_31 = lean_st_ref_get(x_2, x_30);
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
+lean_dec(x_17);
+x_20 = lean_ctor_get(x_1, 4);
+lean_inc(x_20);
+x_30 = lean_st_ref_get(x_5, x_19);
+x_31 = lean_ctor_get(x_30, 1);
+lean_inc(x_31);
+lean_dec(x_30);
+x_32 = lean_st_ref_get(x_2, x_31);
+x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
-lean_dec(x_31);
-x_34 = lean_ctor_get(x_32, 0);
+x_34 = lean_ctor_get(x_32, 1);
 lean_inc(x_34);
 lean_dec(x_32);
+x_35 = lean_ctor_get(x_33, 0);
+lean_inc(x_35);
+lean_dec(x_33);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_35 = l_Lean_Compiler_LCNF_Code_cse_go(x_19, x_2, x_3, x_4, x_5, x_33);
-if (lean_obj_tag(x_35) == 0)
+x_36 = l_Lean_Compiler_LCNF_Code_cse_go(x_20, x_2, x_3, x_4, x_5, x_34);
+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; lean_object* x_41; lean_object* x_42; uint8_t x_43; 
-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; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
-lean_dec(x_35);
-x_38 = lean_st_ref_get(x_5, x_37);
-x_39 = lean_ctor_get(x_38, 1);
-lean_inc(x_39);
-lean_dec(x_38);
-x_40 = lean_st_ref_take(x_2, x_39);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+x_38 = lean_ctor_get(x_36, 1);
+lean_inc(x_38);
+lean_dec(x_36);
+x_39 = lean_st_ref_get(x_5, x_38);
+x_40 = lean_ctor_get(x_39, 1);
+lean_inc(x_40);
+lean_dec(x_39);
+x_41 = lean_st_ref_take(x_2, x_40);
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = !lean_is_exclusive(x_41);
-if (x_43 == 0)
-{
-lean_object* x_44; lean_object* x_45; uint8_t x_46; 
-x_44 = lean_ctor_get(x_41, 0);
-lean_dec(x_44);
-lean_ctor_set(x_41, 0, x_34);
-x_45 = lean_st_ref_set(x_2, x_41, x_42);
-lean_dec(x_2);
-x_46 = !lean_is_exclusive(x_45);
-if (x_46 == 0)
-{
-lean_object* x_47; 
-x_47 = lean_ctor_get(x_45, 0);
-lean_dec(x_47);
-lean_ctor_set(x_45, 0, x_36);
-x_20 = x_45;
-goto block_28;
-}
-else
-{
-lean_object* x_48; lean_object* x_49; 
-x_48 = lean_ctor_get(x_45, 1);
-lean_inc(x_48);
-lean_dec(x_45);
-x_49 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_49, 0, x_36);
-lean_ctor_set(x_49, 1, x_48);
-x_20 = x_49;
-goto block_28;
-}
-}
-else
-{
-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_50 = lean_ctor_get(x_41, 1);
-lean_inc(x_50);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
 lean_dec(x_41);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_34);
-lean_ctor_set(x_51, 1, x_50);
-x_52 = lean_st_ref_set(x_2, x_51, x_42);
+x_44 = !lean_is_exclusive(x_42);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; uint8_t x_47; 
+x_45 = lean_ctor_get(x_42, 0);
+lean_dec(x_45);
+lean_ctor_set(x_42, 0, x_35);
+x_46 = lean_st_ref_set(x_2, x_42, x_43);
 lean_dec(x_2);
-x_53 = lean_ctor_get(x_52, 1);
-lean_inc(x_53);
-if (lean_is_exclusive(x_52)) {
- lean_ctor_release(x_52, 0);
- lean_ctor_release(x_52, 1);
- x_54 = x_52;
-} else {
- lean_dec_ref(x_52);
- x_54 = lean_box(0);
+x_47 = !lean_is_exclusive(x_46);
+if (x_47 == 0)
+{
+lean_object* x_48; 
+x_48 = lean_ctor_get(x_46, 0);
+lean_dec(x_48);
+lean_ctor_set(x_46, 0, x_37);
+x_21 = x_46;
+goto block_29;
 }
-if (lean_is_scalar(x_54)) {
- x_55 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_55 = x_54;
-}
-lean_ctor_set(x_55, 0, x_36);
-lean_ctor_set(x_55, 1, x_53);
-x_20 = x_55;
-goto block_28;
+else
+{
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_ctor_get(x_46, 1);
+lean_inc(x_49);
+lean_dec(x_46);
+x_50 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_50, 0, x_37);
+lean_ctor_set(x_50, 1, x_49);
+x_21 = x_50;
+goto block_29;
 }
 }
 else
 {
-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; uint8_t x_63; 
-x_56 = lean_ctor_get(x_35, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_35, 1);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_51 = lean_ctor_get(x_42, 1);
+lean_inc(x_51);
+lean_dec(x_42);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_35);
+lean_ctor_set(x_52, 1, x_51);
+x_53 = lean_st_ref_set(x_2, x_52, x_43);
+lean_dec(x_2);
+x_54 = lean_ctor_get(x_53, 1);
+lean_inc(x_54);
+if (lean_is_exclusive(x_53)) {
+ lean_ctor_release(x_53, 0);
+ lean_ctor_release(x_53, 1);
+ x_55 = x_53;
+} else {
+ lean_dec_ref(x_53);
+ x_55 = lean_box(0);
+}
+if (lean_is_scalar(x_55)) {
+ x_56 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_56 = x_55;
+}
+lean_ctor_set(x_56, 0, x_37);
+lean_ctor_set(x_56, 1, x_54);
+x_21 = x_56;
+goto block_29;
+}
+}
+else
+{
+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; uint8_t x_64; 
+x_57 = lean_ctor_get(x_36, 0);
 lean_inc(x_57);
-lean_dec(x_35);
-x_58 = lean_st_ref_get(x_5, x_57);
-x_59 = lean_ctor_get(x_58, 1);
-lean_inc(x_59);
-lean_dec(x_58);
-x_60 = lean_st_ref_take(x_2, x_59);
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_60, 1);
+x_58 = lean_ctor_get(x_36, 1);
+lean_inc(x_58);
+lean_dec(x_36);
+x_59 = lean_st_ref_get(x_5, x_58);
+x_60 = lean_ctor_get(x_59, 1);
+lean_inc(x_60);
+lean_dec(x_59);
+x_61 = lean_st_ref_take(x_2, x_60);
+x_62 = lean_ctor_get(x_61, 0);
 lean_inc(x_62);
-lean_dec(x_60);
-x_63 = !lean_is_exclusive(x_61);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; uint8_t x_66; 
-x_64 = lean_ctor_get(x_61, 0);
-lean_dec(x_64);
-lean_ctor_set(x_61, 0, x_34);
-x_65 = lean_st_ref_set(x_2, x_61, x_62);
-lean_dec(x_2);
-x_66 = !lean_is_exclusive(x_65);
-if (x_66 == 0)
-{
-lean_object* x_67; 
-x_67 = lean_ctor_get(x_65, 0);
-lean_dec(x_67);
-lean_ctor_set_tag(x_65, 1);
-lean_ctor_set(x_65, 0, x_56);
-x_20 = x_65;
-goto block_28;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; 
-x_68 = lean_ctor_get(x_65, 1);
-lean_inc(x_68);
-lean_dec(x_65);
-x_69 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_69, 0, x_56);
-lean_ctor_set(x_69, 1, x_68);
-x_20 = x_69;
-goto block_28;
-}
-}
-else
-{
-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_70 = lean_ctor_get(x_61, 1);
-lean_inc(x_70);
+x_63 = lean_ctor_get(x_61, 1);
+lean_inc(x_63);
 lean_dec(x_61);
-x_71 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_71, 0, x_34);
-lean_ctor_set(x_71, 1, x_70);
-x_72 = lean_st_ref_set(x_2, x_71, x_62);
+x_64 = !lean_is_exclusive(x_62);
+if (x_64 == 0)
+{
+lean_object* x_65; lean_object* x_66; uint8_t x_67; 
+x_65 = lean_ctor_get(x_62, 0);
+lean_dec(x_65);
+lean_ctor_set(x_62, 0, x_35);
+x_66 = lean_st_ref_set(x_2, x_62, x_63);
 lean_dec(x_2);
-x_73 = lean_ctor_get(x_72, 1);
-lean_inc(x_73);
-if (lean_is_exclusive(x_72)) {
- lean_ctor_release(x_72, 0);
- lean_ctor_release(x_72, 1);
- x_74 = x_72;
-} else {
- lean_dec_ref(x_72);
- x_74 = lean_box(0);
-}
-if (lean_is_scalar(x_74)) {
- x_75 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_75 = x_74;
- lean_ctor_set_tag(x_75, 1);
-}
-lean_ctor_set(x_75, 0, x_56);
-lean_ctor_set(x_75, 1, x_73);
-x_20 = x_75;
-goto block_28;
-}
-}
-block_28:
+x_67 = !lean_is_exclusive(x_66);
+if (x_67 == 0)
 {
-if (lean_obj_tag(x_20) == 0)
+lean_object* x_68; 
+x_68 = lean_ctor_get(x_66, 0);
+lean_dec(x_68);
+lean_ctor_set_tag(x_66, 1);
+lean_ctor_set(x_66, 0, x_57);
+x_21 = x_66;
+goto block_29;
+}
+else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
+lean_object* x_69; lean_object* x_70; 
+x_69 = lean_ctor_get(x_66, 1);
+lean_inc(x_69);
+lean_dec(x_66);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_57);
+lean_ctor_set(x_70, 1, x_69);
+x_21 = x_70;
+goto block_29;
+}
+}
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_71 = lean_ctor_get(x_62, 1);
+lean_inc(x_71);
+lean_dec(x_62);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_35);
+lean_ctor_set(x_72, 1, x_71);
+x_73 = lean_st_ref_set(x_2, x_72, x_63);
+lean_dec(x_2);
+x_74 = lean_ctor_get(x_73, 1);
+lean_inc(x_74);
+if (lean_is_exclusive(x_73)) {
+ lean_ctor_release(x_73, 0);
+ lean_ctor_release(x_73, 1);
+ x_75 = x_73;
+} else {
+ lean_dec_ref(x_73);
+ x_75 = lean_box(0);
+}
+if (lean_is_scalar(x_75)) {
+ x_76 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_76 = x_75;
+ lean_ctor_set_tag(x_76, 1);
+}
+lean_ctor_set(x_76, 0, x_57);
+lean_ctor_set(x_76, 1, x_74);
+x_21 = x_76;
+goto block_29;
+}
+}
+block_29:
+{
+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_21, 0);
 lean_inc(x_22);
-lean_dec(x_20);
-x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_1, x_14, x_17, x_21, x_3, x_4, x_5, x_22);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_1, x_15, x_18, x_22, x_3, x_4, x_5, x_23);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_23;
+return x_24;
 }
 else
 {
-uint8_t x_24; 
-lean_dec(x_17);
-lean_dec(x_14);
+uint8_t x_25; 
+lean_dec(x_18);
+lean_dec(x_15);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_24 = !lean_is_exclusive(x_20);
-if (x_24 == 0)
+x_25 = !lean_is_exclusive(x_21);
+if (x_25 == 0)
 {
-return x_20;
+return x_21;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_20, 0);
-x_26 = lean_ctor_get(x_20, 1);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_21, 0);
+x_27 = lean_ctor_get(x_21, 1);
+lean_inc(x_27);
 lean_inc(x_26);
-lean_inc(x_25);
-lean_dec(x_20);
-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;
+lean_dec(x_21);
+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;
 }
 }
 }
 }
 else
 {
-uint8_t x_76; 
-lean_dec(x_14);
+uint8_t x_77; 
+lean_dec(x_15);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_76 = !lean_is_exclusive(x_16);
-if (x_76 == 0)
+x_77 = !lean_is_exclusive(x_17);
+if (x_77 == 0)
 {
-return x_16;
+return x_17;
 }
 else
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_16, 0);
-x_78 = lean_ctor_get(x_16, 1);
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_17, 0);
+x_79 = lean_ctor_get(x_17, 1);
+lean_inc(x_79);
 lean_inc(x_78);
-lean_inc(x_77);
-lean_dec(x_16);
-x_79 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_79, 0, x_77);
-lean_ctor_set(x_79, 1, x_78);
-return x_79;
+lean_dec(x_17);
+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_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-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_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_7 = lean_ctor_get(x_1, 2);
-lean_inc(x_7);
-x_8 = lean_st_ref_get(x_5, x_6);
-x_9 = lean_ctor_get(x_8, 1);
-lean_inc(x_9);
-lean_dec(x_8);
-x_10 = lean_st_ref_get(x_2, x_9);
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
+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_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_8 = lean_ctor_get(x_2, 2);
+lean_inc(x_8);
+x_9 = lean_st_ref_get(x_6, x_7);
+x_10 = lean_ctor_get(x_9, 1);
+lean_inc(x_10);
+lean_dec(x_9);
+x_11 = lean_st_ref_get(x_3, x_10);
+x_12 = lean_ctor_get(x_11, 0);
 lean_inc(x_12);
-lean_dec(x_10);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_7);
-x_15 = lean_ctor_get(x_1, 3);
-lean_inc(x_15);
-x_16 = lean_st_ref_get(x_5, x_12);
-x_17 = lean_ctor_get(x_16, 1);
-lean_inc(x_17);
-lean_dec(x_16);
-x_18 = lean_st_ref_get(x_2, x_17);
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_1, x_8);
+x_16 = lean_ctor_get(x_2, 3);
+lean_inc(x_16);
+x_17 = lean_st_ref_get(x_6, x_13);
+x_18 = lean_ctor_get(x_17, 1);
+lean_inc(x_18);
+lean_dec(x_17);
+x_19 = lean_st_ref_get(x_3, x_18);
+x_20 = lean_ctor_get(x_19, 0);
 lean_inc(x_20);
-lean_dec(x_18);
 x_21 = lean_ctor_get(x_19, 1);
 lean_inc(x_21);
 lean_dec(x_19);
-x_22 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_21, x_15);
-x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_1, x_14, x_22, x_3, x_4, x_5, x_20);
-return x_23;
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_22, x_1, x_16);
+x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_2, x_15, x_23, x_4, x_5, x_6, x_21);
+return x_24;
 }
 }
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -2089,43 +2172,43 @@ lean_dec(x_2);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___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_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
-x_7 = lean_st_ref_get(x_5, x_6);
-x_8 = lean_ctor_get(x_7, 1);
-lean_inc(x_8);
-lean_dec(x_7);
-x_9 = lean_st_ref_get(x_2, x_8);
-x_10 = !lean_is_exclusive(x_9);
-if (x_10 == 0)
+lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_8 = lean_st_ref_get(x_6, x_7);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = lean_st_ref_get(x_3, x_9);
+x_11 = !lean_is_exclusive(x_10);
+if (x_11 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_11 = lean_ctor_get(x_9, 0);
-x_12 = lean_ctor_get(x_11, 1);
-lean_inc(x_12);
-lean_dec(x_11);
-x_13 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_12, x_1);
-lean_ctor_set(x_9, 0, x_13);
-return x_9;
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_12 = lean_ctor_get(x_10, 0);
+x_13 = lean_ctor_get(x_12, 1);
+lean_inc(x_13);
+lean_dec(x_12);
+x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_1, x_2);
+lean_ctor_set(x_10, 0, x_14);
+return x_10;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_14 = lean_ctor_get(x_9, 0);
-x_15 = lean_ctor_get(x_9, 1);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_9);
-x_16 = lean_ctor_get(x_14, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_15 = lean_ctor_get(x_10, 0);
+x_16 = lean_ctor_get(x_10, 1);
 lean_inc(x_16);
-lean_dec(x_14);
-x_17 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_16, x_1);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_15);
-return x_18;
+lean_inc(x_15);
+lean_dec(x_10);
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_17, x_1, x_2);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_16);
+return x_19;
 }
 }
 }
@@ -2239,21 +2322,15 @@ x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1() {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6___boxed), 6, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(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; 
-x_7 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1;
-x_8 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__7(x_1, x_7, x_2, x_3, x_4, x_5, x_6);
-return x_8;
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_box(x_1);
+x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6___boxed), 7, 1);
+lean_closure_set(x_9, 0, x_8);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__7(x_2, x_9, x_3, x_4, x_5, x_6, x_7);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Code_cse_go___spec__10(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) {
@@ -2371,7 +2448,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-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_object* x_36; 
+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; uint8_t x_36; lean_object* x_37; 
 x_7 = lean_ctor_get(x_1, 1);
 lean_inc(x_7);
 x_8 = lean_ctor_get(x_1, 2);
@@ -2389,132 +2466,133 @@ lean_dec(x_11);
 x_14 = lean_ctor_get(x_12, 0);
 lean_inc(x_14);
 lean_dec(x_12);
+x_36 = 0;
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_36 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(x_7, x_2, x_3, x_4, x_5, x_13);
-if (lean_obj_tag(x_36) == 0)
+x_37 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(x_36, x_7, x_2, x_3, x_4, x_5, x_13);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_36, 1);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_37, 0);
 lean_inc(x_38);
-lean_dec(x_36);
+x_39 = lean_ctor_get(x_37, 1);
+lean_inc(x_39);
+lean_dec(x_37);
 lean_inc(x_5);
 lean_inc(x_2);
-x_39 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_38);
-if (lean_obj_tag(x_39) == 0)
+x_40 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_39);
+if (lean_obj_tag(x_40) == 0)
 {
-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; 
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
+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; 
+x_41 = lean_ctor_get(x_40, 0);
 lean_inc(x_41);
-lean_dec(x_39);
-x_42 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_1, x_37, x_40);
-x_43 = lean_st_ref_get(x_5, x_41);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+x_43 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_1, x_38, x_41);
+x_44 = lean_st_ref_get(x_5, x_42);
 lean_dec(x_5);
-x_44 = lean_ctor_get(x_43, 1);
-lean_inc(x_44);
-lean_dec(x_43);
-x_45 = lean_st_ref_take(x_2, x_44);
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
+x_45 = lean_ctor_get(x_44, 1);
+lean_inc(x_45);
+lean_dec(x_44);
+x_46 = lean_st_ref_take(x_2, x_45);
+x_47 = lean_ctor_get(x_46, 0);
 lean_inc(x_47);
-lean_dec(x_45);
-x_48 = !lean_is_exclusive(x_46);
-if (x_48 == 0)
-{
-lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-x_49 = lean_ctor_get(x_46, 0);
-lean_dec(x_49);
-lean_ctor_set(x_46, 0, x_14);
-x_50 = lean_st_ref_set(x_2, x_46, x_47);
-lean_dec(x_2);
-x_51 = !lean_is_exclusive(x_50);
-if (x_51 == 0)
-{
-lean_object* x_52; 
-x_52 = lean_ctor_get(x_50, 0);
-lean_dec(x_52);
-lean_ctor_set(x_50, 0, x_42);
-return x_50;
-}
-else
-{
-lean_object* x_53; lean_object* x_54; 
-x_53 = lean_ctor_get(x_50, 1);
-lean_inc(x_53);
-lean_dec(x_50);
-x_54 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_54, 0, x_42);
-lean_ctor_set(x_54, 1, x_53);
-return x_54;
-}
-}
-else
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_55 = lean_ctor_get(x_46, 1);
-lean_inc(x_55);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
 lean_dec(x_46);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_14);
-lean_ctor_set(x_56, 1, x_55);
-x_57 = lean_st_ref_set(x_2, x_56, x_47);
+x_49 = !lean_is_exclusive(x_47);
+if (x_49 == 0)
+{
+lean_object* x_50; lean_object* x_51; uint8_t x_52; 
+x_50 = lean_ctor_get(x_47, 0);
+lean_dec(x_50);
+lean_ctor_set(x_47, 0, x_14);
+x_51 = lean_st_ref_set(x_2, x_47, x_48);
 lean_dec(x_2);
-x_58 = lean_ctor_get(x_57, 1);
-lean_inc(x_58);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_59 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_59 = lean_box(0);
+x_52 = !lean_is_exclusive(x_51);
+if (x_52 == 0)
+{
+lean_object* x_53; 
+x_53 = lean_ctor_get(x_51, 0);
+lean_dec(x_53);
+lean_ctor_set(x_51, 0, x_43);
+return x_51;
 }
-if (lean_is_scalar(x_59)) {
- x_60 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_60 = x_59;
-}
-lean_ctor_set(x_60, 0, x_42);
-lean_ctor_set(x_60, 1, x_58);
-return x_60;
+else
+{
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_51, 1);
+lean_inc(x_54);
+lean_dec(x_51);
+x_55 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_55, 0, x_43);
+lean_ctor_set(x_55, 1, x_54);
+return x_55;
 }
 }
 else
 {
-lean_object* x_61; lean_object* x_62; 
-lean_dec(x_37);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_56 = lean_ctor_get(x_47, 1);
+lean_inc(x_56);
+lean_dec(x_47);
+x_57 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_57, 0, x_14);
+lean_ctor_set(x_57, 1, x_56);
+x_58 = lean_st_ref_set(x_2, x_57, x_48);
+lean_dec(x_2);
+x_59 = lean_ctor_get(x_58, 1);
+lean_inc(x_59);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ lean_ctor_release(x_58, 1);
+ x_60 = x_58;
+} else {
+ lean_dec_ref(x_58);
+ x_60 = lean_box(0);
+}
+if (lean_is_scalar(x_60)) {
+ x_61 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_61 = x_60;
+}
+lean_ctor_set(x_61, 0, x_43);
+lean_ctor_set(x_61, 1, x_59);
+return x_61;
+}
+}
+else
+{
+lean_object* x_62; lean_object* x_63; 
+lean_dec(x_38);
 lean_dec(x_1);
-x_61 = lean_ctor_get(x_39, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_39, 1);
+x_62 = lean_ctor_get(x_40, 0);
 lean_inc(x_62);
-lean_dec(x_39);
-x_15 = x_61;
-x_16 = x_62;
+x_63 = lean_ctor_get(x_40, 1);
+lean_inc(x_63);
+lean_dec(x_40);
+x_15 = x_62;
+x_16 = x_63;
 goto block_35;
 }
 }
 else
 {
-lean_object* x_63; lean_object* x_64; 
+lean_object* x_64; lean_object* x_65; 
 lean_dec(x_8);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_63 = lean_ctor_get(x_36, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_36, 1);
+x_64 = lean_ctor_get(x_37, 0);
 lean_inc(x_64);
-lean_dec(x_36);
-x_15 = x_63;
-x_16 = x_64;
+x_65 = lean_ctor_get(x_37, 1);
+lean_inc(x_65);
+lean_dec(x_37);
+x_15 = x_64;
+x_16 = x_65;
 goto block_35;
 }
 block_35:
@@ -2597,187 +2675,187 @@ return x_34;
 }
 else
 {
-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; 
-x_65 = lean_ctor_get(x_1, 0);
-lean_inc(x_65);
-x_66 = lean_st_ref_get(x_5, x_6);
-x_67 = lean_ctor_get(x_66, 1);
-lean_inc(x_67);
-lean_dec(x_66);
-x_68 = lean_st_ref_get(x_2, x_67);
-x_69 = lean_ctor_get(x_68, 0);
-lean_inc(x_69);
-x_70 = lean_ctor_get(x_68, 1);
+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; 
+x_66 = lean_ctor_get(x_1, 0);
+lean_inc(x_66);
+x_67 = lean_st_ref_get(x_5, x_6);
+x_68 = lean_ctor_get(x_67, 1);
+lean_inc(x_68);
+lean_dec(x_67);
+x_69 = lean_st_ref_get(x_2, x_68);
+x_70 = lean_ctor_get(x_69, 0);
 lean_inc(x_70);
-lean_dec(x_68);
-x_71 = lean_ctor_get(x_69, 0);
+x_71 = lean_ctor_get(x_69, 1);
 lean_inc(x_71);
 lean_dec(x_69);
+x_72 = lean_ctor_get(x_70, 0);
+lean_inc(x_72);
+lean_dec(x_70);
 lean_inc(x_5);
 lean_inc(x_2);
-x_72 = l_Lean_Compiler_LCNF_Code_cse_go(x_65, x_2, x_3, x_4, x_5, x_70);
-if (lean_obj_tag(x_72) == 0)
+x_73 = l_Lean_Compiler_LCNF_Code_cse_go(x_66, x_2, x_3, x_4, x_5, x_71);
+if (lean_obj_tag(x_73) == 0)
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; uint8_t x_81; 
-x_73 = lean_ctor_get(x_72, 0);
-lean_inc(x_73);
-x_74 = lean_ctor_get(x_72, 1);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 
+x_74 = lean_ctor_get(x_73, 0);
 lean_inc(x_74);
-lean_dec(x_72);
-x_75 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_1, x_73);
-x_76 = lean_st_ref_get(x_5, x_74);
+x_75 = lean_ctor_get(x_73, 1);
+lean_inc(x_75);
+lean_dec(x_73);
+x_76 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_1, x_74);
+x_77 = lean_st_ref_get(x_5, x_75);
 lean_dec(x_5);
-x_77 = lean_ctor_get(x_76, 1);
-lean_inc(x_77);
-lean_dec(x_76);
-x_78 = lean_st_ref_take(x_2, x_77);
-x_79 = lean_ctor_get(x_78, 0);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_78, 1);
+x_78 = lean_ctor_get(x_77, 1);
+lean_inc(x_78);
+lean_dec(x_77);
+x_79 = lean_st_ref_take(x_2, x_78);
+x_80 = lean_ctor_get(x_79, 0);
 lean_inc(x_80);
-lean_dec(x_78);
-x_81 = !lean_is_exclusive(x_79);
-if (x_81 == 0)
-{
-lean_object* x_82; lean_object* x_83; uint8_t x_84; 
-x_82 = lean_ctor_get(x_79, 0);
-lean_dec(x_82);
-lean_ctor_set(x_79, 0, x_71);
-x_83 = lean_st_ref_set(x_2, x_79, x_80);
-lean_dec(x_2);
-x_84 = !lean_is_exclusive(x_83);
-if (x_84 == 0)
-{
-lean_object* x_85; 
-x_85 = lean_ctor_get(x_83, 0);
-lean_dec(x_85);
-lean_ctor_set(x_83, 0, x_75);
-return x_83;
-}
-else
-{
-lean_object* x_86; lean_object* x_87; 
-x_86 = lean_ctor_get(x_83, 1);
-lean_inc(x_86);
-lean_dec(x_83);
-x_87 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_87, 0, x_75);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
-}
-}
-else
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_88 = lean_ctor_get(x_79, 1);
-lean_inc(x_88);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
 lean_dec(x_79);
-x_89 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_89, 0, x_71);
-lean_ctor_set(x_89, 1, x_88);
-x_90 = lean_st_ref_set(x_2, x_89, x_80);
+x_82 = !lean_is_exclusive(x_80);
+if (x_82 == 0)
+{
+lean_object* x_83; lean_object* x_84; uint8_t x_85; 
+x_83 = lean_ctor_get(x_80, 0);
+lean_dec(x_83);
+lean_ctor_set(x_80, 0, x_72);
+x_84 = lean_st_ref_set(x_2, x_80, x_81);
 lean_dec(x_2);
-x_91 = lean_ctor_get(x_90, 1);
-lean_inc(x_91);
-if (lean_is_exclusive(x_90)) {
- lean_ctor_release(x_90, 0);
- lean_ctor_release(x_90, 1);
- x_92 = x_90;
-} else {
- lean_dec_ref(x_90);
- x_92 = lean_box(0);
+x_85 = !lean_is_exclusive(x_84);
+if (x_85 == 0)
+{
+lean_object* x_86; 
+x_86 = lean_ctor_get(x_84, 0);
+lean_dec(x_86);
+lean_ctor_set(x_84, 0, x_76);
+return x_84;
 }
-if (lean_is_scalar(x_92)) {
- x_93 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_93 = x_92;
-}
-lean_ctor_set(x_93, 0, x_75);
-lean_ctor_set(x_93, 1, x_91);
-return x_93;
+else
+{
+lean_object* x_87; lean_object* x_88; 
+x_87 = lean_ctor_get(x_84, 1);
+lean_inc(x_87);
+lean_dec(x_84);
+x_88 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_88, 0, x_76);
+lean_ctor_set(x_88, 1, x_87);
+return x_88;
 }
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; uint8_t x_101; 
+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_89 = lean_ctor_get(x_80, 1);
+lean_inc(x_89);
+lean_dec(x_80);
+x_90 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_90, 0, x_72);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = lean_st_ref_set(x_2, x_90, x_81);
+lean_dec(x_2);
+x_92 = lean_ctor_get(x_91, 1);
+lean_inc(x_92);
+if (lean_is_exclusive(x_91)) {
+ lean_ctor_release(x_91, 0);
+ lean_ctor_release(x_91, 1);
+ x_93 = x_91;
+} else {
+ lean_dec_ref(x_91);
+ x_93 = lean_box(0);
+}
+if (lean_is_scalar(x_93)) {
+ x_94 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_94 = x_93;
+}
+lean_ctor_set(x_94, 0, x_76);
+lean_ctor_set(x_94, 1, x_92);
+return x_94;
+}
+}
+else
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; uint8_t x_102; 
 lean_dec(x_1);
-x_94 = lean_ctor_get(x_72, 0);
-lean_inc(x_94);
-x_95 = lean_ctor_get(x_72, 1);
+x_95 = lean_ctor_get(x_73, 0);
 lean_inc(x_95);
-lean_dec(x_72);
-x_96 = lean_st_ref_get(x_5, x_95);
+x_96 = lean_ctor_get(x_73, 1);
+lean_inc(x_96);
+lean_dec(x_73);
+x_97 = lean_st_ref_get(x_5, x_96);
 lean_dec(x_5);
-x_97 = lean_ctor_get(x_96, 1);
-lean_inc(x_97);
-lean_dec(x_96);
-x_98 = lean_st_ref_take(x_2, x_97);
-x_99 = lean_ctor_get(x_98, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
+x_98 = lean_ctor_get(x_97, 1);
+lean_inc(x_98);
+lean_dec(x_97);
+x_99 = lean_st_ref_take(x_2, x_98);
+x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
-lean_dec(x_98);
-x_101 = !lean_is_exclusive(x_99);
-if (x_101 == 0)
-{
-lean_object* x_102; lean_object* x_103; uint8_t x_104; 
-x_102 = lean_ctor_get(x_99, 0);
-lean_dec(x_102);
-lean_ctor_set(x_99, 0, x_71);
-x_103 = lean_st_ref_set(x_2, x_99, x_100);
-lean_dec(x_2);
-x_104 = !lean_is_exclusive(x_103);
-if (x_104 == 0)
-{
-lean_object* x_105; 
-x_105 = lean_ctor_get(x_103, 0);
-lean_dec(x_105);
-lean_ctor_set_tag(x_103, 1);
-lean_ctor_set(x_103, 0, x_94);
-return x_103;
-}
-else
-{
-lean_object* x_106; lean_object* x_107; 
-x_106 = lean_ctor_get(x_103, 1);
-lean_inc(x_106);
-lean_dec(x_103);
-x_107 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_107, 0, x_94);
-lean_ctor_set(x_107, 1, x_106);
-return x_107;
-}
-}
-else
-{
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_108 = lean_ctor_get(x_99, 1);
-lean_inc(x_108);
+x_101 = lean_ctor_get(x_99, 1);
+lean_inc(x_101);
 lean_dec(x_99);
-x_109 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_109, 0, x_71);
-lean_ctor_set(x_109, 1, x_108);
-x_110 = lean_st_ref_set(x_2, x_109, x_100);
+x_102 = !lean_is_exclusive(x_100);
+if (x_102 == 0)
+{
+lean_object* x_103; lean_object* x_104; uint8_t x_105; 
+x_103 = lean_ctor_get(x_100, 0);
+lean_dec(x_103);
+lean_ctor_set(x_100, 0, x_72);
+x_104 = lean_st_ref_set(x_2, x_100, x_101);
 lean_dec(x_2);
-x_111 = lean_ctor_get(x_110, 1);
-lean_inc(x_111);
-if (lean_is_exclusive(x_110)) {
- lean_ctor_release(x_110, 0);
- lean_ctor_release(x_110, 1);
- x_112 = x_110;
-} else {
- lean_dec_ref(x_110);
- x_112 = lean_box(0);
+x_105 = !lean_is_exclusive(x_104);
+if (x_105 == 0)
+{
+lean_object* x_106; 
+x_106 = lean_ctor_get(x_104, 0);
+lean_dec(x_106);
+lean_ctor_set_tag(x_104, 1);
+lean_ctor_set(x_104, 0, x_95);
+return x_104;
 }
-if (lean_is_scalar(x_112)) {
- x_113 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_113 = x_112;
- lean_ctor_set_tag(x_113, 1);
+else
+{
+lean_object* x_107; lean_object* x_108; 
+x_107 = lean_ctor_get(x_104, 1);
+lean_inc(x_107);
+lean_dec(x_104);
+x_108 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_108, 0, x_95);
+lean_ctor_set(x_108, 1, x_107);
+return x_108;
 }
-lean_ctor_set(x_113, 0, x_94);
-lean_ctor_set(x_113, 1, x_111);
-return x_113;
+}
+else
+{
+lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+x_109 = lean_ctor_get(x_100, 1);
+lean_inc(x_109);
+lean_dec(x_100);
+x_110 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_110, 0, x_72);
+lean_ctor_set(x_110, 1, x_109);
+x_111 = lean_st_ref_set(x_2, x_110, x_101);
+lean_dec(x_2);
+x_112 = lean_ctor_get(x_111, 1);
+lean_inc(x_112);
+if (lean_is_exclusive(x_111)) {
+ lean_ctor_release(x_111, 0);
+ lean_ctor_release(x_111, 1);
+ x_113 = x_111;
+} else {
+ lean_dec_ref(x_111);
+ x_113 = lean_box(0);
+}
+if (lean_is_scalar(x_113)) {
+ x_114 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_114 = x_113;
+ lean_ctor_set_tag(x_114, 1);
+}
+lean_ctor_set(x_114, 0, x_95);
+lean_ctor_set(x_114, 1, x_112);
+return x_114;
 }
 }
 }
@@ -2806,1596 +2884,1599 @@ _start:
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-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_object* x_17; lean_object* x_18; lean_object* x_19; 
+lean_object* x_7; lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
 x_7 = lean_ctor_get(x_1, 0);
 lean_inc(x_7);
 x_8 = lean_ctor_get(x_1, 1);
 lean_inc(x_8);
+x_9 = 0;
 lean_inc(x_7);
-x_9 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(x_7, x_2, x_3, x_4, x_5, x_6);
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
+x_10 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(x_9, x_7, x_2, x_3, x_4, x_5, x_6);
+x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
-lean_dec(x_9);
-x_12 = lean_st_ref_get(x_5, x_11);
-x_13 = lean_ctor_get(x_12, 1);
-lean_inc(x_13);
-lean_dec(x_12);
-x_14 = lean_st_ref_get(x_2, x_13);
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = lean_st_ref_get(x_5, x_12);
+x_14 = lean_ctor_get(x_13, 1);
+lean_inc(x_14);
+lean_dec(x_13);
+x_15 = lean_st_ref_get(x_2, x_14);
+x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_ctor_get(x_15, 0);
+x_17 = lean_ctor_get(x_15, 1);
 lean_inc(x_17);
 lean_dec(x_15);
-x_18 = lean_ctor_get(x_10, 3);
+x_18 = lean_ctor_get(x_16, 0);
 lean_inc(x_18);
-lean_inc(x_18);
-x_19 = l_Std_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(x_17, x_18);
-if (lean_obj_tag(x_19) == 0)
+lean_dec(x_16);
+x_19 = lean_ctor_get(x_11, 3);
+lean_inc(x_19);
+lean_inc(x_19);
+x_20 = l_Std_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(x_18, x_19);
+if (lean_obj_tag(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_10, 0);
-lean_inc(x_20);
-x_21 = lean_st_ref_get(x_5, x_16);
-x_22 = lean_ctor_get(x_21, 1);
-lean_inc(x_22);
-lean_dec(x_21);
-x_23 = lean_st_ref_take(x_2, x_22);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
+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_11, 0);
+lean_inc(x_21);
+x_22 = lean_st_ref_get(x_5, x_17);
+x_23 = lean_ctor_get(x_22, 1);
+lean_inc(x_23);
+lean_dec(x_22);
+x_24 = lean_st_ref_take(x_2, x_23);
+x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
-lean_dec(x_23);
-x_26 = !lean_is_exclusive(x_24);
-if (x_26 == 0)
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
+lean_dec(x_24);
+x_27 = !lean_is_exclusive(x_25);
+if (x_27 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_27 = lean_ctor_get(x_24, 0);
-x_28 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_27, x_18, x_20);
-lean_ctor_set(x_24, 0, x_28);
-x_29 = lean_st_ref_set(x_2, x_24, x_25);
-x_30 = lean_ctor_get(x_29, 1);
-lean_inc(x_30);
-lean_dec(x_29);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_28 = lean_ctor_get(x_25, 0);
+x_29 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_28, x_19, x_21);
+lean_ctor_set(x_25, 0, x_29);
+x_30 = lean_st_ref_set(x_2, x_25, x_26);
+x_31 = lean_ctor_get(x_30, 1);
+lean_inc(x_31);
+lean_dec(x_30);
 lean_inc(x_8);
-x_31 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_30);
-if (lean_obj_tag(x_31) == 0)
+x_32 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_31);
+if (lean_obj_tag(x_32) == 0)
 {
-uint8_t x_32; 
-x_32 = !lean_is_exclusive(x_31);
-if (x_32 == 0)
+uint8_t x_33; 
+x_33 = !lean_is_exclusive(x_32);
+if (x_33 == 0)
 {
-lean_object* x_33; size_t x_34; size_t x_35; uint8_t x_36; 
-x_33 = lean_ctor_get(x_31, 0);
-x_34 = lean_ptr_addr(x_8);
+lean_object* x_34; size_t x_35; size_t x_36; uint8_t x_37; 
+x_34 = lean_ctor_get(x_32, 0);
+x_35 = lean_ptr_addr(x_8);
 lean_dec(x_8);
-x_35 = lean_ptr_addr(x_33);
-x_36 = lean_usize_dec_eq(x_34, x_35);
-if (x_36 == 0)
-{
-uint8_t x_37; 
-lean_dec(x_7);
-x_37 = !lean_is_exclusive(x_1);
+x_36 = lean_ptr_addr(x_34);
+x_37 = lean_usize_dec_eq(x_35, x_36);
 if (x_37 == 0)
 {
-lean_object* x_38; lean_object* x_39; 
-x_38 = lean_ctor_get(x_1, 1);
-lean_dec(x_38);
-x_39 = lean_ctor_get(x_1, 0);
-lean_dec(x_39);
-lean_ctor_set(x_1, 1, x_33);
-lean_ctor_set(x_1, 0, x_10);
-lean_ctor_set(x_31, 0, x_1);
-return x_31;
-}
-else
-{
-lean_object* x_40; 
-lean_dec(x_1);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_10);
-lean_ctor_set(x_40, 1, x_33);
-lean_ctor_set(x_31, 0, x_40);
-return x_31;
-}
-}
-else
-{
-size_t x_41; size_t x_42; uint8_t x_43; 
-x_41 = lean_ptr_addr(x_7);
+uint8_t x_38; 
 lean_dec(x_7);
-x_42 = lean_ptr_addr(x_10);
-x_43 = lean_usize_dec_eq(x_41, x_42);
-if (x_43 == 0)
+x_38 = !lean_is_exclusive(x_1);
+if (x_38 == 0)
 {
-uint8_t x_44; 
-x_44 = !lean_is_exclusive(x_1);
+lean_object* x_39; lean_object* x_40; 
+x_39 = lean_ctor_get(x_1, 1);
+lean_dec(x_39);
+x_40 = lean_ctor_get(x_1, 0);
+lean_dec(x_40);
+lean_ctor_set(x_1, 1, x_34);
+lean_ctor_set(x_1, 0, x_11);
+lean_ctor_set(x_32, 0, x_1);
+return x_32;
+}
+else
+{
+lean_object* x_41; 
+lean_dec(x_1);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_11);
+lean_ctor_set(x_41, 1, x_34);
+lean_ctor_set(x_32, 0, x_41);
+return x_32;
+}
+}
+else
+{
+size_t x_42; size_t x_43; uint8_t x_44; 
+x_42 = lean_ptr_addr(x_7);
+lean_dec(x_7);
+x_43 = lean_ptr_addr(x_11);
+x_44 = lean_usize_dec_eq(x_42, x_43);
 if (x_44 == 0)
 {
-lean_object* x_45; lean_object* x_46; 
-x_45 = lean_ctor_get(x_1, 1);
-lean_dec(x_45);
-x_46 = lean_ctor_get(x_1, 0);
+uint8_t x_45; 
+x_45 = !lean_is_exclusive(x_1);
+if (x_45 == 0)
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_ctor_get(x_1, 1);
 lean_dec(x_46);
-lean_ctor_set(x_1, 1, x_33);
-lean_ctor_set(x_1, 0, x_10);
-lean_ctor_set(x_31, 0, x_1);
-return x_31;
+x_47 = lean_ctor_get(x_1, 0);
+lean_dec(x_47);
+lean_ctor_set(x_1, 1, x_34);
+lean_ctor_set(x_1, 0, x_11);
+lean_ctor_set(x_32, 0, x_1);
+return x_32;
 }
 else
 {
-lean_object* x_47; 
+lean_object* x_48; 
 lean_dec(x_1);
-x_47 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_47, 0, x_10);
-lean_ctor_set(x_47, 1, x_33);
-lean_ctor_set(x_31, 0, x_47);
-return x_31;
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_11);
+lean_ctor_set(x_48, 1, x_34);
+lean_ctor_set(x_32, 0, x_48);
+return x_32;
 }
 }
 else
 {
-lean_dec(x_33);
-lean_dec(x_10);
-lean_ctor_set(x_31, 0, x_1);
-return x_31;
+lean_dec(x_34);
+lean_dec(x_11);
+lean_ctor_set(x_32, 0, x_1);
+return x_32;
 }
 }
 }
 else
 {
-lean_object* x_48; lean_object* x_49; size_t x_50; size_t x_51; uint8_t x_52; 
-x_48 = lean_ctor_get(x_31, 0);
-x_49 = lean_ctor_get(x_31, 1);
+lean_object* x_49; lean_object* x_50; size_t x_51; size_t x_52; uint8_t x_53; 
+x_49 = lean_ctor_get(x_32, 0);
+x_50 = lean_ctor_get(x_32, 1);
+lean_inc(x_50);
 lean_inc(x_49);
-lean_inc(x_48);
-lean_dec(x_31);
-x_50 = lean_ptr_addr(x_8);
+lean_dec(x_32);
+x_51 = lean_ptr_addr(x_8);
 lean_dec(x_8);
-x_51 = lean_ptr_addr(x_48);
-x_52 = lean_usize_dec_eq(x_50, x_51);
-if (x_52 == 0)
+x_52 = lean_ptr_addr(x_49);
+x_53 = lean_usize_dec_eq(x_51, x_52);
+if (x_53 == 0)
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
 lean_dec(x_7);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_53 = x_1;
+ x_54 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_53 = lean_box(0);
+ x_54 = lean_box(0);
 }
-if (lean_is_scalar(x_53)) {
- x_54 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_54)) {
+ x_55 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_54 = x_53;
+ x_55 = x_54;
 }
-lean_ctor_set(x_54, 0, x_10);
-lean_ctor_set(x_54, 1, x_48);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_54);
+lean_ctor_set(x_55, 0, x_11);
 lean_ctor_set(x_55, 1, x_49);
-return x_55;
+x_56 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_50);
+return x_56;
 }
 else
 {
-size_t x_56; size_t x_57; uint8_t x_58; 
-x_56 = lean_ptr_addr(x_7);
+size_t x_57; size_t x_58; uint8_t x_59; 
+x_57 = lean_ptr_addr(x_7);
 lean_dec(x_7);
-x_57 = lean_ptr_addr(x_10);
-x_58 = lean_usize_dec_eq(x_56, x_57);
-if (x_58 == 0)
+x_58 = lean_ptr_addr(x_11);
+x_59 = lean_usize_dec_eq(x_57, x_58);
+if (x_59 == 0)
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_59 = x_1;
+ x_60 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_59 = lean_box(0);
+ x_60 = lean_box(0);
 }
-if (lean_is_scalar(x_59)) {
- x_60 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_60)) {
+ x_61 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_60 = x_59;
+ x_61 = x_60;
 }
-lean_ctor_set(x_60, 0, x_10);
-lean_ctor_set(x_60, 1, x_48);
-x_61 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 0, x_11);
 lean_ctor_set(x_61, 1, x_49);
-return x_61;
-}
-else
-{
-lean_object* x_62; 
-lean_dec(x_48);
-lean_dec(x_10);
 x_62 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_62, 0, x_1);
-lean_ctor_set(x_62, 1, x_49);
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_50);
 return x_62;
 }
+else
+{
+lean_object* x_63; 
+lean_dec(x_49);
+lean_dec(x_11);
+x_63 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_63, 0, x_1);
+lean_ctor_set(x_63, 1, x_50);
+return x_63;
+}
 }
 }
 }
 else
 {
-uint8_t x_63; 
-lean_dec(x_10);
+uint8_t x_64; 
+lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_63 = !lean_is_exclusive(x_31);
-if (x_63 == 0)
+x_64 = !lean_is_exclusive(x_32);
+if (x_64 == 0)
 {
-return x_31;
+return x_32;
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_31, 0);
-x_65 = lean_ctor_get(x_31, 1);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_32, 0);
+x_66 = lean_ctor_get(x_32, 1);
+lean_inc(x_66);
 lean_inc(x_65);
-lean_inc(x_64);
-lean_dec(x_31);
-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_32);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
 }
 }
 }
 else
 {
-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; 
-x_67 = lean_ctor_get(x_24, 0);
-x_68 = lean_ctor_get(x_24, 1);
+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_68 = lean_ctor_get(x_25, 0);
+x_69 = lean_ctor_get(x_25, 1);
+lean_inc(x_69);
 lean_inc(x_68);
-lean_inc(x_67);
-lean_dec(x_24);
-x_69 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_67, x_18, x_20);
-x_70 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_68);
-x_71 = lean_st_ref_set(x_2, x_70, x_25);
-x_72 = lean_ctor_get(x_71, 1);
-lean_inc(x_72);
-lean_dec(x_71);
+lean_dec(x_25);
+x_70 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_68, x_19, x_21);
+x_71 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_69);
+x_72 = lean_st_ref_set(x_2, x_71, x_26);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
 lean_inc(x_8);
-x_73 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_72);
-if (lean_obj_tag(x_73) == 0)
+x_74 = l_Lean_Compiler_LCNF_Code_cse_go(x_8, x_2, x_3, x_4, x_5, x_73);
+if (lean_obj_tag(x_74) == 0)
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; size_t x_77; size_t x_78; uint8_t x_79; 
-x_74 = lean_ctor_get(x_73, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
+lean_object* x_75; lean_object* x_76; lean_object* x_77; size_t x_78; size_t x_79; uint8_t x_80; 
+x_75 = lean_ctor_get(x_74, 0);
 lean_inc(x_75);
-if (lean_is_exclusive(x_73)) {
- lean_ctor_release(x_73, 0);
- lean_ctor_release(x_73, 1);
- x_76 = x_73;
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_77 = x_74;
 } else {
- lean_dec_ref(x_73);
- x_76 = lean_box(0);
+ lean_dec_ref(x_74);
+ x_77 = lean_box(0);
 }
-x_77 = lean_ptr_addr(x_8);
+x_78 = lean_ptr_addr(x_8);
 lean_dec(x_8);
-x_78 = lean_ptr_addr(x_74);
-x_79 = lean_usize_dec_eq(x_77, x_78);
-if (x_79 == 0)
+x_79 = lean_ptr_addr(x_75);
+x_80 = lean_usize_dec_eq(x_78, x_79);
+if (x_80 == 0)
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
 lean_dec(x_7);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_80 = x_1;
+ x_81 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_80 = lean_box(0);
+ x_81 = lean_box(0);
 }
-if (lean_is_scalar(x_80)) {
- x_81 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_81 = x_80;
-}
-lean_ctor_set(x_81, 0, x_10);
-lean_ctor_set(x_81, 1, x_74);
-if (lean_is_scalar(x_76)) {
+if (lean_is_scalar(x_81)) {
  x_82 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_82 = x_76;
+ x_82 = x_81;
 }
-lean_ctor_set(x_82, 0, x_81);
+lean_ctor_set(x_82, 0, x_11);
 lean_ctor_set(x_82, 1, x_75);
-return x_82;
+if (lean_is_scalar(x_77)) {
+ x_83 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_83 = x_77;
+}
+lean_ctor_set(x_83, 0, x_82);
+lean_ctor_set(x_83, 1, x_76);
+return x_83;
 }
 else
 {
-size_t x_83; size_t x_84; uint8_t x_85; 
-x_83 = lean_ptr_addr(x_7);
+size_t x_84; size_t x_85; uint8_t x_86; 
+x_84 = lean_ptr_addr(x_7);
 lean_dec(x_7);
-x_84 = lean_ptr_addr(x_10);
-x_85 = lean_usize_dec_eq(x_83, x_84);
-if (x_85 == 0)
+x_85 = lean_ptr_addr(x_11);
+x_86 = lean_usize_dec_eq(x_84, x_85);
+if (x_86 == 0)
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_86 = x_1;
+ x_87 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_86 = lean_box(0);
+ x_87 = lean_box(0);
 }
-if (lean_is_scalar(x_86)) {
- x_87 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_87 = x_86;
-}
-lean_ctor_set(x_87, 0, x_10);
-lean_ctor_set(x_87, 1, x_74);
-if (lean_is_scalar(x_76)) {
+if (lean_is_scalar(x_87)) {
  x_88 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_88 = x_76;
+ x_88 = x_87;
 }
-lean_ctor_set(x_88, 0, x_87);
+lean_ctor_set(x_88, 0, x_11);
 lean_ctor_set(x_88, 1, x_75);
-return x_88;
-}
-else
-{
-lean_object* x_89; 
-lean_dec(x_74);
-lean_dec(x_10);
-if (lean_is_scalar(x_76)) {
+if (lean_is_scalar(x_77)) {
  x_89 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_89 = x_76;
+ x_89 = x_77;
 }
-lean_ctor_set(x_89, 0, x_1);
-lean_ctor_set(x_89, 1, x_75);
+lean_ctor_set(x_89, 0, x_88);
+lean_ctor_set(x_89, 1, x_76);
 return x_89;
 }
+else
+{
+lean_object* x_90; 
+lean_dec(x_75);
+lean_dec(x_11);
+if (lean_is_scalar(x_77)) {
+ x_90 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_90 = x_77;
+}
+lean_ctor_set(x_90, 0, x_1);
+lean_ctor_set(x_90, 1, x_76);
+return x_90;
+}
 }
 }
 else
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-lean_dec(x_10);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+lean_dec(x_11);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_1);
-x_90 = lean_ctor_get(x_73, 0);
-lean_inc(x_90);
-x_91 = lean_ctor_get(x_73, 1);
+x_91 = lean_ctor_get(x_74, 0);
 lean_inc(x_91);
-if (lean_is_exclusive(x_73)) {
- lean_ctor_release(x_73, 0);
- lean_ctor_release(x_73, 1);
- x_92 = x_73;
+x_92 = lean_ctor_get(x_74, 1);
+lean_inc(x_92);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_93 = x_74;
 } else {
- lean_dec_ref(x_73);
- x_92 = lean_box(0);
+ lean_dec_ref(x_74);
+ x_93 = lean_box(0);
 }
-if (lean_is_scalar(x_92)) {
- x_93 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_93)) {
+ x_94 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_93 = x_92;
+ x_94 = x_93;
 }
-lean_ctor_set(x_93, 0, x_90);
-lean_ctor_set(x_93, 1, x_91);
-return x_93;
+lean_ctor_set(x_94, 0, x_91);
+lean_ctor_set(x_94, 1, x_92);
+return x_94;
 }
 }
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-lean_dec(x_18);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+lean_dec(x_19);
 lean_dec(x_7);
 lean_dec(x_1);
-x_94 = lean_ctor_get(x_19, 0);
-lean_inc(x_94);
-lean_dec(x_19);
-x_95 = l_Lean_Compiler_LCNF_CSE_replaceLet(x_10, x_94, x_2, x_3, x_4, x_5, x_16);
-x_96 = lean_ctor_get(x_95, 1);
-lean_inc(x_96);
-lean_dec(x_95);
+x_95 = lean_ctor_get(x_20, 0);
+lean_inc(x_95);
+lean_dec(x_20);
+x_96 = l_Lean_Compiler_LCNF_CSE_replaceLet(x_11, x_95, x_2, x_3, x_4, x_5, x_17);
+x_97 = lean_ctor_get(x_96, 1);
+lean_inc(x_97);
+lean_dec(x_96);
 x_1 = x_8;
-x_6 = x_96;
+x_6 = x_97;
 goto _start;
 }
 }
 case 1:
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_1, 0);
-lean_inc(x_98);
-x_99 = lean_ctor_get(x_1, 1);
+lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+x_99 = lean_ctor_get(x_1, 0);
 lean_inc(x_99);
+x_100 = lean_ctor_get(x_1, 1);
+lean_inc(x_100);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_98);
-x_100 = l_Lean_Compiler_LCNF_Code_cse_goFunDecl(x_98, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_100) == 0)
+lean_inc(x_99);
+x_101 = l_Lean_Compiler_LCNF_Code_cse_goFunDecl(x_99, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_101) == 0)
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_101 = lean_ctor_get(x_100, 0);
-lean_inc(x_101);
-x_102 = lean_ctor_get(x_100, 1);
+lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
+x_102 = lean_ctor_get(x_101, 0);
 lean_inc(x_102);
-lean_dec(x_100);
-x_103 = l_Lean_Compiler_LCNF_Code_cse_go___closed__1;
-lean_inc(x_101);
-x_104 = l_Lean_Compiler_LCNF_FunDeclCore_toExpr(x_101, x_103);
-x_105 = lean_st_ref_get(x_5, x_102);
-x_106 = lean_ctor_get(x_105, 1);
-lean_inc(x_106);
-lean_dec(x_105);
-x_107 = lean_st_ref_get(x_2, x_106);
-x_108 = lean_ctor_get(x_107, 0);
-lean_inc(x_108);
-x_109 = lean_ctor_get(x_107, 1);
+x_103 = lean_ctor_get(x_101, 1);
+lean_inc(x_103);
+lean_dec(x_101);
+x_104 = l_Lean_Compiler_LCNF_Code_cse_go___closed__1;
+lean_inc(x_102);
+x_105 = l_Lean_Compiler_LCNF_FunDeclCore_toExpr(x_102, x_104);
+x_106 = lean_st_ref_get(x_5, x_103);
+x_107 = lean_ctor_get(x_106, 1);
+lean_inc(x_107);
+lean_dec(x_106);
+x_108 = lean_st_ref_get(x_2, x_107);
+x_109 = lean_ctor_get(x_108, 0);
 lean_inc(x_109);
-lean_dec(x_107);
-x_110 = lean_ctor_get(x_108, 0);
+x_110 = lean_ctor_get(x_108, 1);
 lean_inc(x_110);
 lean_dec(x_108);
-lean_inc(x_104);
-x_111 = l_Std_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(x_110, x_104);
-if (lean_obj_tag(x_111) == 0)
+x_111 = lean_ctor_get(x_109, 0);
+lean_inc(x_111);
+lean_dec(x_109);
+lean_inc(x_105);
+x_112 = l_Std_PersistentHashMap_find_x3f___at_Lean_Compiler_LCNF_Code_cse_go___spec__2(x_111, x_105);
+if (lean_obj_tag(x_112) == 0)
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_118; 
-x_112 = lean_ctor_get(x_101, 0);
-lean_inc(x_112);
-x_113 = lean_st_ref_get(x_5, x_109);
-x_114 = lean_ctor_get(x_113, 1);
-lean_inc(x_114);
-lean_dec(x_113);
-x_115 = lean_st_ref_take(x_2, x_114);
-x_116 = lean_ctor_get(x_115, 0);
-lean_inc(x_116);
-x_117 = lean_ctor_get(x_115, 1);
+lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; uint8_t x_119; 
+x_113 = lean_ctor_get(x_102, 0);
+lean_inc(x_113);
+x_114 = lean_st_ref_get(x_5, x_110);
+x_115 = lean_ctor_get(x_114, 1);
+lean_inc(x_115);
+lean_dec(x_114);
+x_116 = lean_st_ref_take(x_2, x_115);
+x_117 = lean_ctor_get(x_116, 0);
 lean_inc(x_117);
-lean_dec(x_115);
-x_118 = !lean_is_exclusive(x_116);
-if (x_118 == 0)
+x_118 = lean_ctor_get(x_116, 1);
+lean_inc(x_118);
+lean_dec(x_116);
+x_119 = !lean_is_exclusive(x_117);
+if (x_119 == 0)
 {
-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_116, 0);
-x_120 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_119, x_104, x_112);
-lean_ctor_set(x_116, 0, x_120);
-x_121 = lean_st_ref_set(x_2, x_116, x_117);
-x_122 = lean_ctor_get(x_121, 1);
-lean_inc(x_122);
-lean_dec(x_121);
-lean_inc(x_99);
-x_123 = l_Lean_Compiler_LCNF_Code_cse_go(x_99, x_2, x_3, x_4, x_5, x_122);
-if (lean_obj_tag(x_123) == 0)
+lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+x_120 = lean_ctor_get(x_117, 0);
+x_121 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_120, x_105, x_113);
+lean_ctor_set(x_117, 0, x_121);
+x_122 = lean_st_ref_set(x_2, x_117, x_118);
+x_123 = lean_ctor_get(x_122, 1);
+lean_inc(x_123);
+lean_dec(x_122);
+lean_inc(x_100);
+x_124 = l_Lean_Compiler_LCNF_Code_cse_go(x_100, x_2, x_3, x_4, x_5, x_123);
+if (lean_obj_tag(x_124) == 0)
 {
-uint8_t x_124; 
-x_124 = !lean_is_exclusive(x_123);
-if (x_124 == 0)
+uint8_t x_125; 
+x_125 = !lean_is_exclusive(x_124);
+if (x_125 == 0)
 {
-lean_object* x_125; size_t x_126; size_t x_127; uint8_t x_128; 
-x_125 = lean_ctor_get(x_123, 0);
-x_126 = lean_ptr_addr(x_99);
-lean_dec(x_99);
-x_127 = lean_ptr_addr(x_125);
-x_128 = lean_usize_dec_eq(x_126, x_127);
-if (x_128 == 0)
-{
-uint8_t x_129; 
-lean_dec(x_98);
-x_129 = !lean_is_exclusive(x_1);
+lean_object* x_126; size_t x_127; size_t x_128; uint8_t x_129; 
+x_126 = lean_ctor_get(x_124, 0);
+x_127 = lean_ptr_addr(x_100);
+lean_dec(x_100);
+x_128 = lean_ptr_addr(x_126);
+x_129 = lean_usize_dec_eq(x_127, x_128);
 if (x_129 == 0)
 {
-lean_object* x_130; lean_object* x_131; 
-x_130 = lean_ctor_get(x_1, 1);
-lean_dec(x_130);
-x_131 = lean_ctor_get(x_1, 0);
+uint8_t x_130; 
+lean_dec(x_99);
+x_130 = !lean_is_exclusive(x_1);
+if (x_130 == 0)
+{
+lean_object* x_131; lean_object* x_132; 
+x_131 = lean_ctor_get(x_1, 1);
 lean_dec(x_131);
-lean_ctor_set(x_1, 1, x_125);
-lean_ctor_set(x_1, 0, x_101);
-lean_ctor_set(x_123, 0, x_1);
-return x_123;
+x_132 = lean_ctor_get(x_1, 0);
+lean_dec(x_132);
+lean_ctor_set(x_1, 1, x_126);
+lean_ctor_set(x_1, 0, x_102);
+lean_ctor_set(x_124, 0, x_1);
+return x_124;
 }
 else
 {
-lean_object* x_132; 
+lean_object* x_133; 
 lean_dec(x_1);
-x_132 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_132, 0, x_101);
-lean_ctor_set(x_132, 1, x_125);
-lean_ctor_set(x_123, 0, x_132);
-return x_123;
+x_133 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_133, 0, x_102);
+lean_ctor_set(x_133, 1, x_126);
+lean_ctor_set(x_124, 0, x_133);
+return x_124;
 }
 }
 else
 {
-size_t x_133; size_t x_134; uint8_t x_135; 
-x_133 = lean_ptr_addr(x_98);
-lean_dec(x_98);
-x_134 = lean_ptr_addr(x_101);
-x_135 = lean_usize_dec_eq(x_133, x_134);
-if (x_135 == 0)
-{
-uint8_t x_136; 
-x_136 = !lean_is_exclusive(x_1);
+size_t x_134; size_t x_135; uint8_t x_136; 
+x_134 = lean_ptr_addr(x_99);
+lean_dec(x_99);
+x_135 = lean_ptr_addr(x_102);
+x_136 = lean_usize_dec_eq(x_134, x_135);
 if (x_136 == 0)
 {
-lean_object* x_137; lean_object* x_138; 
-x_137 = lean_ctor_get(x_1, 1);
-lean_dec(x_137);
-x_138 = lean_ctor_get(x_1, 0);
+uint8_t x_137; 
+x_137 = !lean_is_exclusive(x_1);
+if (x_137 == 0)
+{
+lean_object* x_138; lean_object* x_139; 
+x_138 = lean_ctor_get(x_1, 1);
 lean_dec(x_138);
-lean_ctor_set(x_1, 1, x_125);
-lean_ctor_set(x_1, 0, x_101);
-lean_ctor_set(x_123, 0, x_1);
-return x_123;
+x_139 = lean_ctor_get(x_1, 0);
+lean_dec(x_139);
+lean_ctor_set(x_1, 1, x_126);
+lean_ctor_set(x_1, 0, x_102);
+lean_ctor_set(x_124, 0, x_1);
+return x_124;
 }
 else
 {
-lean_object* x_139; 
+lean_object* x_140; 
 lean_dec(x_1);
-x_139 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_139, 0, x_101);
-lean_ctor_set(x_139, 1, x_125);
-lean_ctor_set(x_123, 0, x_139);
-return x_123;
+x_140 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_140, 0, x_102);
+lean_ctor_set(x_140, 1, x_126);
+lean_ctor_set(x_124, 0, x_140);
+return x_124;
 }
 }
 else
 {
-lean_dec(x_125);
-lean_dec(x_101);
-lean_ctor_set(x_123, 0, x_1);
-return x_123;
+lean_dec(x_126);
+lean_dec(x_102);
+lean_ctor_set(x_124, 0, x_1);
+return x_124;
 }
 }
 }
 else
 {
-lean_object* x_140; lean_object* x_141; size_t x_142; size_t x_143; uint8_t x_144; 
-x_140 = lean_ctor_get(x_123, 0);
-x_141 = lean_ctor_get(x_123, 1);
+lean_object* x_141; lean_object* x_142; size_t x_143; size_t x_144; uint8_t x_145; 
+x_141 = lean_ctor_get(x_124, 0);
+x_142 = lean_ctor_get(x_124, 1);
+lean_inc(x_142);
 lean_inc(x_141);
-lean_inc(x_140);
-lean_dec(x_123);
-x_142 = lean_ptr_addr(x_99);
+lean_dec(x_124);
+x_143 = lean_ptr_addr(x_100);
+lean_dec(x_100);
+x_144 = lean_ptr_addr(x_141);
+x_145 = lean_usize_dec_eq(x_143, x_144);
+if (x_145 == 0)
+{
+lean_object* x_146; lean_object* x_147; lean_object* x_148; 
 lean_dec(x_99);
-x_143 = lean_ptr_addr(x_140);
-x_144 = lean_usize_dec_eq(x_142, x_143);
-if (x_144 == 0)
-{
-lean_object* x_145; lean_object* x_146; lean_object* x_147; 
-lean_dec(x_98);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_145 = x_1;
+ x_146 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_145 = lean_box(0);
+ x_146 = lean_box(0);
 }
-if (lean_is_scalar(x_145)) {
- x_146 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_146)) {
+ x_147 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_146 = x_145;
+ x_147 = x_146;
 }
-lean_ctor_set(x_146, 0, x_101);
-lean_ctor_set(x_146, 1, x_140);
-x_147 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_147, 0, x_146);
+lean_ctor_set(x_147, 0, x_102);
 lean_ctor_set(x_147, 1, x_141);
-return x_147;
+x_148 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_148, 0, x_147);
+lean_ctor_set(x_148, 1, x_142);
+return x_148;
 }
 else
 {
-size_t x_148; size_t x_149; uint8_t x_150; 
-x_148 = lean_ptr_addr(x_98);
-lean_dec(x_98);
-x_149 = lean_ptr_addr(x_101);
-x_150 = lean_usize_dec_eq(x_148, x_149);
-if (x_150 == 0)
+size_t x_149; size_t x_150; uint8_t x_151; 
+x_149 = lean_ptr_addr(x_99);
+lean_dec(x_99);
+x_150 = lean_ptr_addr(x_102);
+x_151 = lean_usize_dec_eq(x_149, x_150);
+if (x_151 == 0)
 {
-lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+lean_object* x_152; lean_object* x_153; lean_object* x_154; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_151 = x_1;
+ x_152 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_151 = lean_box(0);
+ 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_101);
-lean_ctor_set(x_152, 1, x_140);
-x_153 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_153, 0, x_152);
+lean_ctor_set(x_153, 0, x_102);
 lean_ctor_set(x_153, 1, x_141);
-return x_153;
-}
-else
-{
-lean_object* x_154; 
-lean_dec(x_140);
-lean_dec(x_101);
 x_154 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_154, 0, x_1);
-lean_ctor_set(x_154, 1, x_141);
+lean_ctor_set(x_154, 0, x_153);
+lean_ctor_set(x_154, 1, x_142);
 return x_154;
 }
+else
+{
+lean_object* x_155; 
+lean_dec(x_141);
+lean_dec(x_102);
+x_155 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_155, 0, x_1);
+lean_ctor_set(x_155, 1, x_142);
+return x_155;
+}
 }
 }
 }
 else
 {
-uint8_t x_155; 
-lean_dec(x_101);
+uint8_t x_156; 
+lean_dec(x_102);
+lean_dec(x_100);
 lean_dec(x_99);
-lean_dec(x_98);
 lean_dec(x_1);
-x_155 = !lean_is_exclusive(x_123);
-if (x_155 == 0)
+x_156 = !lean_is_exclusive(x_124);
+if (x_156 == 0)
 {
-return x_123;
+return x_124;
 }
 else
 {
-lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_156 = lean_ctor_get(x_123, 0);
-x_157 = lean_ctor_get(x_123, 1);
+lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+x_157 = lean_ctor_get(x_124, 0);
+x_158 = lean_ctor_get(x_124, 1);
+lean_inc(x_158);
 lean_inc(x_157);
-lean_inc(x_156);
-lean_dec(x_123);
-x_158 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_158, 0, x_156);
-lean_ctor_set(x_158, 1, x_157);
-return x_158;
+lean_dec(x_124);
+x_159 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_159, 0, x_157);
+lean_ctor_set(x_159, 1, x_158);
+return x_159;
 }
 }
 }
 else
 {
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-x_159 = lean_ctor_get(x_116, 0);
-x_160 = lean_ctor_get(x_116, 1);
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
+x_160 = lean_ctor_get(x_117, 0);
+x_161 = lean_ctor_get(x_117, 1);
+lean_inc(x_161);
 lean_inc(x_160);
-lean_inc(x_159);
-lean_dec(x_116);
-x_161 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_159, x_104, x_112);
-x_162 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_162, 0, x_161);
-lean_ctor_set(x_162, 1, x_160);
-x_163 = lean_st_ref_set(x_2, x_162, x_117);
-x_164 = lean_ctor_get(x_163, 1);
-lean_inc(x_164);
-lean_dec(x_163);
-lean_inc(x_99);
-x_165 = l_Lean_Compiler_LCNF_Code_cse_go(x_99, x_2, x_3, x_4, x_5, x_164);
-if (lean_obj_tag(x_165) == 0)
+lean_dec(x_117);
+x_162 = l_Std_PersistentHashMap_insert___at_Lean_Compiler_LCNF_CSE_addEntry___spec__1(x_160, x_105, x_113);
+x_163 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_163, 0, x_162);
+lean_ctor_set(x_163, 1, x_161);
+x_164 = lean_st_ref_set(x_2, x_163, x_118);
+x_165 = lean_ctor_get(x_164, 1);
+lean_inc(x_165);
+lean_dec(x_164);
+lean_inc(x_100);
+x_166 = l_Lean_Compiler_LCNF_Code_cse_go(x_100, x_2, x_3, x_4, x_5, x_165);
+if (lean_obj_tag(x_166) == 0)
 {
-lean_object* x_166; lean_object* x_167; lean_object* x_168; size_t x_169; size_t x_170; uint8_t x_171; 
-x_166 = lean_ctor_get(x_165, 0);
-lean_inc(x_166);
-x_167 = lean_ctor_get(x_165, 1);
+lean_object* x_167; lean_object* x_168; lean_object* x_169; size_t x_170; size_t x_171; uint8_t x_172; 
+x_167 = lean_ctor_get(x_166, 0);
 lean_inc(x_167);
-if (lean_is_exclusive(x_165)) {
- lean_ctor_release(x_165, 0);
- lean_ctor_release(x_165, 1);
- x_168 = x_165;
+x_168 = lean_ctor_get(x_166, 1);
+lean_inc(x_168);
+if (lean_is_exclusive(x_166)) {
+ lean_ctor_release(x_166, 0);
+ lean_ctor_release(x_166, 1);
+ x_169 = x_166;
 } else {
- lean_dec_ref(x_165);
- x_168 = lean_box(0);
+ lean_dec_ref(x_166);
+ x_169 = lean_box(0);
 }
-x_169 = lean_ptr_addr(x_99);
+x_170 = lean_ptr_addr(x_100);
+lean_dec(x_100);
+x_171 = lean_ptr_addr(x_167);
+x_172 = lean_usize_dec_eq(x_170, x_171);
+if (x_172 == 0)
+{
+lean_object* x_173; lean_object* x_174; lean_object* x_175; 
 lean_dec(x_99);
-x_170 = lean_ptr_addr(x_166);
-x_171 = lean_usize_dec_eq(x_169, x_170);
-if (x_171 == 0)
-{
-lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-lean_dec(x_98);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_172 = x_1;
+ x_173 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_172 = lean_box(0);
+ x_173 = lean_box(0);
 }
-if (lean_is_scalar(x_172)) {
- x_173 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_173)) {
+ x_174 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_173 = x_172;
+ x_174 = x_173;
 }
-lean_ctor_set(x_173, 0, x_101);
-lean_ctor_set(x_173, 1, x_166);
-if (lean_is_scalar(x_168)) {
- x_174 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_174 = x_168;
-}
-lean_ctor_set(x_174, 0, x_173);
+lean_ctor_set(x_174, 0, x_102);
 lean_ctor_set(x_174, 1, x_167);
-return x_174;
+if (lean_is_scalar(x_169)) {
+ x_175 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_175 = x_169;
+}
+lean_ctor_set(x_175, 0, x_174);
+lean_ctor_set(x_175, 1, x_168);
+return x_175;
 }
 else
 {
-size_t x_175; size_t x_176; uint8_t x_177; 
-x_175 = lean_ptr_addr(x_98);
-lean_dec(x_98);
-x_176 = lean_ptr_addr(x_101);
-x_177 = lean_usize_dec_eq(x_175, x_176);
-if (x_177 == 0)
+size_t x_176; size_t x_177; uint8_t x_178; 
+x_176 = lean_ptr_addr(x_99);
+lean_dec(x_99);
+x_177 = lean_ptr_addr(x_102);
+x_178 = lean_usize_dec_eq(x_176, x_177);
+if (x_178 == 0)
 {
-lean_object* x_178; lean_object* x_179; lean_object* x_180; 
+lean_object* x_179; lean_object* x_180; lean_object* x_181; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_178 = x_1;
+ x_179 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_178 = lean_box(0);
+ x_179 = lean_box(0);
 }
-if (lean_is_scalar(x_178)) {
- x_179 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_179)) {
+ x_180 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_179 = x_178;
+ x_180 = x_179;
 }
-lean_ctor_set(x_179, 0, x_101);
-lean_ctor_set(x_179, 1, x_166);
-if (lean_is_scalar(x_168)) {
- x_180 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_180 = x_168;
-}
-lean_ctor_set(x_180, 0, x_179);
+lean_ctor_set(x_180, 0, x_102);
 lean_ctor_set(x_180, 1, x_167);
-return x_180;
-}
-else
-{
-lean_object* x_181; 
-lean_dec(x_166);
-lean_dec(x_101);
-if (lean_is_scalar(x_168)) {
+if (lean_is_scalar(x_169)) {
  x_181 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_181 = x_168;
+ x_181 = x_169;
 }
-lean_ctor_set(x_181, 0, x_1);
-lean_ctor_set(x_181, 1, x_167);
+lean_ctor_set(x_181, 0, x_180);
+lean_ctor_set(x_181, 1, x_168);
 return x_181;
 }
+else
+{
+lean_object* x_182; 
+lean_dec(x_167);
+lean_dec(x_102);
+if (lean_is_scalar(x_169)) {
+ x_182 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_182 = x_169;
+}
+lean_ctor_set(x_182, 0, x_1);
+lean_ctor_set(x_182, 1, x_168);
+return x_182;
+}
 }
 }
 else
 {
-lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; 
-lean_dec(x_101);
+lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+lean_dec(x_102);
+lean_dec(x_100);
 lean_dec(x_99);
-lean_dec(x_98);
 lean_dec(x_1);
-x_182 = lean_ctor_get(x_165, 0);
-lean_inc(x_182);
-x_183 = lean_ctor_get(x_165, 1);
+x_183 = lean_ctor_get(x_166, 0);
 lean_inc(x_183);
-if (lean_is_exclusive(x_165)) {
- lean_ctor_release(x_165, 0);
- lean_ctor_release(x_165, 1);
- x_184 = x_165;
+x_184 = lean_ctor_get(x_166, 1);
+lean_inc(x_184);
+if (lean_is_exclusive(x_166)) {
+ lean_ctor_release(x_166, 0);
+ lean_ctor_release(x_166, 1);
+ x_185 = x_166;
 } else {
- lean_dec_ref(x_165);
- x_184 = lean_box(0);
+ lean_dec_ref(x_166);
+ x_185 = lean_box(0);
 }
-if (lean_is_scalar(x_184)) {
- x_185 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_185)) {
+ x_186 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_185 = x_184;
+ x_186 = x_185;
 }
-lean_ctor_set(x_185, 0, x_182);
-lean_ctor_set(x_185, 1, x_183);
-return x_185;
+lean_ctor_set(x_186, 0, x_183);
+lean_ctor_set(x_186, 1, x_184);
+return x_186;
 }
 }
 }
 else
 {
-lean_object* x_186; lean_object* x_187; lean_object* x_188; 
-lean_dec(x_104);
-lean_dec(x_98);
+lean_object* x_187; lean_object* x_188; lean_object* x_189; 
+lean_dec(x_105);
+lean_dec(x_99);
 lean_dec(x_1);
-x_186 = lean_ctor_get(x_111, 0);
-lean_inc(x_186);
-lean_dec(x_111);
-x_187 = l_Lean_Compiler_LCNF_CSE_replaceFun(x_101, x_186, x_2, x_3, x_4, x_5, x_109);
-x_188 = lean_ctor_get(x_187, 1);
-lean_inc(x_188);
-lean_dec(x_187);
-x_1 = x_99;
-x_6 = x_188;
+x_187 = lean_ctor_get(x_112, 0);
+lean_inc(x_187);
+lean_dec(x_112);
+x_188 = l_Lean_Compiler_LCNF_CSE_replaceFun(x_102, x_187, x_2, x_3, x_4, x_5, x_110);
+x_189 = lean_ctor_get(x_188, 1);
+lean_inc(x_189);
+lean_dec(x_188);
+x_1 = x_100;
+x_6 = x_189;
 goto _start;
 }
 }
 else
 {
-uint8_t x_190; 
+uint8_t x_191; 
+lean_dec(x_100);
 lean_dec(x_99);
-lean_dec(x_98);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_190 = !lean_is_exclusive(x_100);
-if (x_190 == 0)
+x_191 = !lean_is_exclusive(x_101);
+if (x_191 == 0)
 {
-return x_100;
+return x_101;
 }
 else
 {
-lean_object* x_191; lean_object* x_192; lean_object* x_193; 
-x_191 = lean_ctor_get(x_100, 0);
-x_192 = lean_ctor_get(x_100, 1);
+lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+x_192 = lean_ctor_get(x_101, 0);
+x_193 = lean_ctor_get(x_101, 1);
+lean_inc(x_193);
 lean_inc(x_192);
-lean_inc(x_191);
-lean_dec(x_100);
-x_193 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_193, 0, x_191);
-lean_ctor_set(x_193, 1, x_192);
-return x_193;
+lean_dec(x_101);
+x_194 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_194, 0, x_192);
+lean_ctor_set(x_194, 1, x_193);
+return x_194;
 }
 }
 }
 case 2:
 {
-lean_object* x_194; lean_object* x_195; lean_object* x_196; 
-x_194 = lean_ctor_get(x_1, 0);
-lean_inc(x_194);
-x_195 = lean_ctor_get(x_1, 1);
+lean_object* x_195; lean_object* x_196; lean_object* x_197; 
+x_195 = lean_ctor_get(x_1, 0);
 lean_inc(x_195);
+x_196 = lean_ctor_get(x_1, 1);
+lean_inc(x_196);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_194);
-x_196 = l_Lean_Compiler_LCNF_Code_cse_goFunDecl(x_194, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_196) == 0)
-{
-lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_197 = lean_ctor_get(x_196, 0);
-lean_inc(x_197);
-x_198 = lean_ctor_get(x_196, 1);
-lean_inc(x_198);
-lean_dec(x_196);
 lean_inc(x_195);
-x_199 = l_Lean_Compiler_LCNF_Code_cse_go(x_195, x_2, x_3, x_4, x_5, x_198);
-if (lean_obj_tag(x_199) == 0)
+x_197 = l_Lean_Compiler_LCNF_Code_cse_goFunDecl(x_195, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_197) == 0)
 {
-uint8_t x_200; 
-x_200 = !lean_is_exclusive(x_199);
-if (x_200 == 0)
+lean_object* x_198; lean_object* x_199; lean_object* x_200; 
+x_198 = lean_ctor_get(x_197, 0);
+lean_inc(x_198);
+x_199 = lean_ctor_get(x_197, 1);
+lean_inc(x_199);
+lean_dec(x_197);
+lean_inc(x_196);
+x_200 = l_Lean_Compiler_LCNF_Code_cse_go(x_196, x_2, x_3, x_4, x_5, x_199);
+if (lean_obj_tag(x_200) == 0)
 {
-lean_object* x_201; size_t x_202; size_t x_203; uint8_t x_204; 
-x_201 = lean_ctor_get(x_199, 0);
-x_202 = lean_ptr_addr(x_195);
-lean_dec(x_195);
-x_203 = lean_ptr_addr(x_201);
-x_204 = lean_usize_dec_eq(x_202, x_203);
-if (x_204 == 0)
+uint8_t x_201; 
+x_201 = !lean_is_exclusive(x_200);
+if (x_201 == 0)
 {
-uint8_t x_205; 
-lean_dec(x_194);
-x_205 = !lean_is_exclusive(x_1);
+lean_object* x_202; size_t x_203; size_t x_204; uint8_t x_205; 
+x_202 = lean_ctor_get(x_200, 0);
+x_203 = lean_ptr_addr(x_196);
+lean_dec(x_196);
+x_204 = lean_ptr_addr(x_202);
+x_205 = lean_usize_dec_eq(x_203, x_204);
 if (x_205 == 0)
 {
-lean_object* x_206; lean_object* x_207; 
-x_206 = lean_ctor_get(x_1, 1);
-lean_dec(x_206);
-x_207 = lean_ctor_get(x_1, 0);
+uint8_t x_206; 
+lean_dec(x_195);
+x_206 = !lean_is_exclusive(x_1);
+if (x_206 == 0)
+{
+lean_object* x_207; lean_object* x_208; 
+x_207 = lean_ctor_get(x_1, 1);
 lean_dec(x_207);
-lean_ctor_set(x_1, 1, x_201);
-lean_ctor_set(x_1, 0, x_197);
-lean_ctor_set(x_199, 0, x_1);
-return x_199;
+x_208 = lean_ctor_get(x_1, 0);
+lean_dec(x_208);
+lean_ctor_set(x_1, 1, x_202);
+lean_ctor_set(x_1, 0, x_198);
+lean_ctor_set(x_200, 0, x_1);
+return x_200;
 }
 else
 {
-lean_object* x_208; 
+lean_object* x_209; 
 lean_dec(x_1);
-x_208 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_208, 0, x_197);
-lean_ctor_set(x_208, 1, x_201);
-lean_ctor_set(x_199, 0, x_208);
-return x_199;
+x_209 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_209, 0, x_198);
+lean_ctor_set(x_209, 1, x_202);
+lean_ctor_set(x_200, 0, x_209);
+return x_200;
 }
 }
 else
 {
-size_t x_209; size_t x_210; uint8_t x_211; 
-x_209 = lean_ptr_addr(x_194);
-lean_dec(x_194);
-x_210 = lean_ptr_addr(x_197);
-x_211 = lean_usize_dec_eq(x_209, x_210);
-if (x_211 == 0)
-{
-uint8_t x_212; 
-x_212 = !lean_is_exclusive(x_1);
+size_t x_210; size_t x_211; uint8_t x_212; 
+x_210 = lean_ptr_addr(x_195);
+lean_dec(x_195);
+x_211 = lean_ptr_addr(x_198);
+x_212 = lean_usize_dec_eq(x_210, x_211);
 if (x_212 == 0)
 {
-lean_object* x_213; lean_object* x_214; 
-x_213 = lean_ctor_get(x_1, 1);
-lean_dec(x_213);
-x_214 = lean_ctor_get(x_1, 0);
+uint8_t x_213; 
+x_213 = !lean_is_exclusive(x_1);
+if (x_213 == 0)
+{
+lean_object* x_214; lean_object* x_215; 
+x_214 = lean_ctor_get(x_1, 1);
 lean_dec(x_214);
-lean_ctor_set(x_1, 1, x_201);
-lean_ctor_set(x_1, 0, x_197);
-lean_ctor_set(x_199, 0, x_1);
-return x_199;
+x_215 = lean_ctor_get(x_1, 0);
+lean_dec(x_215);
+lean_ctor_set(x_1, 1, x_202);
+lean_ctor_set(x_1, 0, x_198);
+lean_ctor_set(x_200, 0, x_1);
+return x_200;
 }
 else
 {
-lean_object* x_215; 
+lean_object* x_216; 
 lean_dec(x_1);
-x_215 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_215, 0, x_197);
-lean_ctor_set(x_215, 1, x_201);
-lean_ctor_set(x_199, 0, x_215);
-return x_199;
+x_216 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_216, 0, x_198);
+lean_ctor_set(x_216, 1, x_202);
+lean_ctor_set(x_200, 0, x_216);
+return x_200;
 }
 }
 else
 {
-lean_dec(x_201);
-lean_dec(x_197);
-lean_ctor_set(x_199, 0, x_1);
-return x_199;
+lean_dec(x_202);
+lean_dec(x_198);
+lean_ctor_set(x_200, 0, x_1);
+return x_200;
 }
 }
 }
 else
 {
-lean_object* x_216; lean_object* x_217; size_t x_218; size_t x_219; uint8_t x_220; 
-x_216 = lean_ctor_get(x_199, 0);
-x_217 = lean_ctor_get(x_199, 1);
+lean_object* x_217; lean_object* x_218; size_t x_219; size_t x_220; uint8_t x_221; 
+x_217 = lean_ctor_get(x_200, 0);
+x_218 = lean_ctor_get(x_200, 1);
+lean_inc(x_218);
 lean_inc(x_217);
-lean_inc(x_216);
-lean_dec(x_199);
-x_218 = lean_ptr_addr(x_195);
+lean_dec(x_200);
+x_219 = lean_ptr_addr(x_196);
+lean_dec(x_196);
+x_220 = lean_ptr_addr(x_217);
+x_221 = lean_usize_dec_eq(x_219, x_220);
+if (x_221 == 0)
+{
+lean_object* x_222; lean_object* x_223; lean_object* x_224; 
 lean_dec(x_195);
-x_219 = lean_ptr_addr(x_216);
-x_220 = lean_usize_dec_eq(x_218, x_219);
-if (x_220 == 0)
-{
-lean_object* x_221; lean_object* x_222; lean_object* x_223; 
-lean_dec(x_194);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_221 = x_1;
+ x_222 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_221 = lean_box(0);
+ x_222 = lean_box(0);
 }
-if (lean_is_scalar(x_221)) {
- x_222 = lean_alloc_ctor(2, 2, 0);
+if (lean_is_scalar(x_222)) {
+ x_223 = lean_alloc_ctor(2, 2, 0);
 } else {
- x_222 = x_221;
+ x_223 = x_222;
 }
-lean_ctor_set(x_222, 0, x_197);
-lean_ctor_set(x_222, 1, x_216);
-x_223 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_223, 0, x_222);
+lean_ctor_set(x_223, 0, x_198);
 lean_ctor_set(x_223, 1, x_217);
-return x_223;
+x_224 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_224, 0, x_223);
+lean_ctor_set(x_224, 1, x_218);
+return x_224;
 }
 else
 {
-size_t x_224; size_t x_225; uint8_t x_226; 
-x_224 = lean_ptr_addr(x_194);
-lean_dec(x_194);
-x_225 = lean_ptr_addr(x_197);
-x_226 = lean_usize_dec_eq(x_224, x_225);
-if (x_226 == 0)
+size_t x_225; size_t x_226; uint8_t x_227; 
+x_225 = lean_ptr_addr(x_195);
+lean_dec(x_195);
+x_226 = lean_ptr_addr(x_198);
+x_227 = lean_usize_dec_eq(x_225, x_226);
+if (x_227 == 0)
 {
-lean_object* x_227; lean_object* x_228; lean_object* x_229; 
+lean_object* x_228; lean_object* x_229; lean_object* x_230; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_227 = x_1;
+ x_228 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_227 = lean_box(0);
+ x_228 = lean_box(0);
 }
-if (lean_is_scalar(x_227)) {
- x_228 = lean_alloc_ctor(2, 2, 0);
+if (lean_is_scalar(x_228)) {
+ x_229 = lean_alloc_ctor(2, 2, 0);
 } else {
- x_228 = x_227;
+ x_229 = x_228;
 }
-lean_ctor_set(x_228, 0, x_197);
-lean_ctor_set(x_228, 1, x_216);
-x_229 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_229, 0, x_228);
+lean_ctor_set(x_229, 0, x_198);
 lean_ctor_set(x_229, 1, x_217);
-return x_229;
-}
-else
-{
-lean_object* x_230; 
-lean_dec(x_216);
-lean_dec(x_197);
 x_230 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_230, 0, x_1);
-lean_ctor_set(x_230, 1, x_217);
+lean_ctor_set(x_230, 0, x_229);
+lean_ctor_set(x_230, 1, x_218);
 return x_230;
 }
+else
+{
+lean_object* x_231; 
+lean_dec(x_217);
+lean_dec(x_198);
+x_231 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_231, 0, x_1);
+lean_ctor_set(x_231, 1, x_218);
+return x_231;
+}
 }
 }
 }
 else
 {
-uint8_t x_231; 
-lean_dec(x_197);
+uint8_t x_232; 
+lean_dec(x_198);
+lean_dec(x_196);
 lean_dec(x_195);
-lean_dec(x_194);
 lean_dec(x_1);
-x_231 = !lean_is_exclusive(x_199);
-if (x_231 == 0)
+x_232 = !lean_is_exclusive(x_200);
+if (x_232 == 0)
 {
-return x_199;
+return x_200;
 }
 else
 {
-lean_object* x_232; lean_object* x_233; lean_object* x_234; 
-x_232 = lean_ctor_get(x_199, 0);
-x_233 = lean_ctor_get(x_199, 1);
+lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+x_233 = lean_ctor_get(x_200, 0);
+x_234 = lean_ctor_get(x_200, 1);
+lean_inc(x_234);
 lean_inc(x_233);
-lean_inc(x_232);
-lean_dec(x_199);
-x_234 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_234, 0, x_232);
-lean_ctor_set(x_234, 1, x_233);
-return x_234;
+lean_dec(x_200);
+x_235 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_235, 0, x_233);
+lean_ctor_set(x_235, 1, x_234);
+return x_235;
 }
 }
 }
 else
 {
-uint8_t x_235; 
+uint8_t x_236; 
+lean_dec(x_196);
 lean_dec(x_195);
-lean_dec(x_194);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_235 = !lean_is_exclusive(x_196);
-if (x_235 == 0)
+x_236 = !lean_is_exclusive(x_197);
+if (x_236 == 0)
 {
-return x_196;
+return x_197;
 }
 else
 {
-lean_object* x_236; lean_object* x_237; lean_object* x_238; 
-x_236 = lean_ctor_get(x_196, 0);
-x_237 = lean_ctor_get(x_196, 1);
+lean_object* x_237; lean_object* x_238; lean_object* x_239; 
+x_237 = lean_ctor_get(x_197, 0);
+x_238 = lean_ctor_get(x_197, 1);
+lean_inc(x_238);
 lean_inc(x_237);
-lean_inc(x_236);
-lean_dec(x_196);
-x_238 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_238, 0, x_236);
-lean_ctor_set(x_238, 1, x_237);
-return x_238;
+lean_dec(x_197);
+x_239 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_239, 0, x_237);
+lean_ctor_set(x_239, 1, x_238);
+return x_239;
 }
 }
 }
 case 3:
 {
-lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; 
-x_239 = lean_ctor_get(x_1, 0);
-lean_inc(x_239);
-x_240 = lean_ctor_get(x_1, 1);
+lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; uint8_t x_248; lean_object* x_249; lean_object* x_250; 
+x_240 = lean_ctor_get(x_1, 0);
 lean_inc(x_240);
-x_241 = lean_st_ref_get(x_5, x_6);
-x_242 = lean_ctor_get(x_241, 1);
-lean_inc(x_242);
-lean_dec(x_241);
-x_243 = lean_st_ref_get(x_2, x_242);
-x_244 = lean_ctor_get(x_243, 0);
-lean_inc(x_244);
-x_245 = lean_ctor_get(x_243, 1);
+x_241 = lean_ctor_get(x_1, 1);
+lean_inc(x_241);
+x_242 = lean_st_ref_get(x_5, x_6);
+x_243 = lean_ctor_get(x_242, 1);
+lean_inc(x_243);
+lean_dec(x_242);
+x_244 = lean_st_ref_get(x_2, x_243);
+x_245 = lean_ctor_get(x_244, 0);
 lean_inc(x_245);
-lean_dec(x_243);
 x_246 = lean_ctor_get(x_244, 1);
 lean_inc(x_246);
 lean_dec(x_244);
-lean_inc(x_239);
-x_247 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_246, x_239);
+x_247 = lean_ctor_get(x_245, 1);
+lean_inc(x_247);
+lean_dec(x_245);
+x_248 = 0;
 lean_inc(x_240);
-x_248 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(x_240, x_2, x_3, x_4, x_5, x_245);
-if (lean_obj_tag(x_248) == 0)
+x_249 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_247, x_240, x_248);
+lean_inc(x_241);
+x_250 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(x_248, x_241, x_2, x_3, x_4, x_5, x_246);
+if (lean_obj_tag(x_250) == 0)
 {
-uint8_t x_249; 
-x_249 = !lean_is_exclusive(x_248);
-if (x_249 == 0)
-{
-lean_object* x_250; uint8_t x_251; 
-x_250 = lean_ctor_get(x_248, 0);
-x_251 = lean_name_eq(x_239, x_247);
-lean_dec(x_239);
+uint8_t x_251; 
+x_251 = !lean_is_exclusive(x_250);
 if (x_251 == 0)
 {
-uint8_t x_252; 
+lean_object* x_252; uint8_t x_253; 
+x_252 = lean_ctor_get(x_250, 0);
+x_253 = lean_name_eq(x_240, x_249);
 lean_dec(x_240);
-x_252 = !lean_is_exclusive(x_1);
-if (x_252 == 0)
+if (x_253 == 0)
 {
-lean_object* x_253; lean_object* x_254; 
-x_253 = lean_ctor_get(x_1, 1);
-lean_dec(x_253);
-x_254 = lean_ctor_get(x_1, 0);
-lean_dec(x_254);
-lean_ctor_set(x_1, 1, x_250);
-lean_ctor_set(x_1, 0, x_247);
-lean_ctor_set(x_248, 0, x_1);
-return x_248;
+uint8_t x_254; 
+lean_dec(x_241);
+x_254 = !lean_is_exclusive(x_1);
+if (x_254 == 0)
+{
+lean_object* x_255; lean_object* x_256; 
+x_255 = lean_ctor_get(x_1, 1);
+lean_dec(x_255);
+x_256 = lean_ctor_get(x_1, 0);
+lean_dec(x_256);
+lean_ctor_set(x_1, 1, x_252);
+lean_ctor_set(x_1, 0, x_249);
+lean_ctor_set(x_250, 0, x_1);
+return x_250;
 }
 else
 {
-lean_object* x_255; 
+lean_object* x_257; 
 lean_dec(x_1);
-x_255 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_255, 0, x_247);
-lean_ctor_set(x_255, 1, x_250);
-lean_ctor_set(x_248, 0, x_255);
-return x_248;
+x_257 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_257, 0, x_249);
+lean_ctor_set(x_257, 1, x_252);
+lean_ctor_set(x_250, 0, x_257);
+return x_250;
 }
 }
 else
 {
-size_t x_256; size_t x_257; uint8_t x_258; 
-x_256 = lean_ptr_addr(x_240);
-lean_dec(x_240);
-x_257 = lean_ptr_addr(x_250);
-x_258 = lean_usize_dec_eq(x_256, x_257);
-if (x_258 == 0)
+size_t x_258; size_t x_259; uint8_t x_260; 
+x_258 = lean_ptr_addr(x_241);
+lean_dec(x_241);
+x_259 = lean_ptr_addr(x_252);
+x_260 = lean_usize_dec_eq(x_258, x_259);
+if (x_260 == 0)
 {
-uint8_t x_259; 
-x_259 = !lean_is_exclusive(x_1);
-if (x_259 == 0)
+uint8_t x_261; 
+x_261 = !lean_is_exclusive(x_1);
+if (x_261 == 0)
 {
-lean_object* x_260; lean_object* x_261; 
-x_260 = lean_ctor_get(x_1, 1);
-lean_dec(x_260);
-x_261 = lean_ctor_get(x_1, 0);
-lean_dec(x_261);
-lean_ctor_set(x_1, 1, x_250);
-lean_ctor_set(x_1, 0, x_247);
-lean_ctor_set(x_248, 0, x_1);
-return x_248;
-}
-else
-{
-lean_object* x_262; 
-lean_dec(x_1);
-x_262 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_262, 0, x_247);
-lean_ctor_set(x_262, 1, x_250);
-lean_ctor_set(x_248, 0, x_262);
-return x_248;
-}
-}
-else
-{
-lean_dec(x_250);
-lean_dec(x_247);
-lean_ctor_set(x_248, 0, x_1);
-return x_248;
-}
-}
-}
-else
-{
-lean_object* x_263; lean_object* x_264; uint8_t x_265; 
-x_263 = lean_ctor_get(x_248, 0);
-x_264 = lean_ctor_get(x_248, 1);
-lean_inc(x_264);
-lean_inc(x_263);
-lean_dec(x_248);
-x_265 = lean_name_eq(x_239, x_247);
-lean_dec(x_239);
-if (x_265 == 0)
-{
-lean_object* x_266; lean_object* x_267; lean_object* x_268; 
-lean_dec(x_240);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_266 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_266 = lean_box(0);
-}
-if (lean_is_scalar(x_266)) {
- x_267 = lean_alloc_ctor(3, 2, 0);
-} else {
- x_267 = x_266;
-}
-lean_ctor_set(x_267, 0, x_247);
-lean_ctor_set(x_267, 1, x_263);
-x_268 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_268, 0, x_267);
-lean_ctor_set(x_268, 1, x_264);
-return x_268;
-}
-else
-{
-size_t x_269; size_t x_270; uint8_t x_271; 
-x_269 = lean_ptr_addr(x_240);
-lean_dec(x_240);
-x_270 = lean_ptr_addr(x_263);
-x_271 = lean_usize_dec_eq(x_269, x_270);
-if (x_271 == 0)
-{
-lean_object* x_272; lean_object* x_273; lean_object* x_274; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_272 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_272 = lean_box(0);
-}
-if (lean_is_scalar(x_272)) {
- x_273 = lean_alloc_ctor(3, 2, 0);
-} else {
- x_273 = x_272;
-}
-lean_ctor_set(x_273, 0, x_247);
-lean_ctor_set(x_273, 1, x_263);
-x_274 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_274, 0, x_273);
-lean_ctor_set(x_274, 1, x_264);
-return x_274;
-}
-else
-{
-lean_object* x_275; 
+lean_object* x_262; lean_object* x_263; 
+x_262 = lean_ctor_get(x_1, 1);
+lean_dec(x_262);
+x_263 = lean_ctor_get(x_1, 0);
 lean_dec(x_263);
-lean_dec(x_247);
-x_275 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_275, 0, x_1);
-lean_ctor_set(x_275, 1, x_264);
-return x_275;
-}
-}
-}
+lean_ctor_set(x_1, 1, x_252);
+lean_ctor_set(x_1, 0, x_249);
+lean_ctor_set(x_250, 0, x_1);
+return x_250;
 }
 else
 {
-uint8_t x_276; 
-lean_dec(x_247);
-lean_dec(x_240);
-lean_dec(x_239);
+lean_object* x_264; 
 lean_dec(x_1);
-x_276 = !lean_is_exclusive(x_248);
-if (x_276 == 0)
-{
-return x_248;
+x_264 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_264, 0, x_249);
+lean_ctor_set(x_264, 1, x_252);
+lean_ctor_set(x_250, 0, x_264);
+return x_250;
+}
 }
 else
 {
-lean_object* x_277; lean_object* x_278; lean_object* x_279; 
-x_277 = lean_ctor_get(x_248, 0);
-x_278 = lean_ctor_get(x_248, 1);
-lean_inc(x_278);
-lean_inc(x_277);
-lean_dec(x_248);
-x_279 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_279, 0, x_277);
-lean_ctor_set(x_279, 1, x_278);
-return x_279;
+lean_dec(x_252);
+lean_dec(x_249);
+lean_ctor_set(x_250, 0, x_1);
+return x_250;
+}
+}
+}
+else
+{
+lean_object* x_265; lean_object* x_266; uint8_t x_267; 
+x_265 = lean_ctor_get(x_250, 0);
+x_266 = lean_ctor_get(x_250, 1);
+lean_inc(x_266);
+lean_inc(x_265);
+lean_dec(x_250);
+x_267 = lean_name_eq(x_240, x_249);
+lean_dec(x_240);
+if (x_267 == 0)
+{
+lean_object* x_268; lean_object* x_269; lean_object* x_270; 
+lean_dec(x_241);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ x_268 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_268 = lean_box(0);
+}
+if (lean_is_scalar(x_268)) {
+ x_269 = lean_alloc_ctor(3, 2, 0);
+} else {
+ x_269 = x_268;
+}
+lean_ctor_set(x_269, 0, x_249);
+lean_ctor_set(x_269, 1, x_265);
+x_270 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_270, 0, x_269);
+lean_ctor_set(x_270, 1, x_266);
+return x_270;
+}
+else
+{
+size_t x_271; size_t x_272; uint8_t x_273; 
+x_271 = lean_ptr_addr(x_241);
+lean_dec(x_241);
+x_272 = lean_ptr_addr(x_265);
+x_273 = lean_usize_dec_eq(x_271, x_272);
+if (x_273 == 0)
+{
+lean_object* x_274; lean_object* x_275; lean_object* x_276; 
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ lean_ctor_release(x_1, 1);
+ x_274 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_274 = lean_box(0);
+}
+if (lean_is_scalar(x_274)) {
+ x_275 = lean_alloc_ctor(3, 2, 0);
+} else {
+ x_275 = x_274;
+}
+lean_ctor_set(x_275, 0, x_249);
+lean_ctor_set(x_275, 1, x_265);
+x_276 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_276, 0, x_275);
+lean_ctor_set(x_276, 1, x_266);
+return x_276;
+}
+else
+{
+lean_object* x_277; 
+lean_dec(x_265);
+lean_dec(x_249);
+x_277 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_277, 0, x_1);
+lean_ctor_set(x_277, 1, x_266);
+return x_277;
+}
+}
+}
+}
+else
+{
+uint8_t x_278; 
+lean_dec(x_249);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_1);
+x_278 = !lean_is_exclusive(x_250);
+if (x_278 == 0)
+{
+return x_250;
+}
+else
+{
+lean_object* x_279; lean_object* x_280; lean_object* x_281; 
+x_279 = lean_ctor_get(x_250, 0);
+x_280 = lean_ctor_get(x_250, 1);
+lean_inc(x_280);
+lean_inc(x_279);
+lean_dec(x_250);
+x_281 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_281, 0, x_279);
+lean_ctor_set(x_281, 1, x_280);
+return x_281;
 }
 }
 }
 case 4:
 {
-lean_object* x_280; uint8_t x_281; 
-x_280 = lean_ctor_get(x_1, 0);
-lean_inc(x_280);
-x_281 = !lean_is_exclusive(x_280);
-if (x_281 == 0)
+lean_object* x_282; uint8_t x_283; 
+x_282 = lean_ctor_get(x_1, 0);
+lean_inc(x_282);
+x_283 = !lean_is_exclusive(x_282);
+if (x_283 == 0)
 {
-lean_object* x_282; lean_object* x_283; lean_object* x_284; 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; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
-x_282 = lean_ctor_get(x_280, 0);
-x_283 = lean_ctor_get(x_280, 1);
-x_284 = lean_ctor_get(x_280, 2);
-x_285 = lean_ctor_get(x_280, 3);
-x_286 = lean_st_ref_get(x_5, x_6);
-x_287 = lean_ctor_get(x_286, 1);
-lean_inc(x_287);
-lean_dec(x_286);
-x_288 = lean_st_ref_get(x_2, x_287);
-x_289 = lean_ctor_get(x_288, 0);
+lean_object* x_284; 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; lean_object* x_292; lean_object* x_293; uint8_t x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; 
+x_284 = lean_ctor_get(x_282, 0);
+x_285 = lean_ctor_get(x_282, 1);
+x_286 = lean_ctor_get(x_282, 2);
+x_287 = lean_ctor_get(x_282, 3);
+x_288 = lean_st_ref_get(x_5, x_6);
+x_289 = lean_ctor_get(x_288, 1);
 lean_inc(x_289);
-x_290 = lean_ctor_get(x_288, 1);
-lean_inc(x_290);
 lean_dec(x_288);
-x_291 = lean_ctor_get(x_289, 1);
+x_290 = lean_st_ref_get(x_2, x_289);
+x_291 = lean_ctor_get(x_290, 0);
 lean_inc(x_291);
-lean_dec(x_289);
-lean_inc(x_284);
-x_292 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_291, x_284);
-x_293 = lean_st_ref_get(x_5, x_290);
-x_294 = lean_ctor_get(x_293, 1);
-lean_inc(x_294);
-lean_dec(x_293);
-x_295 = lean_st_ref_get(x_2, x_294);
-x_296 = lean_ctor_get(x_295, 0);
-lean_inc(x_296);
-x_297 = lean_ctor_get(x_295, 1);
+x_292 = lean_ctor_get(x_290, 1);
+lean_inc(x_292);
+lean_dec(x_290);
+x_293 = lean_ctor_get(x_291, 1);
+lean_inc(x_293);
+lean_dec(x_291);
+x_294 = 0;
+lean_inc(x_286);
+x_295 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_293, x_286, x_294);
+x_296 = lean_st_ref_get(x_5, x_292);
+x_297 = lean_ctor_get(x_296, 1);
 lean_inc(x_297);
-lean_dec(x_295);
-x_298 = lean_ctor_get(x_296, 1);
-lean_inc(x_298);
 lean_dec(x_296);
-lean_inc(x_283);
-x_299 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_298, x_283);
-x_300 = l_Lean_Compiler_LCNF_Code_cse_go___closed__2;
+x_298 = lean_st_ref_get(x_2, x_297);
+x_299 = lean_ctor_get(x_298, 0);
+lean_inc(x_299);
+x_300 = lean_ctor_get(x_298, 1);
+lean_inc(x_300);
+lean_dec(x_298);
+x_301 = lean_ctor_get(x_299, 1);
+lean_inc(x_301);
+lean_dec(x_299);
 lean_inc(x_285);
-x_301 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__9(x_285, x_300, x_2, x_3, x_4, x_5, x_297);
-if (lean_obj_tag(x_301) == 0)
+x_302 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_301, x_294, x_285);
+x_303 = l_Lean_Compiler_LCNF_Code_cse_go___closed__2;
+lean_inc(x_287);
+x_304 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__9(x_287, x_303, x_2, x_3, x_4, x_5, x_300);
+if (lean_obj_tag(x_304) == 0)
 {
-uint8_t x_302; 
-x_302 = !lean_is_exclusive(x_301);
-if (x_302 == 0)
+uint8_t x_305; 
+x_305 = !lean_is_exclusive(x_304);
+if (x_305 == 0)
 {
-lean_object* x_303; size_t x_304; size_t x_305; uint8_t x_306; 
-x_303 = lean_ctor_get(x_301, 0);
-x_304 = lean_ptr_addr(x_285);
+lean_object* x_306; size_t x_307; size_t x_308; uint8_t x_309; 
+x_306 = lean_ctor_get(x_304, 0);
+x_307 = lean_ptr_addr(x_287);
+lean_dec(x_287);
+x_308 = lean_ptr_addr(x_306);
+x_309 = lean_usize_dec_eq(x_307, x_308);
+if (x_309 == 0)
+{
+uint8_t x_310; 
+lean_dec(x_286);
 lean_dec(x_285);
-x_305 = lean_ptr_addr(x_303);
-x_306 = lean_usize_dec_eq(x_304, x_305);
-if (x_306 == 0)
+x_310 = !lean_is_exclusive(x_1);
+if (x_310 == 0)
 {
-uint8_t x_307; 
-lean_dec(x_284);
-lean_dec(x_283);
-x_307 = !lean_is_exclusive(x_1);
-if (x_307 == 0)
-{
-lean_object* x_308; 
-x_308 = lean_ctor_get(x_1, 0);
-lean_dec(x_308);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-lean_ctor_set(x_301, 0, x_1);
-return x_301;
+lean_object* x_311; 
+x_311 = lean_ctor_get(x_1, 0);
+lean_dec(x_311);
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+lean_ctor_set(x_304, 0, x_1);
+return x_304;
 }
 else
 {
-lean_object* x_309; 
+lean_object* x_312; 
 lean_dec(x_1);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-x_309 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_309, 0, x_280);
-lean_ctor_set(x_301, 0, x_309);
-return x_301;
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+x_312 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_312, 0, x_282);
+lean_ctor_set(x_304, 0, x_312);
+return x_304;
 }
 }
 else
 {
-size_t x_310; size_t x_311; uint8_t x_312; 
-x_310 = lean_ptr_addr(x_283);
-lean_dec(x_283);
-x_311 = lean_ptr_addr(x_299);
-x_312 = lean_usize_dec_eq(x_310, x_311);
-if (x_312 == 0)
-{
-uint8_t x_313; 
-lean_dec(x_284);
-x_313 = !lean_is_exclusive(x_1);
-if (x_313 == 0)
-{
-lean_object* x_314; 
-x_314 = lean_ctor_get(x_1, 0);
-lean_dec(x_314);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-lean_ctor_set(x_301, 0, x_1);
-return x_301;
-}
-else
-{
-lean_object* x_315; 
-lean_dec(x_1);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-x_315 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_315, 0, x_280);
-lean_ctor_set(x_301, 0, x_315);
-return x_301;
-}
-}
-else
+size_t x_313; size_t x_314; uint8_t x_315; 
+x_313 = lean_ptr_addr(x_285);
+lean_dec(x_285);
+x_314 = lean_ptr_addr(x_302);
+x_315 = lean_usize_dec_eq(x_313, x_314);
+if (x_315 == 0)
 {
 uint8_t x_316; 
-x_316 = lean_name_eq(x_284, x_292);
-lean_dec(x_284);
+lean_dec(x_286);
+x_316 = !lean_is_exclusive(x_1);
 if (x_316 == 0)
 {
-uint8_t x_317; 
-x_317 = !lean_is_exclusive(x_1);
-if (x_317 == 0)
+lean_object* x_317; 
+x_317 = lean_ctor_get(x_1, 0);
+lean_dec(x_317);
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+lean_ctor_set(x_304, 0, x_1);
+return x_304;
+}
+else
 {
 lean_object* x_318; 
-x_318 = lean_ctor_get(x_1, 0);
-lean_dec(x_318);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-lean_ctor_set(x_301, 0, x_1);
-return x_301;
-}
-else
-{
-lean_object* x_319; 
 lean_dec(x_1);
-lean_ctor_set(x_280, 3, x_303);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-x_319 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_319, 0, x_280);
-lean_ctor_set(x_301, 0, x_319);
-return x_301;
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+x_318 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_318, 0, x_282);
+lean_ctor_set(x_304, 0, x_318);
+return x_304;
 }
 }
 else
 {
-lean_dec(x_303);
-lean_dec(x_299);
-lean_dec(x_292);
-lean_free_object(x_280);
-lean_dec(x_282);
-lean_ctor_set(x_301, 0, x_1);
-return x_301;
+uint8_t x_319; 
+x_319 = lean_name_eq(x_286, x_295);
+lean_dec(x_286);
+if (x_319 == 0)
+{
+uint8_t x_320; 
+x_320 = !lean_is_exclusive(x_1);
+if (x_320 == 0)
+{
+lean_object* x_321; 
+x_321 = lean_ctor_get(x_1, 0);
+lean_dec(x_321);
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+lean_ctor_set(x_304, 0, x_1);
+return x_304;
+}
+else
+{
+lean_object* x_322; 
+lean_dec(x_1);
+lean_ctor_set(x_282, 3, x_306);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+x_322 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_322, 0, x_282);
+lean_ctor_set(x_304, 0, x_322);
+return x_304;
+}
+}
+else
+{
+lean_dec(x_306);
+lean_dec(x_302);
+lean_dec(x_295);
+lean_free_object(x_282);
+lean_dec(x_284);
+lean_ctor_set(x_304, 0, x_1);
+return x_304;
 }
 }
 }
 }
 else
 {
-lean_object* x_320; lean_object* x_321; size_t x_322; size_t x_323; uint8_t x_324; 
-x_320 = lean_ctor_get(x_301, 0);
-x_321 = lean_ctor_get(x_301, 1);
-lean_inc(x_321);
-lean_inc(x_320);
-lean_dec(x_301);
-x_322 = lean_ptr_addr(x_285);
+lean_object* x_323; lean_object* x_324; size_t x_325; size_t x_326; uint8_t x_327; 
+x_323 = lean_ctor_get(x_304, 0);
+x_324 = lean_ctor_get(x_304, 1);
+lean_inc(x_324);
+lean_inc(x_323);
+lean_dec(x_304);
+x_325 = lean_ptr_addr(x_287);
+lean_dec(x_287);
+x_326 = lean_ptr_addr(x_323);
+x_327 = lean_usize_dec_eq(x_325, x_326);
+if (x_327 == 0)
+{
+lean_object* x_328; lean_object* x_329; lean_object* x_330; 
+lean_dec(x_286);
 lean_dec(x_285);
-x_323 = lean_ptr_addr(x_320);
-x_324 = lean_usize_dec_eq(x_322, x_323);
-if (x_324 == 0)
-{
-lean_object* x_325; lean_object* x_326; lean_object* x_327; 
-lean_dec(x_284);
-lean_dec(x_283);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_325 = x_1;
+ x_328 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_325 = lean_box(0);
+ x_328 = lean_box(0);
 }
-lean_ctor_set(x_280, 3, x_320);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-if (lean_is_scalar(x_325)) {
- x_326 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_282, 3, x_323);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+if (lean_is_scalar(x_328)) {
+ x_329 = lean_alloc_ctor(4, 1, 0);
 } else {
- x_326 = x_325;
+ x_329 = x_328;
 }
-lean_ctor_set(x_326, 0, x_280);
-x_327 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_327, 0, x_326);
-lean_ctor_set(x_327, 1, x_321);
-return x_327;
+lean_ctor_set(x_329, 0, x_282);
+x_330 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_330, 0, x_329);
+lean_ctor_set(x_330, 1, x_324);
+return x_330;
 }
 else
 {
-size_t x_328; size_t x_329; uint8_t x_330; 
-x_328 = lean_ptr_addr(x_283);
-lean_dec(x_283);
-x_329 = lean_ptr_addr(x_299);
-x_330 = lean_usize_dec_eq(x_328, x_329);
-if (x_330 == 0)
+size_t x_331; size_t x_332; uint8_t x_333; 
+x_331 = lean_ptr_addr(x_285);
+lean_dec(x_285);
+x_332 = lean_ptr_addr(x_302);
+x_333 = lean_usize_dec_eq(x_331, x_332);
+if (x_333 == 0)
 {
-lean_object* x_331; lean_object* x_332; lean_object* x_333; 
-lean_dec(x_284);
+lean_object* x_334; lean_object* x_335; lean_object* x_336; 
+lean_dec(x_286);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_331 = x_1;
+ x_334 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_331 = lean_box(0);
+ x_334 = lean_box(0);
 }
-lean_ctor_set(x_280, 3, x_320);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-if (lean_is_scalar(x_331)) {
- x_332 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_282, 3, x_323);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+if (lean_is_scalar(x_334)) {
+ x_335 = lean_alloc_ctor(4, 1, 0);
 } else {
- x_332 = x_331;
+ x_335 = x_334;
 }
-lean_ctor_set(x_332, 0, x_280);
-x_333 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_333, 0, x_332);
-lean_ctor_set(x_333, 1, x_321);
-return x_333;
+lean_ctor_set(x_335, 0, x_282);
+x_336 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_336, 0, x_335);
+lean_ctor_set(x_336, 1, x_324);
+return x_336;
 }
 else
 {
-uint8_t x_334; 
-x_334 = lean_name_eq(x_284, x_292);
-lean_dec(x_284);
-if (x_334 == 0)
+uint8_t x_337; 
+x_337 = lean_name_eq(x_286, x_295);
+lean_dec(x_286);
+if (x_337 == 0)
 {
-lean_object* x_335; lean_object* x_336; lean_object* x_337; 
+lean_object* x_338; lean_object* x_339; lean_object* x_340; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_335 = x_1;
+ x_338 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_335 = lean_box(0);
+ x_338 = lean_box(0);
 }
-lean_ctor_set(x_280, 3, x_320);
-lean_ctor_set(x_280, 2, x_292);
-lean_ctor_set(x_280, 1, x_299);
-if (lean_is_scalar(x_335)) {
- x_336 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_282, 3, x_323);
+lean_ctor_set(x_282, 2, x_295);
+lean_ctor_set(x_282, 1, x_302);
+if (lean_is_scalar(x_338)) {
+ x_339 = lean_alloc_ctor(4, 1, 0);
 } else {
- x_336 = x_335;
+ x_339 = x_338;
 }
-lean_ctor_set(x_336, 0, x_280);
-x_337 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_337, 0, x_336);
-lean_ctor_set(x_337, 1, x_321);
-return x_337;
+lean_ctor_set(x_339, 0, x_282);
+x_340 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_340, 0, x_339);
+lean_ctor_set(x_340, 1, x_324);
+return x_340;
 }
 else
 {
-lean_object* x_338; 
-lean_dec(x_320);
-lean_dec(x_299);
-lean_dec(x_292);
-lean_free_object(x_280);
-lean_dec(x_282);
-x_338 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_338, 0, x_1);
-lean_ctor_set(x_338, 1, x_321);
-return x_338;
+lean_object* x_341; 
+lean_dec(x_323);
+lean_dec(x_302);
+lean_dec(x_295);
+lean_free_object(x_282);
+lean_dec(x_284);
+x_341 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_341, 0, x_1);
+lean_ctor_set(x_341, 1, x_324);
+return x_341;
 }
 }
 }
@@ -4403,396 +4484,413 @@ return x_338;
 }
 else
 {
-uint8_t x_339; 
-lean_dec(x_299);
-lean_dec(x_292);
-lean_free_object(x_280);
+uint8_t x_342; 
+lean_dec(x_302);
+lean_dec(x_295);
+lean_free_object(x_282);
+lean_dec(x_287);
+lean_dec(x_286);
 lean_dec(x_285);
 lean_dec(x_284);
-lean_dec(x_283);
-lean_dec(x_282);
 lean_dec(x_1);
-x_339 = !lean_is_exclusive(x_301);
-if (x_339 == 0)
+x_342 = !lean_is_exclusive(x_304);
+if (x_342 == 0)
 {
-return x_301;
+return x_304;
 }
 else
 {
-lean_object* x_340; lean_object* x_341; lean_object* x_342; 
-x_340 = lean_ctor_get(x_301, 0);
-x_341 = lean_ctor_get(x_301, 1);
-lean_inc(x_341);
-lean_inc(x_340);
-lean_dec(x_301);
-x_342 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_342, 0, x_340);
-lean_ctor_set(x_342, 1, x_341);
-return x_342;
-}
-}
-}
-else
-{
-lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; 
-x_343 = lean_ctor_get(x_280, 0);
-x_344 = lean_ctor_get(x_280, 1);
-x_345 = lean_ctor_get(x_280, 2);
-x_346 = lean_ctor_get(x_280, 3);
-lean_inc(x_346);
-lean_inc(x_345);
+lean_object* x_343; lean_object* x_344; lean_object* x_345; 
+x_343 = lean_ctor_get(x_304, 0);
+x_344 = lean_ctor_get(x_304, 1);
 lean_inc(x_344);
 lean_inc(x_343);
-lean_dec(x_280);
-x_347 = lean_st_ref_get(x_5, x_6);
-x_348 = lean_ctor_get(x_347, 1);
-lean_inc(x_348);
-lean_dec(x_347);
-x_349 = lean_st_ref_get(x_2, x_348);
-x_350 = lean_ctor_get(x_349, 0);
-lean_inc(x_350);
-x_351 = lean_ctor_get(x_349, 1);
-lean_inc(x_351);
-lean_dec(x_349);
-x_352 = lean_ctor_get(x_350, 1);
-lean_inc(x_352);
-lean_dec(x_350);
-lean_inc(x_345);
-x_353 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_352, x_345);
-x_354 = lean_st_ref_get(x_5, x_351);
-x_355 = lean_ctor_get(x_354, 1);
-lean_inc(x_355);
-lean_dec(x_354);
-x_356 = lean_st_ref_get(x_2, x_355);
-x_357 = lean_ctor_get(x_356, 0);
-lean_inc(x_357);
-x_358 = lean_ctor_get(x_356, 1);
-lean_inc(x_358);
-lean_dec(x_356);
-x_359 = lean_ctor_get(x_357, 1);
-lean_inc(x_359);
-lean_dec(x_357);
-lean_inc(x_344);
-x_360 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_359, x_344);
-x_361 = l_Lean_Compiler_LCNF_Code_cse_go___closed__2;
-lean_inc(x_346);
-x_362 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__9(x_346, x_361, x_2, x_3, x_4, x_5, x_358);
-if (lean_obj_tag(x_362) == 0)
-{
-lean_object* x_363; lean_object* x_364; lean_object* x_365; size_t x_366; size_t x_367; uint8_t x_368; 
-x_363 = lean_ctor_get(x_362, 0);
-lean_inc(x_363);
-x_364 = lean_ctor_get(x_362, 1);
-lean_inc(x_364);
-if (lean_is_exclusive(x_362)) {
- lean_ctor_release(x_362, 0);
- lean_ctor_release(x_362, 1);
- x_365 = x_362;
-} else {
- lean_dec_ref(x_362);
- x_365 = lean_box(0);
+lean_dec(x_304);
+x_345 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_345, 0, x_343);
+lean_ctor_set(x_345, 1, x_344);
+return x_345;
 }
-x_366 = lean_ptr_addr(x_346);
-lean_dec(x_346);
-x_367 = lean_ptr_addr(x_363);
-x_368 = lean_usize_dec_eq(x_366, x_367);
-if (x_368 == 0)
+}
+}
+else
 {
-lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; 
-lean_dec(x_345);
-lean_dec(x_344);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_369 = x_1;
+lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; uint8_t x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; 
+x_346 = lean_ctor_get(x_282, 0);
+x_347 = lean_ctor_get(x_282, 1);
+x_348 = lean_ctor_get(x_282, 2);
+x_349 = lean_ctor_get(x_282, 3);
+lean_inc(x_349);
+lean_inc(x_348);
+lean_inc(x_347);
+lean_inc(x_346);
+lean_dec(x_282);
+x_350 = lean_st_ref_get(x_5, x_6);
+x_351 = lean_ctor_get(x_350, 1);
+lean_inc(x_351);
+lean_dec(x_350);
+x_352 = lean_st_ref_get(x_2, x_351);
+x_353 = lean_ctor_get(x_352, 0);
+lean_inc(x_353);
+x_354 = lean_ctor_get(x_352, 1);
+lean_inc(x_354);
+lean_dec(x_352);
+x_355 = lean_ctor_get(x_353, 1);
+lean_inc(x_355);
+lean_dec(x_353);
+x_356 = 0;
+lean_inc(x_348);
+x_357 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_355, x_348, x_356);
+x_358 = lean_st_ref_get(x_5, x_354);
+x_359 = lean_ctor_get(x_358, 1);
+lean_inc(x_359);
+lean_dec(x_358);
+x_360 = lean_st_ref_get(x_2, x_359);
+x_361 = lean_ctor_get(x_360, 0);
+lean_inc(x_361);
+x_362 = lean_ctor_get(x_360, 1);
+lean_inc(x_362);
+lean_dec(x_360);
+x_363 = lean_ctor_get(x_361, 1);
+lean_inc(x_363);
+lean_dec(x_361);
+lean_inc(x_347);
+x_364 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_363, x_356, x_347);
+x_365 = l_Lean_Compiler_LCNF_Code_cse_go___closed__2;
+lean_inc(x_349);
+x_366 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Code_cse_go___spec__9(x_349, x_365, x_2, x_3, x_4, x_5, x_362);
+if (lean_obj_tag(x_366) == 0)
+{
+lean_object* x_367; lean_object* x_368; lean_object* x_369; size_t x_370; size_t x_371; uint8_t x_372; 
+x_367 = lean_ctor_get(x_366, 0);
+lean_inc(x_367);
+x_368 = lean_ctor_get(x_366, 1);
+lean_inc(x_368);
+if (lean_is_exclusive(x_366)) {
+ lean_ctor_release(x_366, 0);
+ lean_ctor_release(x_366, 1);
+ x_369 = x_366;
 } else {
- lean_dec_ref(x_1);
+ lean_dec_ref(x_366);
  x_369 = lean_box(0);
 }
-x_370 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_370, 0, x_343);
-lean_ctor_set(x_370, 1, x_360);
-lean_ctor_set(x_370, 2, x_353);
-lean_ctor_set(x_370, 3, x_363);
+x_370 = lean_ptr_addr(x_349);
+lean_dec(x_349);
+x_371 = lean_ptr_addr(x_367);
+x_372 = lean_usize_dec_eq(x_370, x_371);
+if (x_372 == 0)
+{
+lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; 
+lean_dec(x_348);
+lean_dec(x_347);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_373 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_373 = lean_box(0);
+}
+x_374 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_374, 0, x_346);
+lean_ctor_set(x_374, 1, x_364);
+lean_ctor_set(x_374, 2, x_357);
+lean_ctor_set(x_374, 3, x_367);
+if (lean_is_scalar(x_373)) {
+ x_375 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_375 = x_373;
+}
+lean_ctor_set(x_375, 0, x_374);
 if (lean_is_scalar(x_369)) {
- x_371 = lean_alloc_ctor(4, 1, 0);
+ x_376 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_371 = x_369;
+ x_376 = x_369;
 }
-lean_ctor_set(x_371, 0, x_370);
-if (lean_is_scalar(x_365)) {
- x_372 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_372 = x_365;
-}
-lean_ctor_set(x_372, 0, x_371);
-lean_ctor_set(x_372, 1, x_364);
-return x_372;
+lean_ctor_set(x_376, 0, x_375);
+lean_ctor_set(x_376, 1, x_368);
+return x_376;
 }
 else
 {
-size_t x_373; size_t x_374; uint8_t x_375; 
-x_373 = lean_ptr_addr(x_344);
-lean_dec(x_344);
-x_374 = lean_ptr_addr(x_360);
-x_375 = lean_usize_dec_eq(x_373, x_374);
-if (x_375 == 0)
+size_t x_377; size_t x_378; uint8_t x_379; 
+x_377 = lean_ptr_addr(x_347);
+lean_dec(x_347);
+x_378 = lean_ptr_addr(x_364);
+x_379 = lean_usize_dec_eq(x_377, x_378);
+if (x_379 == 0)
 {
-lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; 
-lean_dec(x_345);
+lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; 
+lean_dec(x_348);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_376 = x_1;
+ x_380 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_376 = lean_box(0);
+ x_380 = lean_box(0);
 }
-x_377 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_377, 0, x_343);
-lean_ctor_set(x_377, 1, x_360);
-lean_ctor_set(x_377, 2, x_353);
-lean_ctor_set(x_377, 3, x_363);
-if (lean_is_scalar(x_376)) {
- x_378 = lean_alloc_ctor(4, 1, 0);
+x_381 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_381, 0, x_346);
+lean_ctor_set(x_381, 1, x_364);
+lean_ctor_set(x_381, 2, x_357);
+lean_ctor_set(x_381, 3, x_367);
+if (lean_is_scalar(x_380)) {
+ x_382 = lean_alloc_ctor(4, 1, 0);
 } else {
- x_378 = x_376;
+ x_382 = x_380;
 }
-lean_ctor_set(x_378, 0, x_377);
-if (lean_is_scalar(x_365)) {
- x_379 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_382, 0, x_381);
+if (lean_is_scalar(x_369)) {
+ x_383 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_379 = x_365;
-}
-lean_ctor_set(x_379, 0, x_378);
-lean_ctor_set(x_379, 1, x_364);
-return x_379;
-}
-else
-{
-uint8_t x_380; 
-x_380 = lean_name_eq(x_345, x_353);
-lean_dec(x_345);
-if (x_380 == 0)
-{
-lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_381 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_381 = lean_box(0);
-}
-x_382 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_382, 0, x_343);
-lean_ctor_set(x_382, 1, x_360);
-lean_ctor_set(x_382, 2, x_353);
-lean_ctor_set(x_382, 3, x_363);
-if (lean_is_scalar(x_381)) {
- x_383 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_383 = x_381;
+ x_383 = x_369;
 }
 lean_ctor_set(x_383, 0, x_382);
-if (lean_is_scalar(x_365)) {
- x_384 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_384 = x_365;
-}
-lean_ctor_set(x_384, 0, x_383);
-lean_ctor_set(x_384, 1, x_364);
-return x_384;
+lean_ctor_set(x_383, 1, x_368);
+return x_383;
 }
 else
 {
-lean_object* x_385; 
-lean_dec(x_363);
-lean_dec(x_360);
-lean_dec(x_353);
-lean_dec(x_343);
-if (lean_is_scalar(x_365)) {
- x_385 = lean_alloc_ctor(0, 2, 0);
+uint8_t x_384; 
+x_384 = lean_name_eq(x_348, x_357);
+lean_dec(x_348);
+if (x_384 == 0)
+{
+lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; 
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_385 = x_1;
 } else {
- x_385 = x_365;
-}
-lean_ctor_set(x_385, 0, x_1);
-lean_ctor_set(x_385, 1, x_364);
-return x_385;
+ lean_dec_ref(x_1);
+ x_385 = lean_box(0);
 }
+x_386 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_386, 0, x_346);
+lean_ctor_set(x_386, 1, x_364);
+lean_ctor_set(x_386, 2, x_357);
+lean_ctor_set(x_386, 3, x_367);
+if (lean_is_scalar(x_385)) {
+ x_387 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_387 = x_385;
 }
+lean_ctor_set(x_387, 0, x_386);
+if (lean_is_scalar(x_369)) {
+ x_388 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_388 = x_369;
 }
+lean_ctor_set(x_388, 0, x_387);
+lean_ctor_set(x_388, 1, x_368);
+return x_388;
 }
 else
 {
-lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; 
-lean_dec(x_360);
-lean_dec(x_353);
+lean_object* x_389; 
+lean_dec(x_367);
+lean_dec(x_364);
+lean_dec(x_357);
 lean_dec(x_346);
-lean_dec(x_345);
-lean_dec(x_344);
-lean_dec(x_343);
-lean_dec(x_1);
-x_386 = lean_ctor_get(x_362, 0);
-lean_inc(x_386);
-x_387 = lean_ctor_get(x_362, 1);
-lean_inc(x_387);
-if (lean_is_exclusive(x_362)) {
- lean_ctor_release(x_362, 0);
- lean_ctor_release(x_362, 1);
- x_388 = x_362;
+if (lean_is_scalar(x_369)) {
+ x_389 = lean_alloc_ctor(0, 2, 0);
 } else {
- lean_dec_ref(x_362);
- x_388 = lean_box(0);
+ x_389 = x_369;
 }
-if (lean_is_scalar(x_388)) {
- x_389 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_389 = x_388;
-}
-lean_ctor_set(x_389, 0, x_386);
-lean_ctor_set(x_389, 1, x_387);
+lean_ctor_set(x_389, 0, x_1);
+lean_ctor_set(x_389, 1, x_368);
 return x_389;
 }
 }
 }
+}
+else
+{
+lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; 
+lean_dec(x_364);
+lean_dec(x_357);
+lean_dec(x_349);
+lean_dec(x_348);
+lean_dec(x_347);
+lean_dec(x_346);
+lean_dec(x_1);
+x_390 = lean_ctor_get(x_366, 0);
+lean_inc(x_390);
+x_391 = lean_ctor_get(x_366, 1);
+lean_inc(x_391);
+if (lean_is_exclusive(x_366)) {
+ lean_ctor_release(x_366, 0);
+ lean_ctor_release(x_366, 1);
+ x_392 = x_366;
+} else {
+ lean_dec_ref(x_366);
+ x_392 = lean_box(0);
+}
+if (lean_is_scalar(x_392)) {
+ x_393 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_393 = x_392;
+}
+lean_ctor_set(x_393, 0, x_390);
+lean_ctor_set(x_393, 1, x_391);
+return x_393;
+}
+}
+}
 case 5:
 {
-lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; uint8_t x_394; 
+lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; uint8_t x_398; 
 lean_dec(x_4);
 lean_dec(x_3);
-x_390 = lean_ctor_get(x_1, 0);
-lean_inc(x_390);
-x_391 = lean_st_ref_get(x_5, x_6);
+x_394 = lean_ctor_get(x_1, 0);
+lean_inc(x_394);
+x_395 = lean_st_ref_get(x_5, x_6);
 lean_dec(x_5);
-x_392 = lean_ctor_get(x_391, 1);
-lean_inc(x_392);
-lean_dec(x_391);
-x_393 = lean_st_ref_get(x_2, x_392);
-lean_dec(x_2);
-x_394 = !lean_is_exclusive(x_393);
-if (x_394 == 0)
-{
-lean_object* x_395; lean_object* x_396; lean_object* x_397; uint8_t x_398; 
-x_395 = lean_ctor_get(x_393, 0);
 x_396 = lean_ctor_get(x_395, 1);
 lean_inc(x_396);
 lean_dec(x_395);
-lean_inc(x_390);
-x_397 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_396, x_390);
-x_398 = lean_name_eq(x_390, x_397);
-lean_dec(x_390);
+x_397 = lean_st_ref_get(x_2, x_396);
+lean_dec(x_2);
+x_398 = !lean_is_exclusive(x_397);
 if (x_398 == 0)
 {
-uint8_t x_399; 
-x_399 = !lean_is_exclusive(x_1);
-if (x_399 == 0)
+lean_object* x_399; lean_object* x_400; uint8_t x_401; lean_object* x_402; uint8_t x_403; 
+x_399 = lean_ctor_get(x_397, 0);
+x_400 = lean_ctor_get(x_399, 1);
+lean_inc(x_400);
+lean_dec(x_399);
+x_401 = 0;
+lean_inc(x_394);
+x_402 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_400, x_394, x_401);
+x_403 = lean_name_eq(x_394, x_402);
+lean_dec(x_394);
+if (x_403 == 0)
 {
-lean_object* x_400; 
-x_400 = lean_ctor_get(x_1, 0);
-lean_dec(x_400);
-lean_ctor_set(x_1, 0, x_397);
-lean_ctor_set(x_393, 0, x_1);
-return x_393;
+uint8_t x_404; 
+x_404 = !lean_is_exclusive(x_1);
+if (x_404 == 0)
+{
+lean_object* x_405; 
+x_405 = lean_ctor_get(x_1, 0);
+lean_dec(x_405);
+lean_ctor_set(x_1, 0, x_402);
+lean_ctor_set(x_397, 0, x_1);
+return x_397;
 }
 else
 {
-lean_object* x_401; 
+lean_object* x_406; 
 lean_dec(x_1);
-x_401 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_401, 0, x_397);
-lean_ctor_set(x_393, 0, x_401);
-return x_393;
+x_406 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_406, 0, x_402);
+lean_ctor_set(x_397, 0, x_406);
+return x_397;
 }
 }
 else
 {
-lean_dec(x_397);
-lean_ctor_set(x_393, 0, x_1);
-return x_393;
-}
-}
-else
-{
-lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; uint8_t x_406; 
-x_402 = lean_ctor_get(x_393, 0);
-x_403 = lean_ctor_get(x_393, 1);
-lean_inc(x_403);
-lean_inc(x_402);
-lean_dec(x_393);
-x_404 = lean_ctor_get(x_402, 1);
-lean_inc(x_404);
 lean_dec(x_402);
-lean_inc(x_390);
-x_405 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_404, x_390);
-x_406 = lean_name_eq(x_390, x_405);
-lean_dec(x_390);
-if (x_406 == 0)
+lean_ctor_set(x_397, 0, x_1);
+return x_397;
+}
+}
+else
 {
-lean_object* x_407; lean_object* x_408; lean_object* x_409; 
+lean_object* x_407; lean_object* x_408; lean_object* x_409; uint8_t x_410; lean_object* x_411; uint8_t x_412; 
+x_407 = lean_ctor_get(x_397, 0);
+x_408 = lean_ctor_get(x_397, 1);
+lean_inc(x_408);
+lean_inc(x_407);
+lean_dec(x_397);
+x_409 = lean_ctor_get(x_407, 1);
+lean_inc(x_409);
+lean_dec(x_407);
+x_410 = 0;
+lean_inc(x_394);
+x_411 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_409, x_394, x_410);
+x_412 = lean_name_eq(x_394, x_411);
+lean_dec(x_394);
+if (x_412 == 0)
+{
+lean_object* x_413; lean_object* x_414; lean_object* x_415; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_407 = x_1;
+ x_413 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_407 = lean_box(0);
+ x_413 = lean_box(0);
 }
-if (lean_is_scalar(x_407)) {
- x_408 = lean_alloc_ctor(5, 1, 0);
+if (lean_is_scalar(x_413)) {
+ x_414 = lean_alloc_ctor(5, 1, 0);
 } else {
- x_408 = x_407;
+ x_414 = x_413;
 }
-lean_ctor_set(x_408, 0, x_405);
-x_409 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_409, 0, x_408);
-lean_ctor_set(x_409, 1, x_403);
-return x_409;
+lean_ctor_set(x_414, 0, x_411);
+x_415 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_415, 0, x_414);
+lean_ctor_set(x_415, 1, x_408);
+return x_415;
 }
 else
 {
-lean_object* x_410; 
-lean_dec(x_405);
-x_410 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_410, 0, x_1);
-lean_ctor_set(x_410, 1, x_403);
-return x_410;
+lean_object* x_416; 
+lean_dec(x_411);
+x_416 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_416, 0, x_1);
+lean_ctor_set(x_416, 1, x_408);
+return x_416;
 }
 }
 }
 default: 
 {
-lean_object* x_411; 
+lean_object* x_417; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_411 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_411, 0, x_1);
-lean_ctor_set(x_411, 1, x_6);
-return x_411;
+x_417 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_417, 0, x_1);
+lean_ctor_set(x_417, 1, x_6);
+return x_417;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___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_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__2(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_7;
+return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Code_cse_go___spec__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_7;
+return x_9;
 }
 }
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Compiler_LCNF_Code_cse_go___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -4817,16 +4915,28 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___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_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___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) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Code_cse_go___spec__6(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_7;
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
 }
 }
 static lean_object* _init_l_Lean_Compiler_LCNF_Code_cse___closed__1() {
@@ -5112,7 +5222,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_984____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -5120,31 +5230,31 @@ 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_984____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____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_CSE___hyg_984____closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____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_CSE___hyg_984____closed__3() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__3() {
 _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_984____closed__2;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__2;
 x_2 = l_Lean_Compiler_LCNF_cse___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979_(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_984____closed__3;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__3;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 return x_4;
@@ -5183,20 +5293,16 @@ l_Lean_Compiler_LCNF_CSE_State_subst___default___closed__1 = _init_l_Lean_Compil
 lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_State_subst___default___closed__1);
 l_Lean_Compiler_LCNF_CSE_State_subst___default = _init_l_Lean_Compiler_LCNF_CSE_State_subst___default();
 lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_State_subst___default);
-l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1 = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__1);
-l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2 = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM___closed__2);
-l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM();
-lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstM);
+l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1 = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__1);
+l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2 = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse___closed__2);
+l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse = _init_l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse();
+lean_mark_persistent(l_Lean_Compiler_LCNF_CSE_instMonadFVarSubstMFalse);
 l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__1 = _init_l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__1();
 l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__2 = _init_l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__2();
 l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__3 = _init_l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__3();
 lean_mark_persistent(l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_CSE_addEntry___spec__2___closed__3);
-l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1 = _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Code_cse_goFunDecl___spec__1___closed__1);
-l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1 = _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Code_cse_go___spec__5___closed__1);
 l_Lean_Compiler_LCNF_Code_cse_go___closed__1 = _init_l_Lean_Compiler_LCNF_Code_cse_go___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Code_cse_go___closed__1);
 l_Lean_Compiler_LCNF_Code_cse_go___closed__2 = _init_l_Lean_Compiler_LCNF_Code_cse_go___closed__2();
@@ -5213,13 +5319,13 @@ 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_984____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__2);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984____closed__3);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_984_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__2);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979____closed__3);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_CSE___hyg_979_(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 0dd34b94b3..75524542ad 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/CompilerM.c
@@ -13,106 +13,140 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_update_x27(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4___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_Internalize_internalizeFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1(lean_object*, uint8_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__2(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_add(size_t, size_t);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__8___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_CompilerM_instInhabitedState;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l_Lean_Expr_lam___override(lean_object*, lean_object*, lean_object*, uint8_t);
-static lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_internalize_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1;
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_forallE___override(lean_object*, lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___boxed(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);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_findParam_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint64_t l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1___boxed(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_getBinderName___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7(uint8_t);
+LEAN_EXPORT lean_object* l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkParam(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_addFVarSubst___spec__5(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__9(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeCode___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_cleanup(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1___boxed(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_getParam___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_mdata___override(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstState(lean_object*, lean_object*);
 lean_object* l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__2(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11___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*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_replaceFVar___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_addLetDecl(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_modifyLCtx___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseFunDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11(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_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__4(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__10(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_modifyLCtx(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___spec__6(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_internalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__8(uint8_t, 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*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs(lean_object*);
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_cleanup___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__2___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getType___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVars(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normParams___spec__1(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__6(lean_object*, lean_object*);
 size_t lean_uint64_to_usize(uint64_t);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_CompilerM_instInhabitedState___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_findParam_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__10___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_eraseFunDecl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normExprs___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CompilerM_run(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_cleanup___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getFunDecl___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM(uint8_t);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at_Lean_Compiler_LCNF_mkParam___spec__2___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseCode___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__9___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_normLetDecl(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeCodeDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__4;
 static lean_object* l_Lean_Compiler_LCNF_getParam___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_num___override(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_getType___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getBinderName___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__2___rarg___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_mkFreshJpName___closed__2;
@@ -126,37 +160,40 @@ LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at___private_Lean_Compiler_LCNF_
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at_Lean_Compiler_LCNF_mkParam___spec__2___rarg___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getLetDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_mkFreshJpName___closed__1;
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_replaceFVar___spec__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_getType___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_getParam___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_updateValue___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFreshJpName___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Code_internalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_eraseLetDecl(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___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_Compiler_LCNF_mkLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(uint8_t);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normParams___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at_Lean_Compiler_LCNF_mkParam___spec__2___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_expr_dbg_to_string(lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_update_x27___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_Compiler_LCNF_addFVarSubst___spec__4(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*, uint8_t);
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_cleanup___spec__1___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__5;
-static lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_getFunDecl___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CompilerM_State_lctx___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -165,88 +202,92 @@ size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_FunDeclCore_updateValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__6___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_findFunDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFunDecl___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_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__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_CompilerM_State_lctx___default___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_CompilerM_State_lctx___default___closed__2;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__2___rarg(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM;
-static lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addSubst___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvar___override(lean_object*);
 size_t lean_ptr_addr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__4___boxed(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__1;
-LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___boxed(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_CompilerM_0__Lean_Compiler_LCNF_refreshBinderName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_LetDecl_updateValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getType___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM;
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Compiler_LCNF_getType___spec__5(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CompilerM_State_nextIdx___default;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseCodeDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__7(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_instAddMessageContextCompilerM___closed__6;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1(lean_object*, lean_object*, uint8_t, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_addParam(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFreshBinderName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_eraseFunDecl(lean_object*, lean_object*, uint8_t);
 static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normExprs___spec__1___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFreshBinderName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_toLocalContext(lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__1;
-LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__6(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addSubst___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_CompilerM_run___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst(uint8_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_findLetDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at_Lean_Compiler_LCNF_mkParam___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst___rarg(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2(uint8_t);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstState___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_mul(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_getLetDecl___closed__1;
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at_Lean_Compiler_LCNF_mkParam___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_LetDecl_updateValue___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_app___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getLetDecl___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_normCodeImp___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5___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_getBinderName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Compiler_LCNF_getType___spec__3(lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
 uint8_t l___private_Lean_Expr_0__Lean_beqBinderInfo____x40_Lean_Expr___hyg_375_(uint8_t, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at_Lean_Compiler_LCNF_mkParam___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue;
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Compiler_LCNF_getType___spec__1(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFreshJpName(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkAuxParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -258,29 +299,42 @@ static lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LC
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkAuxParam(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_eraseParam(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_getType___closed__3;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getFunDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_mkAuxParam___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__2___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4___boxed(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseParams___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at_Lean_Compiler_LCNF_addFVarSubst___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeCodeDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_refreshBinderName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_eraseCodeDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_addFunDecl(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addSubst(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_internalize___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasFVar(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1;
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___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_Decl_internalize_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panic___at_Lean_Expr_fvarId_x21___spec__1(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__5(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_findFunDecl_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshFVarId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -289,12 +343,13 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_getFunDecl___boxed(lean_object*, l
 static lean_object* l_Lean_Compiler_LCNF_getLetDecl___closed__2;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_getParam___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Compiler_LCNF_getType___spec__2(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_eraseCode(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_getFunDecl___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_getType___closed__4;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*);
 static lean_object* _init_l_Lean_Compiler_LCNF_CompilerM_State_lctx___default___closed__1() {
 _start:
 {
@@ -2638,296 +2693,311 @@ _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_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__1;
 x_2 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__2;
-x_3 = lean_unsigned_to_nat(123u);
+x_3 = lean_unsigned_to_nat(141u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object* x_1, uint8_t x_2, lean_object* x_3) {
 _start:
 {
-uint8_t x_3; 
-x_3 = l_Lean_Expr_hasFVar(x_2);
-if (x_3 == 0)
+uint8_t x_4; 
+x_4 = l_Lean_Expr_hasFVar(x_3);
+if (x_4 == 0)
 {
 lean_dec(x_1);
-return x_2;
+return x_3;
 }
 else
 {
-switch (lean_obj_tag(x_2)) {
+switch (lean_obj_tag(x_3)) {
 case 1:
 {
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_2, 0);
-lean_inc(x_4);
-x_5 = l_Std_HashMapImp_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__1(x_1, x_4);
-if (lean_obj_tag(x_5) == 0)
+lean_object* x_5; lean_object* x_6; 
+x_5 = lean_ctor_get(x_3, 0);
+lean_inc(x_5);
+lean_inc(x_1);
+x_6 = l_Std_HashMapImp_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__1(x_1, x_5);
+if (lean_obj_tag(x_6) == 0)
 {
-return x_2;
+lean_dec(x_1);
+return x_3;
 }
 else
 {
-lean_object* x_6; 
-lean_dec(x_2);
-x_6 = lean_ctor_get(x_5, 0);
-lean_inc(x_6);
-lean_dec(x_5);
-return x_6;
+lean_dec(x_3);
+if (x_2 == 0)
+{
+lean_object* x_7; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+lean_dec(x_6);
+x_3 = x_7;
+goto _start;
+}
+else
+{
+lean_object* x_9; 
+lean_dec(x_1);
+x_9 = lean_ctor_get(x_6, 0);
+lean_inc(x_9);
+lean_dec(x_6);
+return x_9;
+}
 }
 }
 case 5:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; uint8_t x_13; 
-x_7 = lean_ctor_get(x_2, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_2, 1);
-lean_inc(x_8);
-lean_inc(x_7);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; uint8_t x_16; 
+x_10 = lean_ctor_get(x_3, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_3, 1);
+lean_inc(x_11);
+lean_inc(x_10);
 lean_inc(x_1);
-x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_7);
-lean_inc(x_8);
-x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_8);
-x_11 = lean_ptr_addr(x_7);
-lean_dec(x_7);
-x_12 = lean_ptr_addr(x_9);
-x_13 = lean_usize_dec_eq(x_11, x_12);
-if (x_13 == 0)
-{
-lean_object* x_14; 
-lean_dec(x_8);
-lean_dec(x_2);
-x_14 = l_Lean_Expr_app___override(x_9, x_10);
-return x_14;
-}
-else
-{
-size_t x_15; size_t x_16; uint8_t x_17; 
-x_15 = lean_ptr_addr(x_8);
-lean_dec(x_8);
-x_16 = lean_ptr_addr(x_10);
-x_17 = lean_usize_dec_eq(x_15, x_16);
-if (x_17 == 0)
-{
-lean_object* x_18; 
-lean_dec(x_2);
-x_18 = l_Lean_Expr_app___override(x_9, x_10);
-return x_18;
-}
-else
-{
+x_12 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_10);
+lean_inc(x_11);
+x_13 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_11);
+x_14 = lean_ptr_addr(x_10);
 lean_dec(x_10);
-lean_dec(x_9);
-return x_2;
+x_15 = lean_ptr_addr(x_12);
+x_16 = lean_usize_dec_eq(x_14, x_15);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+lean_dec(x_11);
+lean_dec(x_3);
+x_17 = l_Lean_Expr_app___override(x_12, x_13);
+return x_17;
+}
+else
+{
+size_t x_18; size_t x_19; uint8_t x_20; 
+x_18 = lean_ptr_addr(x_11);
+lean_dec(x_11);
+x_19 = lean_ptr_addr(x_13);
+x_20 = lean_usize_dec_eq(x_18, x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; 
+lean_dec(x_3);
+x_21 = l_Lean_Expr_app___override(x_12, x_13);
+return x_21;
+}
+else
+{
+lean_dec(x_13);
+lean_dec(x_12);
+return x_3;
 }
 }
 }
 case 6:
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; size_t x_26; size_t x_27; uint8_t x_28; 
-x_19 = lean_ctor_get(x_2, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_2, 1);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_2, 2);
-lean_inc(x_21);
-x_22 = lean_ctor_get_uint8(x_2, sizeof(void*)*3 + 8);
-lean_dec(x_2);
-lean_inc(x_20);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; size_t x_29; size_t x_30; uint8_t x_31; 
+x_22 = lean_ctor_get(x_3, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_3, 1);
+lean_inc(x_23);
+x_24 = lean_ctor_get(x_3, 2);
+lean_inc(x_24);
+x_25 = lean_ctor_get_uint8(x_3, sizeof(void*)*3 + 8);
+lean_dec(x_3);
+lean_inc(x_23);
 lean_inc(x_1);
-x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_20);
-lean_inc(x_21);
-x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_21);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_inc(x_19);
-x_25 = l_Lean_Expr_lam___override(x_19, x_20, x_21, x_22);
-x_26 = lean_ptr_addr(x_20);
-lean_dec(x_20);
-x_27 = lean_ptr_addr(x_23);
-x_28 = lean_usize_dec_eq(x_26, x_27);
-if (x_28 == 0)
-{
-lean_object* x_29; 
-lean_dec(x_25);
-lean_dec(x_21);
-x_29 = l_Lean_Expr_lam___override(x_19, x_23, x_24, x_22);
-return x_29;
-}
-else
-{
-size_t x_30; size_t x_31; uint8_t x_32; 
-x_30 = lean_ptr_addr(x_21);
-lean_dec(x_21);
-x_31 = lean_ptr_addr(x_24);
-x_32 = lean_usize_dec_eq(x_30, x_31);
-if (x_32 == 0)
-{
-lean_object* x_33; 
-lean_dec(x_25);
-x_33 = l_Lean_Expr_lam___override(x_19, x_23, x_24, x_22);
-return x_33;
-}
-else
-{
-uint8_t x_34; 
-x_34 = l___private_Lean_Expr_0__Lean_beqBinderInfo____x40_Lean_Expr___hyg_375_(x_22, x_22);
-if (x_34 == 0)
-{
-lean_object* x_35; 
-lean_dec(x_25);
-x_35 = l_Lean_Expr_lam___override(x_19, x_23, x_24, x_22);
-return x_35;
-}
-else
-{
-lean_dec(x_24);
+x_26 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_23);
+lean_inc(x_24);
+x_27 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_24);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_inc(x_22);
+x_28 = l_Lean_Expr_lam___override(x_22, x_23, x_24, x_25);
+x_29 = lean_ptr_addr(x_23);
 lean_dec(x_23);
-lean_dec(x_19);
-return x_25;
+x_30 = lean_ptr_addr(x_26);
+x_31 = lean_usize_dec_eq(x_29, x_30);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+lean_dec(x_28);
+lean_dec(x_24);
+x_32 = l_Lean_Expr_lam___override(x_22, x_26, x_27, x_25);
+return x_32;
+}
+else
+{
+size_t x_33; size_t x_34; uint8_t x_35; 
+x_33 = lean_ptr_addr(x_24);
+lean_dec(x_24);
+x_34 = lean_ptr_addr(x_27);
+x_35 = lean_usize_dec_eq(x_33, x_34);
+if (x_35 == 0)
+{
+lean_object* x_36; 
+lean_dec(x_28);
+x_36 = l_Lean_Expr_lam___override(x_22, x_26, x_27, x_25);
+return x_36;
+}
+else
+{
+uint8_t x_37; 
+x_37 = l___private_Lean_Expr_0__Lean_beqBinderInfo____x40_Lean_Expr___hyg_375_(x_25, x_25);
+if (x_37 == 0)
+{
+lean_object* x_38; 
+lean_dec(x_28);
+x_38 = l_Lean_Expr_lam___override(x_22, x_26, x_27, x_25);
+return x_38;
+}
+else
+{
+lean_dec(x_27);
+lean_dec(x_26);
+lean_dec(x_22);
+return x_28;
 }
 }
 }
 }
 case 7:
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; size_t x_43; size_t x_44; uint8_t x_45; 
-x_36 = lean_ctor_get(x_2, 0);
-lean_inc(x_36);
-x_37 = lean_ctor_get(x_2, 1);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_2, 2);
-lean_inc(x_38);
-x_39 = lean_ctor_get_uint8(x_2, sizeof(void*)*3 + 8);
-lean_dec(x_2);
-lean_inc(x_37);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; size_t x_46; size_t x_47; uint8_t x_48; 
+x_39 = lean_ctor_get(x_3, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_3, 1);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_3, 2);
+lean_inc(x_41);
+x_42 = lean_ctor_get_uint8(x_3, sizeof(void*)*3 + 8);
+lean_dec(x_3);
+lean_inc(x_40);
 lean_inc(x_1);
-x_40 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_37);
-lean_inc(x_38);
-x_41 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_38);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_inc(x_36);
-x_42 = l_Lean_Expr_forallE___override(x_36, x_37, x_38, x_39);
-x_43 = lean_ptr_addr(x_37);
-lean_dec(x_37);
-x_44 = lean_ptr_addr(x_40);
-x_45 = lean_usize_dec_eq(x_43, x_44);
-if (x_45 == 0)
-{
-lean_object* x_46; 
-lean_dec(x_42);
-lean_dec(x_38);
-x_46 = l_Lean_Expr_forallE___override(x_36, x_40, x_41, x_39);
-return x_46;
-}
-else
-{
-size_t x_47; size_t x_48; uint8_t x_49; 
-x_47 = lean_ptr_addr(x_38);
-lean_dec(x_38);
-x_48 = lean_ptr_addr(x_41);
-x_49 = lean_usize_dec_eq(x_47, x_48);
-if (x_49 == 0)
-{
-lean_object* x_50; 
-lean_dec(x_42);
-x_50 = l_Lean_Expr_forallE___override(x_36, x_40, x_41, x_39);
-return x_50;
-}
-else
-{
-uint8_t x_51; 
-x_51 = l___private_Lean_Expr_0__Lean_beqBinderInfo____x40_Lean_Expr___hyg_375_(x_39, x_39);
-if (x_51 == 0)
-{
-lean_object* x_52; 
-lean_dec(x_42);
-x_52 = l_Lean_Expr_forallE___override(x_36, x_40, x_41, x_39);
-return x_52;
-}
-else
-{
-lean_dec(x_41);
+x_43 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_40);
+lean_inc(x_41);
+x_44 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_41);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_inc(x_39);
+x_45 = l_Lean_Expr_forallE___override(x_39, x_40, x_41, x_42);
+x_46 = lean_ptr_addr(x_40);
 lean_dec(x_40);
-lean_dec(x_36);
-return x_42;
+x_47 = lean_ptr_addr(x_43);
+x_48 = lean_usize_dec_eq(x_46, x_47);
+if (x_48 == 0)
+{
+lean_object* x_49; 
+lean_dec(x_45);
+lean_dec(x_41);
+x_49 = l_Lean_Expr_forallE___override(x_39, x_43, x_44, x_42);
+return x_49;
+}
+else
+{
+size_t x_50; size_t x_51; uint8_t x_52; 
+x_50 = lean_ptr_addr(x_41);
+lean_dec(x_41);
+x_51 = lean_ptr_addr(x_44);
+x_52 = lean_usize_dec_eq(x_50, x_51);
+if (x_52 == 0)
+{
+lean_object* x_53; 
+lean_dec(x_45);
+x_53 = l_Lean_Expr_forallE___override(x_39, x_43, x_44, x_42);
+return x_53;
+}
+else
+{
+uint8_t x_54; 
+x_54 = l___private_Lean_Expr_0__Lean_beqBinderInfo____x40_Lean_Expr___hyg_375_(x_42, x_42);
+if (x_54 == 0)
+{
+lean_object* x_55; 
+lean_dec(x_45);
+x_55 = l_Lean_Expr_forallE___override(x_39, x_43, x_44, x_42);
+return x_55;
+}
+else
+{
+lean_dec(x_44);
+lean_dec(x_43);
+lean_dec(x_39);
+return x_45;
 }
 }
 }
 }
 case 8:
 {
-lean_object* x_53; lean_object* x_54; 
-lean_dec(x_2);
+lean_object* x_56; lean_object* x_57; 
+lean_dec(x_3);
 lean_dec(x_1);
-x_53 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__4;
-x_54 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_53);
-return x_54;
+x_56 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__4;
+x_57 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_56);
+return x_57;
 }
 case 10:
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; size_t x_58; size_t x_59; uint8_t x_60; 
-x_55 = lean_ctor_get(x_2, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_2, 1);
-lean_inc(x_56);
-lean_inc(x_56);
-x_57 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_56);
-x_58 = lean_ptr_addr(x_56);
-lean_dec(x_56);
-x_59 = lean_ptr_addr(x_57);
-x_60 = lean_usize_dec_eq(x_58, x_59);
-if (x_60 == 0)
+lean_object* x_58; lean_object* x_59; lean_object* x_60; size_t x_61; size_t x_62; uint8_t x_63; 
+x_58 = lean_ctor_get(x_3, 0);
+lean_inc(x_58);
+x_59 = lean_ctor_get(x_3, 1);
+lean_inc(x_59);
+lean_inc(x_59);
+x_60 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_59);
+x_61 = lean_ptr_addr(x_59);
+lean_dec(x_59);
+x_62 = lean_ptr_addr(x_60);
+x_63 = lean_usize_dec_eq(x_61, x_62);
+if (x_63 == 0)
 {
-lean_object* x_61; 
-lean_dec(x_2);
-x_61 = l_Lean_Expr_mdata___override(x_55, x_57);
-return x_61;
+lean_object* x_64; 
+lean_dec(x_3);
+x_64 = l_Lean_Expr_mdata___override(x_58, x_60);
+return x_64;
 }
 else
 {
-lean_dec(x_57);
-lean_dec(x_55);
-return x_2;
+lean_dec(x_60);
+lean_dec(x_58);
+return x_3;
 }
 }
 case 11:
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; size_t x_66; size_t x_67; uint8_t x_68; 
-x_62 = lean_ctor_get(x_2, 0);
-lean_inc(x_62);
-x_63 = lean_ctor_get(x_2, 1);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_2, 2);
-lean_inc(x_64);
-lean_inc(x_64);
-x_65 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_64);
-x_66 = lean_ptr_addr(x_64);
-lean_dec(x_64);
-x_67 = lean_ptr_addr(x_65);
-x_68 = lean_usize_dec_eq(x_66, x_67);
-if (x_68 == 0)
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; size_t x_69; size_t x_70; uint8_t x_71; 
+x_65 = lean_ctor_get(x_3, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_3, 1);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_3, 2);
+lean_inc(x_67);
+lean_inc(x_67);
+x_68 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2, x_67);
+x_69 = lean_ptr_addr(x_67);
+lean_dec(x_67);
+x_70 = lean_ptr_addr(x_68);
+x_71 = lean_usize_dec_eq(x_69, x_70);
+if (x_71 == 0)
 {
-lean_object* x_69; 
-lean_dec(x_2);
-x_69 = l_Lean_Expr_proj___override(x_62, x_63, x_65);
-return x_69;
+lean_object* x_72; 
+lean_dec(x_3);
+x_72 = l_Lean_Expr_proj___override(x_65, x_66, x_68);
+return x_72;
 }
 else
 {
+lean_dec(x_68);
+lean_dec(x_66);
 lean_dec(x_65);
-lean_dec(x_63);
-lean_dec(x_62);
-return x_2;
+return x_3;
 }
 }
 default: 
 {
 lean_dec(x_1);
-return x_2;
+return x_3;
 }
 }
 }
@@ -2943,19 +3013,39 @@ lean_dec(x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_3; 
-x_3 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_2);
-return x_3;
+uint8_t x_4; lean_object* x_5; 
+x_4 = lean_unbox(x_2);
+lean_dec(x_2);
+x_5 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_4, x_3);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp(lean_object* x_1, lean_object* x_2, uint8_t x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_1, x_3, x_2);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; lean_object* x_5; 
+x_4 = lean_unbox(x_3);
+lean_dec(x_3);
+x_5 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp(x_1, x_2, x_4);
+return x_5;
 }
 }
 static lean_object* _init_l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("_private.Lean.Compiler.LCNF.CompilerM.0.Lean.Compiler.LCNF.normFVarImp", 70);
+x_1 = lean_mk_string_from_bytes("invalid LCNF substitution of free variable with expression ", 59);
 return x_1;
 }
 }
@@ -2963,61 +3053,81 @@ static lean_object* _init_l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compi
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("invalid LCNF substitution of free variable with expression", 58);
+x_1 = lean_mk_string_from_bytes("_private.Lean.Compiler.LCNF.CompilerM.0.Lean.Compiler.LCNF.normFVarImp", 70);
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3() {
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object* x_1, lean_object* x_2, uint8_t x_3) {
 _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_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__1;
-x_2 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__1;
-x_3 = lean_unsigned_to_nat(130u);
-x_4 = lean_unsigned_to_nat(14u);
-x_5 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2;
-x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
-return x_6;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; 
+lean_object* x_4; 
 lean_inc(x_2);
 lean_inc(x_1);
-x_3 = l_Std_HashMapImp_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__1(x_1, x_2);
-if (lean_obj_tag(x_3) == 0)
+x_4 = l_Std_HashMapImp_find_x3f___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___spec__1(x_1, x_2);
+if (lean_obj_tag(x_4) == 0)
 {
 lean_dec(x_1);
 return x_2;
 }
 else
 {
-lean_object* x_4; 
-lean_dec(x_2);
-x_4 = lean_ctor_get(x_3, 0);
-lean_inc(x_4);
-lean_dec(x_3);
-if (lean_obj_tag(x_4) == 1)
-{
 lean_object* x_5; 
+lean_dec(x_2);
 x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
 lean_dec(x_4);
-x_2 = x_5;
+if (lean_obj_tag(x_5) == 1)
+{
+if (x_3 == 0)
+{
+lean_object* x_6; 
+x_6 = lean_ctor_get(x_5, 0);
+lean_inc(x_6);
+lean_dec(x_5);
+x_2 = x_6;
 goto _start;
 }
 else
 {
-lean_object* x_7; lean_object* x_8; 
-lean_dec(x_4);
+lean_object* x_8; 
 lean_dec(x_1);
-x_7 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3;
-x_8 = l_panic___at_Lean_Expr_fvarId_x21___spec__1(x_7);
+x_8 = lean_ctor_get(x_5, 0);
+lean_inc(x_8);
+lean_dec(x_5);
 return x_8;
 }
 }
+else
+{
+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_object* x_17; lean_object* x_18; lean_object* x_19; 
+lean_dec(x_1);
+x_9 = lean_expr_dbg_to_string(x_5);
+lean_dec(x_5);
+x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__1;
+x_11 = lean_string_append(x_10, x_9);
+lean_dec(x_9);
+x_12 = l_Lean_Compiler_LCNF_getType___closed__3;
+x_13 = lean_string_append(x_11, x_12);
+x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go___closed__1;
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2;
+x_16 = lean_unsigned_to_nat(160u);
+x_17 = lean_unsigned_to_nat(14u);
+x_18 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_14, x_15, x_16, x_17, x_13);
+lean_dec(x_13);
+x_19 = l_panic___at_Lean_Expr_fvarId_x21___spec__1(x_18);
+return x_19;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; lean_object* x_5; 
+x_4 = lean_unbox(x_3);
+lean_dec(x_3);
+x_5 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_1, x_2, x_4);
+return x_5;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst___rarg(lean_object* x_1, lean_object* x_2) {
@@ -3028,86 +3138,543 @@ x_3 = lean_apply_2(x_1, lean_box(0), x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst(uint8_t x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_instMonadFVarSubst___rarg), 2, 0);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubst___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; lean_object* x_5; 
+x_4 = lean_unbox(x_1);
+lean_dec(x_1);
+x_5 = l_Lean_Compiler_LCNF_instMonadFVarSubst(x_4, x_2, x_3);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstState___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_apply_1(x_2, x_3);
+x_5 = lean_apply_2(x_1, lean_box(0), x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstState(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_instMonadFVarSubst___rarg), 2, 0);
+x_3 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_instMonadFVarSubstState___rarg), 3, 0);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT uint8_t l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-lean_dec(x_1);
-x_5 = lean_ctor_get(x_4, 1);
-lean_inc(x_5);
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_name_eq(x_4, x_1);
+if (x_6 == 0)
+{
+x_2 = x_5;
+goto _start;
+}
+else
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_addFVarSubst___spec__5(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+return x_1;
+}
+else
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_2);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; uint64_t x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_array_get_size(x_1);
+x_7 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_4);
+x_8 = lean_uint64_to_usize(x_7);
+x_9 = lean_usize_modn(x_8, x_6);
+lean_dec(x_6);
+x_10 = lean_array_uget(x_1, x_9);
+lean_ctor_set(x_2, 2, x_10);
+x_11 = lean_array_uset(x_1, x_9, x_2);
+x_1 = x_11;
+x_2 = x_5;
+goto _start;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint64_t x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_13 = lean_ctor_get(x_2, 0);
+x_14 = lean_ctor_get(x_2, 1);
+x_15 = lean_ctor_get(x_2, 2);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_2);
+x_16 = lean_array_get_size(x_1);
+x_17 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_13);
+x_18 = lean_uint64_to_usize(x_17);
+x_19 = lean_usize_modn(x_18, x_16);
+lean_dec(x_16);
+x_20 = lean_array_uget(x_1, x_19);
+x_21 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_21, 0, x_13);
+lean_ctor_set(x_21, 1, x_14);
+lean_ctor_set(x_21, 2, x_20);
+x_22 = lean_array_uset(x_1, x_19, x_21);
+x_1 = x_22;
+x_2 = x_15;
+goto _start;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_Compiler_LCNF_addFVarSubst___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = lean_nat_dec_lt(x_1, x_4);
 lean_dec(x_4);
-x_6 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_3, x_2);
-x_7 = lean_apply_2(x_5, lean_box(0), x_6);
-return x_7;
+if (x_5 == 0)
+{
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+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; 
+x_6 = lean_array_fget(x_2, x_1);
+x_7 = lean_box(0);
+x_8 = lean_array_fset(x_2, x_1, x_7);
+x_9 = l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_addFVarSubst___spec__5(x_3, x_6);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_1, x_10);
+lean_dec(x_1);
+x_1 = x_11;
+x_2 = x_8;
+x_3 = x_9;
+goto _start;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+}
+LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at_Lean_Compiler_LCNF_addFVarSubst___spec__3(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_2, 1);
-lean_inc(x_4);
-x_5 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1), 3, 2);
-lean_closure_set(x_5, 0, x_2);
-lean_closure_set(x_5, 1, x_3);
-x_6 = lean_apply_4(x_4, lean_box(0), lean_box(0), x_1, x_5);
-return x_6;
+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_3 = lean_array_get_size(x_2);
+x_4 = lean_unsigned_to_nat(2u);
+x_5 = lean_nat_mul(x_3, x_4);
+lean_dec(x_3);
+x_6 = lean_box(0);
+x_7 = lean_mk_array(x_5, x_6);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = l_Std_HashMapImp_moveEntries___at_Lean_Compiler_LCNF_addFVarSubst___spec__4(x_8, x_2, x_7);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_1);
+lean_ctor_set(x_10, 1, x_9);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_4; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(0);
+return x_4;
+}
+else
+{
+uint8_t x_5; 
+x_5 = !lean_is_exclusive(x_3);
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_6 = lean_ctor_get(x_3, 0);
+x_7 = lean_ctor_get(x_3, 1);
+x_8 = lean_ctor_get(x_3, 2);
+x_9 = lean_name_eq(x_6, x_1);
+if (x_9 == 0)
+{
+lean_object* x_10; 
+x_10 = l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(x_1, x_2, x_8);
+lean_ctor_set(x_3, 2, x_10);
+return x_3;
+}
+else
+{
+lean_dec(x_7);
+lean_dec(x_6);
+lean_ctor_set(x_3, 1, x_2);
+lean_ctor_set(x_3, 0, x_1);
+return x_3;
+}
+}
+else
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_11 = lean_ctor_get(x_3, 0);
+x_12 = lean_ctor_get(x_3, 1);
+x_13 = lean_ctor_get(x_3, 2);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_dec(x_3);
+x_14 = lean_name_eq(x_11, x_1);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(x_1, x_2, x_13);
+x_16 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_16, 0, x_11);
+lean_ctor_set(x_16, 1, x_12);
+lean_ctor_set(x_16, 2, x_15);
+return x_16;
+}
+else
+{
+lean_object* x_17; 
+lean_dec(x_12);
+lean_dec(x_11);
+x_17 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_17, 0, x_1);
+lean_ctor_set(x_17, 1, x_2);
+lean_ctor_set(x_17, 2, x_13);
+return x_17;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint64_t x_8; size_t x_9; size_t x_10; lean_object* x_11; uint8_t x_12; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = lean_array_get_size(x_6);
+x_8 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_2);
+x_9 = lean_uint64_to_usize(x_8);
+x_10 = lean_usize_modn(x_9, x_7);
+x_11 = lean_array_uget(x_6, x_10);
+x_12 = l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2(x_2, x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = lean_nat_add(x_5, x_13);
+lean_dec(x_5);
+x_15 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_15, 0, x_2);
+lean_ctor_set(x_15, 1, x_3);
+lean_ctor_set(x_15, 2, x_11);
+x_16 = lean_array_uset(x_6, x_10, x_15);
+x_17 = l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(x_14);
+x_18 = lean_nat_dec_le(x_17, x_7);
+lean_dec(x_7);
+lean_dec(x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; 
+lean_free_object(x_1);
+x_19 = l_Std_HashMapImp_expand___at_Lean_Compiler_LCNF_addFVarSubst___spec__3(x_14, x_16);
+return x_19;
+}
+else
+{
+lean_ctor_set(x_1, 1, x_16);
+lean_ctor_set(x_1, 0, x_14);
+return x_1;
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; 
+lean_dec(x_7);
+x_20 = l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(x_2, x_3, x_11);
+x_21 = lean_array_uset(x_6, x_10, x_20);
+lean_ctor_set(x_1, 1, x_21);
+return x_1;
+}
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint64_t x_25; size_t x_26; size_t x_27; lean_object* x_28; uint8_t x_29; 
+x_22 = lean_ctor_get(x_1, 0);
+x_23 = lean_ctor_get(x_1, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_1);
+x_24 = lean_array_get_size(x_23);
+x_25 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_2);
+x_26 = lean_uint64_to_usize(x_25);
+x_27 = lean_usize_modn(x_26, x_24);
+x_28 = lean_array_uget(x_23, x_27);
+x_29 = l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2(x_2, x_28);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
+x_30 = lean_unsigned_to_nat(1u);
+x_31 = lean_nat_add(x_22, x_30);
+lean_dec(x_22);
+x_32 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_32, 0, x_2);
+lean_ctor_set(x_32, 1, x_3);
+lean_ctor_set(x_32, 2, x_28);
+x_33 = lean_array_uset(x_23, x_27, x_32);
+x_34 = l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(x_31);
+x_35 = lean_nat_dec_le(x_34, x_24);
+lean_dec(x_24);
+lean_dec(x_34);
+if (x_35 == 0)
+{
+lean_object* x_36; 
+x_36 = l_Std_HashMapImp_expand___at_Lean_Compiler_LCNF_addFVarSubst___spec__3(x_31, x_33);
+return x_36;
+}
+else
+{
+lean_object* x_37; 
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_31);
+lean_ctor_set(x_37, 1, x_33);
+return x_37;
+}
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+lean_dec(x_24);
+x_38 = l_Std_AssocList_replace___at_Lean_Compiler_LCNF_addFVarSubst___spec__6(x_2, x_3, x_28);
+x_39 = lean_array_uset(x_23, x_27, x_38);
+x_40 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_40, 0, x_22);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = l_Lean_Expr_fvar___override(x_1);
+x_5 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_3, x_2, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_addFVarSubst___rarg___lambda__1), 3, 2);
+lean_closure_set(x_4, 0, x_3);
+lean_closure_set(x_4, 1, x_2);
+x_5 = lean_apply_1(x_1, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addFVarSubst(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_addFVarSubst___rarg), 3, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Std_AssocList_contains___at_Lean_Compiler_LCNF_addFVarSubst___spec__2(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_Lean_Compiler_LCNF_addSubst___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_3, x_1, x_2);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addSubst___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_addSubst___rarg___lambda__1), 3, 2);
+lean_closure_set(x_4, 0, x_2);
+lean_closure_set(x_4, 1, x_3);
+x_5 = lean_apply_1(x_1, x_4);
+return x_5;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_addSubst(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_addSubst___rarg), 3, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc(x_5);
+lean_dec(x_1);
+x_6 = lean_ctor_get(x_5, 1);
+lean_inc(x_6);
+lean_dec(x_5);
+x_7 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_4, x_2, x_3);
+x_8 = lean_apply_2(x_6, lean_box(0), x_7);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg(uint8_t 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; lean_object* x_8; 
+x_5 = lean_ctor_get(x_3, 1);
+lean_inc(x_5);
+x_6 = lean_box(x_1);
+x_7 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_7, 0, x_3);
+lean_closure_set(x_7, 1, x_4);
+lean_closure_set(x_7, 2, x_6);
+x_8 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_2, x_7);
+return x_8;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFVar___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFVar___rarg___boxed), 4, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-lean_dec(x_1);
-x_5 = lean_ctor_get(x_4, 1);
-lean_inc(x_5);
-lean_dec(x_4);
-x_6 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_2);
-x_7 = lean_apply_2(x_5, lean_box(0), x_6);
-return x_7;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_2, 1);
-lean_inc(x_4);
-x_5 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1), 3, 2);
-lean_closure_set(x_5, 0, x_2);
-lean_closure_set(x_5, 1, x_3);
-x_6 = lean_apply_4(x_4, lean_box(0), lean_box(0), x_1, x_5);
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_3);
+lean_dec(x_3);
+x_6 = l_Lean_Compiler_LCNF_normFVar___rarg___lambda__1(x_1, x_2, x_5, x_4);
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFVar___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Compiler_LCNF_normFVar___rarg(x_5, x_2, x_3, x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc(x_5);
+lean_dec(x_1);
+x_6 = lean_ctor_get(x_5, 1);
+lean_inc(x_6);
+lean_dec(x_5);
+x_7 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_4, x_2, x_3);
+x_8 = lean_apply_2(x_6, lean_box(0), x_7);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg(uint8_t 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; lean_object* x_8; 
+x_5 = lean_ctor_get(x_3, 1);
+lean_inc(x_5);
+x_6 = lean_box(x_1);
+x_7 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_7, 0, x_3);
+lean_closure_set(x_7, 1, x_6);
+lean_closure_set(x_7, 2, x_4);
+x_8 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_2, x_7);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___boxed), 4, 0);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_2);
+lean_dec(x_2);
+x_6 = l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1(x_1, x_5, x_3, x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Compiler_LCNF_normExpr___rarg(x_5, x_2, x_3, x_4);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normExprs___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -3126,27 +3693,39 @@ x_2 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__mapMono
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-lean_inc(x_2);
-x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg), 3, 2);
-lean_closure_set(x_4, 0, x_1);
-lean_closure_set(x_4, 1, x_2);
-x_5 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normExprs___spec__1(lean_box(0));
-x_6 = lean_apply_3(x_5, x_2, x_3, x_4);
-return x_6;
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+x_5 = lean_box(x_1);
+lean_inc(x_3);
+x_6 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___boxed), 4, 3);
+lean_closure_set(x_6, 0, x_5);
+lean_closure_set(x_6, 1, x_2);
+lean_closure_set(x_6, 2, x_3);
+x_7 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normExprs___spec__1(lean_box(0));
+x_8 = lean_apply_3(x_7, x_3, x_4, x_6);
+return x_8;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExprs___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExprs___rarg___boxed), 4, 0);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Compiler_LCNF_normExprs___rarg(x_5, x_2, x_3, x_4);
+return x_6;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_mkFreshBinderName(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -3324,7 +3903,7 @@ lean_dec(x_2);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1(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_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1(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; 
@@ -3349,27 +3928,27 @@ return x_10;
 }
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1___boxed), 5, 0);
+x_1 = lean_alloc_closure((void*)(l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1___boxed), 5, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM() {
+static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1;
+x_1 = l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1;
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1___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_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1___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_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___spec__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_StateRefT_x27_get___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___spec__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
@@ -3377,6 +3956,70 @@ lean_dec(x_1);
 return x_6;
 }
 }
+LEAN_EXPORT lean_object* l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_7 = lean_st_ref_take(x_2, x_6);
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_apply_1(x_1, x_8);
+x_11 = lean_st_ref_set(x_2, x_10, x_9);
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_11, 0);
+lean_dec(x_13);
+x_14 = lean_box(0);
+lean_ctor_set(x_11, 0, x_14);
+return x_11;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_11, 1);
+lean_inc(x_15);
+lean_dec(x_11);
+x_16 = lean_box(0);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_15);
+return x_17;
+}
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1___boxed), 6, 0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1;
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_modify___at_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_mkFreshId___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -3598,326 +4241,6 @@ return x_10;
 }
 }
 }
-LEAN_EXPORT uint8_t l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-uint8_t x_3; 
-x_3 = 0;
-return x_3;
-}
-else
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_name_eq(x_4, x_1);
-if (x_6 == 0)
-{
-x_2 = x_5;
-goto _start;
-}
-else
-{
-uint8_t x_8; 
-x_8 = 1;
-return x_8;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__7(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; uint64_t x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_array_get_size(x_1);
-x_7 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_4);
-x_8 = lean_uint64_to_usize(x_7);
-x_9 = lean_usize_modn(x_8, x_6);
-lean_dec(x_6);
-x_10 = lean_array_uget(x_1, x_9);
-lean_ctor_set(x_2, 2, x_10);
-x_11 = lean_array_uset(x_1, x_9, x_2);
-x_1 = x_11;
-x_2 = x_5;
-goto _start;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint64_t x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_13 = lean_ctor_get(x_2, 0);
-x_14 = lean_ctor_get(x_2, 1);
-x_15 = lean_ctor_get(x_2, 2);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_dec(x_2);
-x_16 = lean_array_get_size(x_1);
-x_17 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_13);
-x_18 = lean_uint64_to_usize(x_17);
-x_19 = lean_usize_modn(x_18, x_16);
-lean_dec(x_16);
-x_20 = lean_array_uget(x_1, x_19);
-x_21 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_14);
-lean_ctor_set(x_21, 2, x_20);
-x_22 = lean_array_uset(x_1, x_19, x_21);
-x_1 = x_22;
-x_2 = x_15;
-goto _start;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = lean_array_get_size(x_2);
-x_5 = lean_nat_dec_lt(x_1, x_4);
-lean_dec(x_4);
-if (x_5 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-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; 
-x_6 = lean_array_fget(x_2, x_1);
-x_7 = lean_box(0);
-x_8 = lean_array_fset(x_2, x_1, x_7);
-x_9 = l_Std_AssocList_foldlM___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__7(x_3, x_6);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_1, x_10);
-lean_dec(x_1);
-x_1 = x_11;
-x_2 = x_8;
-x_3 = x_9;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__5(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; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_3 = lean_array_get_size(x_2);
-x_4 = lean_unsigned_to_nat(2u);
-x_5 = lean_nat_mul(x_3, x_4);
-lean_dec(x_3);
-x_6 = lean_box(0);
-x_7 = lean_mk_array(x_5, x_6);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_Std_HashMapImp_moveEntries___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__6(x_8, x_2, x_7);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
-}
-}
-LEAN_EXPORT lean_object* l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_3) == 0)
-{
-lean_object* x_4; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_4 = lean_box(0);
-return x_4;
-}
-else
-{
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_3);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
-x_6 = lean_ctor_get(x_3, 0);
-x_7 = lean_ctor_get(x_3, 1);
-x_8 = lean_ctor_get(x_3, 2);
-x_9 = lean_name_eq(x_6, x_1);
-if (x_9 == 0)
-{
-lean_object* x_10; 
-x_10 = l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(x_1, x_2, x_8);
-lean_ctor_set(x_3, 2, x_10);
-return x_3;
-}
-else
-{
-lean_dec(x_7);
-lean_dec(x_6);
-lean_ctor_set(x_3, 1, x_2);
-lean_ctor_set(x_3, 0, x_1);
-return x_3;
-}
-}
-else
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_11 = lean_ctor_get(x_3, 0);
-x_12 = lean_ctor_get(x_3, 1);
-x_13 = lean_ctor_get(x_3, 2);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_dec(x_3);
-x_14 = lean_name_eq(x_11, x_1);
-if (x_14 == 0)
-{
-lean_object* x_15; lean_object* x_16; 
-x_15 = l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(x_1, x_2, x_13);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_11);
-lean_ctor_set(x_16, 1, x_12);
-lean_ctor_set(x_16, 2, x_15);
-return x_16;
-}
-else
-{
-lean_object* x_17; 
-lean_dec(x_12);
-lean_dec(x_11);
-x_17 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_17, 0, x_1);
-lean_ctor_set(x_17, 1, x_2);
-lean_ctor_set(x_17, 2, x_13);
-return x_17;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint64_t x_8; size_t x_9; size_t x_10; lean_object* x_11; uint8_t x_12; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_array_get_size(x_6);
-x_8 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_2);
-x_9 = lean_uint64_to_usize(x_8);
-x_10 = lean_usize_modn(x_9, x_7);
-x_11 = lean_array_uget(x_6, x_10);
-x_12 = l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4(x_2, x_11);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
-x_13 = lean_unsigned_to_nat(1u);
-x_14 = lean_nat_add(x_5, x_13);
-lean_dec(x_5);
-x_15 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_15, 0, x_2);
-lean_ctor_set(x_15, 1, x_3);
-lean_ctor_set(x_15, 2, x_11);
-x_16 = lean_array_uset(x_6, x_10, x_15);
-x_17 = l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(x_14);
-x_18 = lean_nat_dec_le(x_17, x_7);
-lean_dec(x_7);
-lean_dec(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; 
-lean_free_object(x_1);
-x_19 = l_Std_HashMapImp_expand___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__5(x_14, x_16);
-return x_19;
-}
-else
-{
-lean_ctor_set(x_1, 1, x_16);
-lean_ctor_set(x_1, 0, x_14);
-return x_1;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; 
-lean_dec(x_7);
-x_20 = l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(x_2, x_3, x_11);
-x_21 = lean_array_uset(x_6, x_10, x_20);
-lean_ctor_set(x_1, 1, x_21);
-return x_1;
-}
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; uint64_t x_25; size_t x_26; size_t x_27; lean_object* x_28; uint8_t x_29; 
-x_22 = lean_ctor_get(x_1, 0);
-x_23 = lean_ctor_get(x_1, 1);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_1);
-x_24 = lean_array_get_size(x_23);
-x_25 = l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(x_2);
-x_26 = lean_uint64_to_usize(x_25);
-x_27 = lean_usize_modn(x_26, x_24);
-x_28 = lean_array_uget(x_23, x_27);
-x_29 = l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4(x_2, x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_30 = lean_unsigned_to_nat(1u);
-x_31 = lean_nat_add(x_22, x_30);
-lean_dec(x_22);
-x_32 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_32, 0, x_2);
-lean_ctor_set(x_32, 1, x_3);
-lean_ctor_set(x_32, 2, x_28);
-x_33 = lean_array_uset(x_23, x_27, x_32);
-x_34 = l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(x_31);
-x_35 = lean_nat_dec_le(x_34, x_24);
-lean_dec(x_24);
-lean_dec(x_34);
-if (x_35 == 0)
-{
-lean_object* x_36; 
-x_36 = l_Std_HashMapImp_expand___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__5(x_31, x_33);
-return x_36;
-}
-else
-{
-lean_object* x_37; 
-x_37 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_37, 0, x_31);
-lean_ctor_set(x_37, 1, x_33);
-return x_37;
-}
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-lean_dec(x_24);
-x_38 = l_Std_AssocList_replace___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__8(x_2, x_3, x_28);
-x_39 = lean_array_uset(x_23, x_27, x_38);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_22);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
-}
-}
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(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:
 {
@@ -3936,7 +4259,7 @@ lean_inc(x_12);
 lean_dec(x_10);
 lean_inc(x_8);
 x_13 = l_Lean_Expr_fvar___override(x_8);
-x_14 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_11, x_1, x_13);
+x_14 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_11, x_1, x_13);
 x_15 = lean_st_ref_set(x_2, x_14, x_12);
 x_16 = !lean_is_exclusive(x_15);
 if (x_16 == 0)
@@ -3992,17 +4315,6 @@ lean_dec(x_1);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__4(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___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___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:
 {
@@ -4022,7 +4334,7 @@ uint8_t x_7;
 x_7 = !lean_is_exclusive(x_1);
 if (x_7 == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_8 = lean_ctor_get(x_1, 0);
 x_9 = lean_ctor_get(x_1, 2);
 x_10 = lean_st_ref_get(x_2, x_6);
@@ -4031,160 +4343,162 @@ lean_inc(x_11);
 x_12 = lean_ctor_get(x_10, 1);
 lean_inc(x_12);
 lean_dec(x_10);
-x_13 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_11, x_9);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_8, x_2, x_3, x_4, x_5, x_12);
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
+x_13 = 1;
+x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_11, x_13, x_9);
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_8, x_2, x_3, x_4, x_5, x_12);
+x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
-lean_dec(x_14);
-lean_ctor_set(x_1, 2, x_13);
-lean_ctor_set(x_1, 0, x_15);
-x_17 = lean_st_ref_take(x_3, x_16);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+lean_ctor_set(x_1, 2, x_14);
+lean_ctor_set(x_1, 0, x_16);
+x_18 = lean_st_ref_take(x_3, x_17);
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = !lean_is_exclusive(x_18);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_21 = lean_ctor_get(x_18, 0);
-lean_inc(x_1);
-x_22 = l_Lean_Compiler_LCNF_LCtx_addParam(x_21, x_1);
-lean_ctor_set(x_18, 0, x_22);
-x_23 = lean_st_ref_set(x_3, x_18, x_19);
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
-{
-lean_object* x_25; 
-x_25 = lean_ctor_get(x_23, 0);
-lean_dec(x_25);
-lean_ctor_set(x_23, 0, x_1);
-return x_23;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; 
-x_26 = lean_ctor_get(x_23, 1);
-lean_inc(x_26);
-lean_dec(x_23);
-x_27 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_27, 0, x_1);
-lean_ctor_set(x_27, 1, x_26);
-return x_27;
-}
-}
-else
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_28 = lean_ctor_get(x_18, 0);
-x_29 = lean_ctor_get(x_18, 1);
-lean_inc(x_29);
-lean_inc(x_28);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
 lean_dec(x_18);
+x_21 = !lean_is_exclusive(x_19);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_22 = lean_ctor_get(x_19, 0);
 lean_inc(x_1);
-x_30 = l_Lean_Compiler_LCNF_LCtx_addParam(x_28, x_1);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_29);
-x_32 = lean_st_ref_set(x_3, x_31, x_19);
-x_33 = lean_ctor_get(x_32, 1);
-lean_inc(x_33);
-if (lean_is_exclusive(x_32)) {
- lean_ctor_release(x_32, 0);
- lean_ctor_release(x_32, 1);
- x_34 = x_32;
-} else {
- lean_dec_ref(x_32);
- x_34 = lean_box(0);
+x_23 = l_Lean_Compiler_LCNF_LCtx_addParam(x_22, x_1);
+lean_ctor_set(x_19, 0, x_23);
+x_24 = lean_st_ref_set(x_3, x_19, x_20);
+x_25 = !lean_is_exclusive(x_24);
+if (x_25 == 0)
+{
+lean_object* x_26; 
+x_26 = lean_ctor_get(x_24, 0);
+lean_dec(x_26);
+lean_ctor_set(x_24, 0, x_1);
+return x_24;
 }
-if (lean_is_scalar(x_34)) {
- x_35 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_35 = x_34;
-}
-lean_ctor_set(x_35, 0, x_1);
-lean_ctor_set(x_35, 1, x_33);
-return x_35;
+else
+{
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_24, 1);
+lean_inc(x_27);
+lean_dec(x_24);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_1);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
 }
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t 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; 
-x_36 = lean_ctor_get(x_1, 0);
-x_37 = lean_ctor_get(x_1, 1);
-x_38 = lean_ctor_get(x_1, 2);
-x_39 = lean_ctor_get_uint8(x_1, sizeof(void*)*3);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_29 = lean_ctor_get(x_19, 0);
+x_30 = lean_ctor_get(x_19, 1);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_dec(x_19);
+lean_inc(x_1);
+x_31 = l_Lean_Compiler_LCNF_LCtx_addParam(x_29, x_1);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+x_33 = lean_st_ref_set(x_3, x_32, x_20);
+x_34 = lean_ctor_get(x_33, 1);
+lean_inc(x_34);
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_35 = x_33;
+} else {
+ lean_dec_ref(x_33);
+ x_35 = lean_box(0);
+}
+if (lean_is_scalar(x_35)) {
+ x_36 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_36 = x_35;
+}
+lean_ctor_set(x_36, 0, x_1);
+lean_ctor_set(x_36, 1, x_34);
+return x_36;
+}
+}
+else
+{
+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; uint8_t 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; 
+x_37 = lean_ctor_get(x_1, 0);
+x_38 = lean_ctor_get(x_1, 1);
+x_39 = lean_ctor_get(x_1, 2);
+x_40 = lean_ctor_get_uint8(x_1, sizeof(void*)*3);
+lean_inc(x_39);
 lean_inc(x_38);
 lean_inc(x_37);
-lean_inc(x_36);
 lean_dec(x_1);
-x_40 = lean_st_ref_get(x_2, x_6);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+x_41 = lean_st_ref_get(x_2, x_6);
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_41, x_38);
-x_44 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_36, x_2, x_3, x_4, x_5, x_42);
-x_45 = lean_ctor_get(x_44, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_44, 1);
-lean_inc(x_46);
-lean_dec(x_44);
-x_47 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_37);
-lean_ctor_set(x_47, 2, x_43);
-lean_ctor_set_uint8(x_47, sizeof(void*)*3, x_39);
-x_48 = lean_st_ref_take(x_3, x_46);
-x_49 = lean_ctor_get(x_48, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_48, 1);
-lean_inc(x_50);
-lean_dec(x_48);
-x_51 = lean_ctor_get(x_49, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_49, 1);
-lean_inc(x_52);
-if (lean_is_exclusive(x_49)) {
- lean_ctor_release(x_49, 0);
- lean_ctor_release(x_49, 1);
- x_53 = x_49;
-} else {
- lean_dec_ref(x_49);
- x_53 = lean_box(0);
-}
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = 1;
+x_45 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_42, x_44, x_39);
+x_46 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_37, x_2, x_3, x_4, x_5, x_43);
+x_47 = lean_ctor_get(x_46, 0);
 lean_inc(x_47);
-x_54 = l_Lean_Compiler_LCNF_LCtx_addParam(x_51, x_47);
-if (lean_is_scalar(x_53)) {
- x_55 = lean_alloc_ctor(0, 2, 0);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec(x_46);
+x_49 = lean_alloc_ctor(0, 3, 1);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_38);
+lean_ctor_set(x_49, 2, x_45);
+lean_ctor_set_uint8(x_49, sizeof(void*)*3, x_40);
+x_50 = lean_st_ref_take(x_3, x_48);
+x_51 = lean_ctor_get(x_50, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+lean_dec(x_50);
+x_53 = lean_ctor_get(x_51, 0);
+lean_inc(x_53);
+x_54 = lean_ctor_get(x_51, 1);
+lean_inc(x_54);
+if (lean_is_exclusive(x_51)) {
+ lean_ctor_release(x_51, 0);
+ lean_ctor_release(x_51, 1);
+ x_55 = x_51;
 } else {
- x_55 = x_53;
+ lean_dec_ref(x_51);
+ x_55 = lean_box(0);
 }
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_52);
-x_56 = lean_st_ref_set(x_3, x_55, x_50);
-x_57 = lean_ctor_get(x_56, 1);
-lean_inc(x_57);
-if (lean_is_exclusive(x_56)) {
- lean_ctor_release(x_56, 0);
- lean_ctor_release(x_56, 1);
- x_58 = x_56;
+lean_inc(x_49);
+x_56 = l_Lean_Compiler_LCNF_LCtx_addParam(x_53, x_49);
+if (lean_is_scalar(x_55)) {
+ x_57 = lean_alloc_ctor(0, 2, 0);
 } else {
- lean_dec_ref(x_56);
- x_58 = lean_box(0);
+ x_57 = x_55;
 }
-if (lean_is_scalar(x_58)) {
- x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_54);
+x_58 = lean_st_ref_set(x_3, x_57, x_52);
+x_59 = lean_ctor_get(x_58, 1);
+lean_inc(x_59);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ lean_ctor_release(x_58, 1);
+ x_60 = x_58;
 } else {
- x_59 = x_58;
+ lean_dec_ref(x_58);
+ x_60 = lean_box(0);
 }
-lean_ctor_set(x_59, 0, x_47);
-lean_ctor_set(x_59, 1, x_57);
-return x_59;
+if (lean_is_scalar(x_60)) {
+ x_61 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_61 = x_60;
+}
+lean_ctor_set(x_61, 0, x_49);
+lean_ctor_set(x_61, 1, x_59);
+return x_61;
 }
 }
 }
@@ -4203,7 +4517,7 @@ return x_7;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeLetDecl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+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; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
 x_7 = lean_ctor_get(x_1, 1);
 lean_inc(x_7);
 x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_refreshBinderName(x_7, x_3, x_4, x_5, x_6);
@@ -4220,98 +4534,99 @@ lean_inc(x_13);
 x_14 = lean_ctor_get(x_12, 1);
 lean_inc(x_14);
 lean_dec(x_12);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_11);
-x_16 = lean_ctor_get(x_1, 3);
-lean_inc(x_16);
-x_17 = lean_st_ref_get(x_2, x_14);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+x_15 = 1;
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_15, x_11);
+x_17 = lean_ctor_get(x_1, 3);
+lean_inc(x_17);
+x_18 = lean_st_ref_get(x_2, x_14);
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_18, x_16);
-x_21 = lean_ctor_get(x_1, 0);
-lean_inc(x_21);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_19, x_15, x_17);
+x_22 = lean_ctor_get(x_1, 0);
+lean_inc(x_22);
 lean_dec(x_1);
-x_22 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_21, x_2, x_3, x_4, x_5, x_19);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_22, 1);
+x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_22, x_2, x_3, x_4, x_5, x_20);
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-x_25 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_25, 0, x_23);
-lean_ctor_set(x_25, 1, x_9);
-lean_ctor_set(x_25, 2, x_15);
-lean_ctor_set(x_25, 3, x_20);
-x_26 = lean_st_ref_take(x_3, x_24);
-x_27 = lean_ctor_get(x_26, 0);
-lean_inc(x_27);
-x_28 = lean_ctor_get(x_26, 1);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_26, 0, x_24);
+lean_ctor_set(x_26, 1, x_9);
+lean_ctor_set(x_26, 2, x_16);
+lean_ctor_set(x_26, 3, x_21);
+x_27 = lean_st_ref_take(x_3, x_25);
+x_28 = lean_ctor_get(x_27, 0);
 lean_inc(x_28);
-lean_dec(x_26);
-x_29 = !lean_is_exclusive(x_27);
-if (x_29 == 0)
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_30 = lean_ctor_get(x_27, 0);
-lean_inc(x_25);
-x_31 = l_Lean_Compiler_LCNF_LCtx_addLetDecl(x_30, x_25);
-lean_ctor_set(x_27, 0, x_31);
-x_32 = lean_st_ref_set(x_3, x_27, x_28);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
-{
-lean_object* x_34; 
-x_34 = lean_ctor_get(x_32, 0);
-lean_dec(x_34);
-lean_ctor_set(x_32, 0, x_25);
-return x_32;
-}
-else
-{
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_ctor_get(x_32, 1);
-lean_inc(x_35);
-lean_dec(x_32);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_25);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_37 = lean_ctor_get(x_27, 0);
-x_38 = lean_ctor_get(x_27, 1);
-lean_inc(x_38);
-lean_inc(x_37);
+x_29 = lean_ctor_get(x_27, 1);
+lean_inc(x_29);
 lean_dec(x_27);
-lean_inc(x_25);
-x_39 = l_Lean_Compiler_LCNF_LCtx_addLetDecl(x_37, x_25);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-x_41 = lean_st_ref_set(x_3, x_40, x_28);
-x_42 = lean_ctor_get(x_41, 1);
-lean_inc(x_42);
-if (lean_is_exclusive(x_41)) {
- lean_ctor_release(x_41, 0);
- lean_ctor_release(x_41, 1);
- x_43 = x_41;
-} else {
- lean_dec_ref(x_41);
- x_43 = lean_box(0);
+x_30 = !lean_is_exclusive(x_28);
+if (x_30 == 0)
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_31 = lean_ctor_get(x_28, 0);
+lean_inc(x_26);
+x_32 = l_Lean_Compiler_LCNF_LCtx_addLetDecl(x_31, x_26);
+lean_ctor_set(x_28, 0, x_32);
+x_33 = lean_st_ref_set(x_3, x_28, x_29);
+x_34 = !lean_is_exclusive(x_33);
+if (x_34 == 0)
+{
+lean_object* x_35; 
+x_35 = lean_ctor_get(x_33, 0);
+lean_dec(x_35);
+lean_ctor_set(x_33, 0, x_26);
+return x_33;
 }
-if (lean_is_scalar(x_43)) {
- x_44 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_44 = x_43;
+else
+{
+lean_object* x_36; lean_object* x_37; 
+x_36 = lean_ctor_get(x_33, 1);
+lean_inc(x_36);
+lean_dec(x_33);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_26);
+lean_ctor_set(x_37, 1, x_36);
+return x_37;
 }
-lean_ctor_set(x_44, 0, x_25);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_38 = lean_ctor_get(x_28, 0);
+x_39 = lean_ctor_get(x_28, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_28);
+lean_inc(x_26);
+x_40 = l_Lean_Compiler_LCNF_LCtx_addLetDecl(x_38, x_26);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_39);
+x_42 = lean_st_ref_set(x_3, x_41, x_29);
+x_43 = lean_ctor_get(x_42, 1);
+lean_inc(x_43);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_44 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_44 = lean_box(0);
+}
+if (lean_is_scalar(x_44)) {
+ x_45 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_45 = x_44;
+}
+lean_ctor_set(x_45, 0, x_26);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
 }
 }
 }
@@ -4365,7 +4680,7 @@ goto _start;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Internalize_internalizeFunDecl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; size_t x_19; size_t x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
 x_8 = lean_st_ref_get(x_2, x_6);
@@ -4374,148 +4689,149 @@ lean_inc(x_9);
 x_10 = lean_ctor_get(x_8, 1);
 lean_inc(x_10);
 lean_dec(x_8);
-x_11 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_9, x_7);
-x_12 = lean_ctor_get(x_1, 1);
-lean_inc(x_12);
-x_13 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_refreshBinderName(x_12, x_3, x_4, x_5, x_10);
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
+x_11 = 1;
+x_12 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_9, x_11, x_7);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
+x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_refreshBinderName(x_13, x_3, x_4, x_5, x_10);
+x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ctor_get(x_1, 2);
+x_16 = lean_ctor_get(x_14, 1);
 lean_inc(x_16);
-x_17 = lean_array_get_size(x_16);
-x_18 = lean_usize_of_nat(x_17);
-lean_dec(x_17);
-x_19 = 0;
-x_20 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_18, x_19, x_16, x_2, x_3, x_4, x_5, x_15);
-x_21 = lean_ctor_get(x_20, 0);
-lean_inc(x_21);
-x_22 = lean_ctor_get(x_20, 1);
+lean_dec(x_14);
+x_17 = lean_ctor_get(x_1, 2);
+lean_inc(x_17);
+x_18 = lean_array_get_size(x_17);
+x_19 = lean_usize_of_nat(x_18);
+lean_dec(x_18);
+x_20 = 0;
+x_21 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_19, x_20, x_17, x_2, x_3, x_4, x_5, x_16);
+x_22 = lean_ctor_get(x_21, 0);
 lean_inc(x_22);
-lean_dec(x_20);
-x_23 = lean_ctor_get(x_1, 4);
+x_23 = lean_ctor_get(x_21, 1);
 lean_inc(x_23);
-x_24 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_23, x_2, x_3, x_4, x_5, x_22);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_24, 1);
+lean_dec(x_21);
+x_24 = lean_ctor_get(x_1, 4);
+lean_inc(x_24);
+x_25 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_24, x_2, x_3, x_4, x_5, x_23);
+x_26 = lean_ctor_get(x_25, 0);
 lean_inc(x_26);
-lean_dec(x_24);
-x_27 = lean_ctor_get(x_1, 0);
+x_27 = lean_ctor_get(x_25, 1);
 lean_inc(x_27);
+lean_dec(x_25);
+x_28 = lean_ctor_get(x_1, 0);
+lean_inc(x_28);
 lean_dec(x_1);
-x_28 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_27, x_2, x_3, x_4, x_5, x_26);
-x_29 = lean_ctor_get(x_28, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_28, 1);
+x_29 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId(x_28, x_2, x_3, x_4, x_5, x_27);
+x_30 = lean_ctor_get(x_29, 0);
 lean_inc(x_30);
-lean_dec(x_28);
-x_31 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_14);
-lean_ctor_set(x_31, 2, x_21);
-lean_ctor_set(x_31, 3, x_11);
-lean_ctor_set(x_31, 4, x_25);
-x_32 = lean_st_ref_take(x_3, x_30);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
+x_31 = lean_ctor_get(x_29, 1);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_15);
+lean_ctor_set(x_32, 2, x_22);
+lean_ctor_set(x_32, 3, x_12);
+lean_ctor_set(x_32, 4, x_26);
+x_33 = lean_st_ref_take(x_3, x_31);
+x_34 = lean_ctor_get(x_33, 0);
 lean_inc(x_34);
-lean_dec(x_32);
-x_35 = !lean_is_exclusive(x_33);
-if (x_35 == 0)
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
-x_36 = lean_ctor_get(x_33, 0);
-lean_inc(x_31);
-x_37 = l_Lean_Compiler_LCNF_LCtx_addFunDecl(x_36, x_31);
-lean_ctor_set(x_33, 0, x_37);
-x_38 = lean_st_ref_set(x_3, x_33, x_34);
-x_39 = !lean_is_exclusive(x_38);
-if (x_39 == 0)
-{
-lean_object* x_40; 
-x_40 = lean_ctor_get(x_38, 0);
-lean_dec(x_40);
-lean_ctor_set(x_38, 0, x_31);
-return x_38;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; 
-x_41 = lean_ctor_get(x_38, 1);
-lean_inc(x_41);
-lean_dec(x_38);
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_31);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
-}
-}
-else
-{
-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; 
-x_43 = lean_ctor_get(x_33, 0);
-x_44 = lean_ctor_get(x_33, 1);
-lean_inc(x_44);
-lean_inc(x_43);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
 lean_dec(x_33);
-lean_inc(x_31);
-x_45 = l_Lean_Compiler_LCNF_LCtx_addFunDecl(x_43, x_31);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_45);
-lean_ctor_set(x_46, 1, x_44);
-x_47 = lean_st_ref_set(x_3, x_46, x_34);
-x_48 = lean_ctor_get(x_47, 1);
-lean_inc(x_48);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
- x_49 = x_47;
+x_36 = !lean_is_exclusive(x_34);
+if (x_36 == 0)
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
+x_37 = lean_ctor_get(x_34, 0);
+lean_inc(x_32);
+x_38 = l_Lean_Compiler_LCNF_LCtx_addFunDecl(x_37, x_32);
+lean_ctor_set(x_34, 0, x_38);
+x_39 = lean_st_ref_set(x_3, x_34, x_35);
+x_40 = !lean_is_exclusive(x_39);
+if (x_40 == 0)
+{
+lean_object* x_41; 
+x_41 = lean_ctor_get(x_39, 0);
+lean_dec(x_41);
+lean_ctor_set(x_39, 0, x_32);
+return x_39;
+}
+else
+{
+lean_object* x_42; lean_object* x_43; 
+x_42 = lean_ctor_get(x_39, 1);
+lean_inc(x_42);
+lean_dec(x_39);
+x_43 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_43, 0, x_32);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
+}
+}
+else
+{
+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; 
+x_44 = lean_ctor_get(x_34, 0);
+x_45 = lean_ctor_get(x_34, 1);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_dec(x_34);
+lean_inc(x_32);
+x_46 = l_Lean_Compiler_LCNF_LCtx_addFunDecl(x_44, x_32);
+x_47 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_47, 0, x_46);
+lean_ctor_set(x_47, 1, x_45);
+x_48 = lean_st_ref_set(x_3, x_47, x_35);
+x_49 = lean_ctor_get(x_48, 1);
+lean_inc(x_49);
+if (lean_is_exclusive(x_48)) {
+ lean_ctor_release(x_48, 0);
+ lean_ctor_release(x_48, 1);
+ x_50 = x_48;
 } else {
- lean_dec_ref(x_47);
- x_49 = lean_box(0);
+ lean_dec_ref(x_48);
+ x_50 = lean_box(0);
 }
-if (lean_is_scalar(x_49)) {
- x_50 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_50)) {
+ x_51 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_50 = x_49;
+ x_51 = x_50;
 }
-lean_ctor_set(x_50, 0, x_31);
-lean_ctor_set(x_50, 1, x_48);
-return x_50;
+lean_ctor_set(x_51, 0, x_32);
+lean_ctor_set(x_51, 1, x_49);
+return x_51;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_st_ref_get(x_2, x_6);
-x_8 = !lean_is_exclusive(x_7);
-if (x_8 == 0)
+lean_object* x_8; uint8_t x_9; 
+x_8 = lean_st_ref_get(x_3, x_7);
+x_9 = !lean_is_exclusive(x_8);
+if (x_9 == 0)
 {
-lean_object* x_9; lean_object* x_10; 
-x_9 = lean_ctor_get(x_7, 0);
-x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_9, x_1);
-lean_ctor_set(x_7, 0, x_10);
-return x_7;
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_8, 0);
+x_11 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_10, x_1, x_2);
+lean_ctor_set(x_8, 0, x_11);
+return x_8;
 }
 else
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_11 = lean_ctor_get(x_7, 0);
-x_12 = lean_ctor_get(x_7, 1);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_ctor_get(x_8, 0);
+x_13 = lean_ctor_get(x_8, 1);
+lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_11);
-lean_dec(x_7);
-x_13 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_11, x_1);
-x_14 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-return x_14;
+lean_dec(x_8);
+x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_12, x_1, x_2);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_13);
+return x_15;
 }
 }
 }
@@ -4534,22 +4850,23 @@ return x_10;
 }
 else
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; size_t x_19; lean_object* x_20; 
 x_11 = lean_array_uget(x_3, x_2);
 x_12 = lean_unsigned_to_nat(0u);
 x_13 = lean_array_uset(x_3, x_2, x_12);
-x_14 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(x_11, x_4, x_5, x_6, x_7, x_8);
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
+x_14 = 1;
+x_15 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(x_14, x_11, x_4, x_5, x_6, x_7, x_8);
+x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
-lean_dec(x_14);
-x_17 = 1;
-x_18 = lean_usize_add(x_2, x_17);
-x_19 = lean_array_uset(x_13, x_2, x_15);
-x_2 = x_18;
-x_3 = x_19;
-x_8 = x_16;
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = 1;
+x_19 = lean_usize_add(x_2, x_18);
+x_20 = lean_array_uset(x_13, x_2, x_16);
+x_2 = x_19;
+x_3 = x_20;
+x_8 = x_17;
 goto _start;
 }
 }
@@ -4952,7 +5269,7 @@ uint8_t x_76;
 x_76 = !lean_is_exclusive(x_1);
 if (x_76 == 0)
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; size_t x_84; size_t x_85; lean_object* x_86; uint8_t x_87; 
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; lean_object* x_83; lean_object* x_84; size_t x_85; size_t x_86; lean_object* x_87; uint8_t x_88; 
 x_77 = lean_ctor_get(x_1, 0);
 x_78 = lean_ctor_get(x_1, 1);
 x_79 = lean_st_ref_get(x_2, x_6);
@@ -4961,412 +5278,423 @@ lean_inc(x_80);
 x_81 = lean_ctor_get(x_79, 1);
 lean_inc(x_81);
 lean_dec(x_79);
-x_82 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_80, x_77);
-x_83 = lean_array_get_size(x_78);
-x_84 = lean_usize_of_nat(x_83);
-lean_dec(x_83);
-x_85 = 0;
-x_86 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2(x_84, x_85, x_78, x_2, x_3, x_4, x_5, x_81);
-x_87 = !lean_is_exclusive(x_86);
-if (x_87 == 0)
+x_82 = 1;
+x_83 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_80, x_77, x_82);
+x_84 = lean_array_get_size(x_78);
+x_85 = lean_usize_of_nat(x_84);
+lean_dec(x_84);
+x_86 = 0;
+x_87 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2(x_85, x_86, x_78, x_2, x_3, x_4, x_5, x_81);
+x_88 = !lean_is_exclusive(x_87);
+if (x_88 == 0)
 {
-lean_object* x_88; 
-x_88 = lean_ctor_get(x_86, 0);
-lean_ctor_set(x_1, 1, x_88);
-lean_ctor_set(x_1, 0, x_82);
-lean_ctor_set(x_86, 0, x_1);
-return x_86;
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_86, 0);
-x_90 = lean_ctor_get(x_86, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_86);
+lean_object* x_89; 
+x_89 = lean_ctor_get(x_87, 0);
 lean_ctor_set(x_1, 1, x_89);
-lean_ctor_set(x_1, 0, x_82);
-x_91 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_91, 0, x_1);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
+lean_ctor_set(x_1, 0, x_83);
+lean_ctor_set(x_87, 0, x_1);
+return x_87;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_87, 0);
+x_91 = lean_ctor_get(x_87, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_87);
+lean_ctor_set(x_1, 1, x_90);
+lean_ctor_set(x_1, 0, x_83);
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_1);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
 }
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; size_t x_99; size_t x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
-x_92 = lean_ctor_get(x_1, 0);
-x_93 = lean_ctor_get(x_1, 1);
+lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; lean_object* x_99; lean_object* x_100; size_t x_101; size_t x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
+x_93 = lean_ctor_get(x_1, 0);
+x_94 = lean_ctor_get(x_1, 1);
+lean_inc(x_94);
 lean_inc(x_93);
-lean_inc(x_92);
 lean_dec(x_1);
-x_94 = lean_st_ref_get(x_2, x_6);
-x_95 = lean_ctor_get(x_94, 0);
-lean_inc(x_95);
-x_96 = lean_ctor_get(x_94, 1);
+x_95 = lean_st_ref_get(x_2, x_6);
+x_96 = lean_ctor_get(x_95, 0);
 lean_inc(x_96);
-lean_dec(x_94);
-x_97 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_95, x_92);
-x_98 = lean_array_get_size(x_93);
-x_99 = lean_usize_of_nat(x_98);
-lean_dec(x_98);
-x_100 = 0;
-x_101 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2(x_99, x_100, x_93, x_2, x_3, x_4, x_5, x_96);
-x_102 = lean_ctor_get(x_101, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_101, 1);
-lean_inc(x_103);
-if (lean_is_exclusive(x_101)) {
- lean_ctor_release(x_101, 0);
- lean_ctor_release(x_101, 1);
- x_104 = x_101;
+x_97 = lean_ctor_get(x_95, 1);
+lean_inc(x_97);
+lean_dec(x_95);
+x_98 = 1;
+x_99 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_96, x_93, x_98);
+x_100 = lean_array_get_size(x_94);
+x_101 = lean_usize_of_nat(x_100);
+lean_dec(x_100);
+x_102 = 0;
+x_103 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2(x_101, x_102, x_94, x_2, x_3, x_4, x_5, x_97);
+x_104 = lean_ctor_get(x_103, 0);
+lean_inc(x_104);
+x_105 = lean_ctor_get(x_103, 1);
+lean_inc(x_105);
+if (lean_is_exclusive(x_103)) {
+ lean_ctor_release(x_103, 0);
+ lean_ctor_release(x_103, 1);
+ x_106 = x_103;
 } else {
- lean_dec_ref(x_101);
- x_104 = lean_box(0);
+ lean_dec_ref(x_103);
+ x_106 = lean_box(0);
 }
-x_105 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_105, 0, x_97);
-lean_ctor_set(x_105, 1, x_102);
-if (lean_is_scalar(x_104)) {
- x_106 = lean_alloc_ctor(0, 2, 0);
+x_107 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_107, 0, x_99);
+lean_ctor_set(x_107, 1, x_104);
+if (lean_is_scalar(x_106)) {
+ x_108 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_106 = x_104;
+ x_108 = x_106;
 }
-lean_ctor_set(x_106, 0, x_105);
-lean_ctor_set(x_106, 1, x_103);
-return x_106;
+lean_ctor_set(x_108, 0, x_107);
+lean_ctor_set(x_108, 1, x_105);
+return x_108;
 }
 }
 case 4:
 {
-uint8_t x_107; 
-x_107 = !lean_is_exclusive(x_1);
-if (x_107 == 0)
-{
-lean_object* x_108; uint8_t x_109; 
-x_108 = lean_ctor_get(x_1, 0);
-x_109 = !lean_is_exclusive(x_108);
+uint8_t x_109; 
+x_109 = !lean_is_exclusive(x_1);
 if (x_109 == 0)
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; size_t x_122; size_t x_123; lean_object* x_124; uint8_t x_125; 
-x_110 = lean_ctor_get(x_108, 1);
-x_111 = lean_ctor_get(x_108, 2);
-x_112 = lean_ctor_get(x_108, 3);
-x_113 = lean_st_ref_get(x_2, x_6);
-x_114 = lean_ctor_get(x_113, 0);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_113, 1);
-lean_inc(x_115);
-lean_dec(x_113);
-x_116 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_114, x_110);
-x_117 = lean_st_ref_get(x_2, x_115);
-x_118 = lean_ctor_get(x_117, 0);
-lean_inc(x_118);
-x_119 = lean_ctor_get(x_117, 1);
-lean_inc(x_119);
-lean_dec(x_117);
-x_120 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_118, x_111);
-x_121 = lean_array_get_size(x_112);
-x_122 = lean_usize_of_nat(x_121);
-lean_dec(x_121);
-x_123 = 0;
-x_124 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_122, x_123, x_112, x_2, x_3, x_4, x_5, x_119);
-x_125 = !lean_is_exclusive(x_124);
-if (x_125 == 0)
+lean_object* x_110; uint8_t x_111; 
+x_110 = lean_ctor_get(x_1, 0);
+x_111 = !lean_is_exclusive(x_110);
+if (x_111 == 0)
 {
-lean_object* x_126; 
-x_126 = lean_ctor_get(x_124, 0);
-lean_ctor_set(x_108, 3, x_126);
-lean_ctor_set(x_108, 2, x_120);
-lean_ctor_set(x_108, 1, x_116);
-lean_ctor_set(x_124, 0, x_1);
-return x_124;
-}
-else
-{
-lean_object* x_127; lean_object* x_128; lean_object* x_129; 
-x_127 = lean_ctor_get(x_124, 0);
-x_128 = lean_ctor_get(x_124, 1);
-lean_inc(x_128);
-lean_inc(x_127);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; size_t x_125; size_t x_126; lean_object* x_127; uint8_t x_128; 
+x_112 = lean_ctor_get(x_110, 1);
+x_113 = lean_ctor_get(x_110, 2);
+x_114 = lean_ctor_get(x_110, 3);
+x_115 = lean_st_ref_get(x_2, x_6);
+x_116 = lean_ctor_get(x_115, 0);
+lean_inc(x_116);
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+lean_dec(x_115);
+x_118 = 1;
+x_119 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_116, x_118, x_112);
+x_120 = lean_st_ref_get(x_2, x_117);
+x_121 = lean_ctor_get(x_120, 0);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_120, 1);
+lean_inc(x_122);
+lean_dec(x_120);
+x_123 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_121, x_113, x_118);
+x_124 = lean_array_get_size(x_114);
+x_125 = lean_usize_of_nat(x_124);
 lean_dec(x_124);
-lean_ctor_set(x_108, 3, x_127);
-lean_ctor_set(x_108, 2, x_120);
-lean_ctor_set(x_108, 1, x_116);
-x_129 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_129, 0, x_1);
-lean_ctor_set(x_129, 1, x_128);
-return x_129;
-}
+x_126 = 0;
+x_127 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_125, x_126, x_114, x_2, x_3, x_4, x_5, x_122);
+x_128 = !lean_is_exclusive(x_127);
+if (x_128 == 0)
+{
+lean_object* x_129; 
+x_129 = lean_ctor_get(x_127, 0);
+lean_ctor_set(x_110, 3, x_129);
+lean_ctor_set(x_110, 2, x_123);
+lean_ctor_set(x_110, 1, x_119);
+lean_ctor_set(x_127, 0, x_1);
+return x_127;
 }
 else
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; size_t x_143; size_t x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
-x_130 = lean_ctor_get(x_108, 0);
-x_131 = lean_ctor_get(x_108, 1);
-x_132 = lean_ctor_get(x_108, 2);
-x_133 = lean_ctor_get(x_108, 3);
-lean_inc(x_133);
-lean_inc(x_132);
+lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+x_130 = lean_ctor_get(x_127, 0);
+x_131 = lean_ctor_get(x_127, 1);
 lean_inc(x_131);
 lean_inc(x_130);
-lean_dec(x_108);
-x_134 = lean_st_ref_get(x_2, x_6);
-x_135 = lean_ctor_get(x_134, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_134, 1);
-lean_inc(x_136);
-lean_dec(x_134);
-x_137 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_135, x_131);
-x_138 = lean_st_ref_get(x_2, x_136);
-x_139 = lean_ctor_get(x_138, 0);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_138, 1);
-lean_inc(x_140);
-lean_dec(x_138);
-x_141 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_139, x_132);
-x_142 = lean_array_get_size(x_133);
-x_143 = lean_usize_of_nat(x_142);
-lean_dec(x_142);
-x_144 = 0;
-x_145 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_143, x_144, x_133, x_2, x_3, x_4, x_5, x_140);
-x_146 = lean_ctor_get(x_145, 0);
-lean_inc(x_146);
-x_147 = lean_ctor_get(x_145, 1);
-lean_inc(x_147);
-if (lean_is_exclusive(x_145)) {
- lean_ctor_release(x_145, 0);
- lean_ctor_release(x_145, 1);
- x_148 = x_145;
-} else {
- lean_dec_ref(x_145);
- x_148 = lean_box(0);
-}
-x_149 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_149, 0, x_130);
-lean_ctor_set(x_149, 1, x_137);
-lean_ctor_set(x_149, 2, x_141);
-lean_ctor_set(x_149, 3, x_146);
-lean_ctor_set(x_1, 0, x_149);
-if (lean_is_scalar(x_148)) {
- x_150 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_150 = x_148;
-}
-lean_ctor_set(x_150, 0, x_1);
-lean_ctor_set(x_150, 1, x_147);
-return x_150;
+lean_dec(x_127);
+lean_ctor_set(x_110, 3, x_130);
+lean_ctor_set(x_110, 2, x_123);
+lean_ctor_set(x_110, 1, x_119);
+x_132 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_132, 0, x_1);
+lean_ctor_set(x_132, 1, x_131);
+return x_132;
 }
 }
 else
 {
-lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; size_t x_166; size_t x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_151 = lean_ctor_get(x_1, 0);
+lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; uint8_t x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; size_t x_147; size_t x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; 
+x_133 = lean_ctor_get(x_110, 0);
+x_134 = lean_ctor_get(x_110, 1);
+x_135 = lean_ctor_get(x_110, 2);
+x_136 = lean_ctor_get(x_110, 3);
+lean_inc(x_136);
+lean_inc(x_135);
+lean_inc(x_134);
+lean_inc(x_133);
+lean_dec(x_110);
+x_137 = lean_st_ref_get(x_2, x_6);
+x_138 = lean_ctor_get(x_137, 0);
+lean_inc(x_138);
+x_139 = lean_ctor_get(x_137, 1);
+lean_inc(x_139);
+lean_dec(x_137);
+x_140 = 1;
+x_141 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_138, x_140, x_134);
+x_142 = lean_st_ref_get(x_2, x_139);
+x_143 = lean_ctor_get(x_142, 0);
+lean_inc(x_143);
+x_144 = lean_ctor_get(x_142, 1);
+lean_inc(x_144);
+lean_dec(x_142);
+x_145 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_143, x_135, x_140);
+x_146 = lean_array_get_size(x_136);
+x_147 = lean_usize_of_nat(x_146);
+lean_dec(x_146);
+x_148 = 0;
+x_149 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_147, x_148, x_136, x_2, x_3, x_4, x_5, x_144);
+x_150 = lean_ctor_get(x_149, 0);
+lean_inc(x_150);
+x_151 = lean_ctor_get(x_149, 1);
 lean_inc(x_151);
-lean_dec(x_1);
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc(x_152);
-x_153 = lean_ctor_get(x_151, 1);
-lean_inc(x_153);
-x_154 = lean_ctor_get(x_151, 2);
-lean_inc(x_154);
-x_155 = lean_ctor_get(x_151, 3);
-lean_inc(x_155);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- lean_ctor_release(x_151, 2);
- lean_ctor_release(x_151, 3);
- x_156 = x_151;
+if (lean_is_exclusive(x_149)) {
+ lean_ctor_release(x_149, 0);
+ lean_ctor_release(x_149, 1);
+ x_152 = x_149;
 } else {
- lean_dec_ref(x_151);
- x_156 = lean_box(0);
+ lean_dec_ref(x_149);
+ x_152 = lean_box(0);
 }
-x_157 = lean_st_ref_get(x_2, x_6);
-x_158 = lean_ctor_get(x_157, 0);
+x_153 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_153, 0, x_133);
+lean_ctor_set(x_153, 1, x_141);
+lean_ctor_set(x_153, 2, x_145);
+lean_ctor_set(x_153, 3, x_150);
+lean_ctor_set(x_1, 0, x_153);
+if (lean_is_scalar(x_152)) {
+ x_154 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_154 = x_152;
+}
+lean_ctor_set(x_154, 0, x_1);
+lean_ctor_set(x_154, 1, x_151);
+return x_154;
+}
+}
+else
+{
+lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; size_t x_171; size_t x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
+x_155 = lean_ctor_get(x_1, 0);
+lean_inc(x_155);
+lean_dec(x_1);
+x_156 = lean_ctor_get(x_155, 0);
+lean_inc(x_156);
+x_157 = lean_ctor_get(x_155, 1);
+lean_inc(x_157);
+x_158 = lean_ctor_get(x_155, 2);
 lean_inc(x_158);
-x_159 = lean_ctor_get(x_157, 1);
+x_159 = lean_ctor_get(x_155, 3);
 lean_inc(x_159);
-lean_dec(x_157);
-x_160 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_158, x_153);
-x_161 = lean_st_ref_get(x_2, x_159);
+if (lean_is_exclusive(x_155)) {
+ lean_ctor_release(x_155, 0);
+ lean_ctor_release(x_155, 1);
+ lean_ctor_release(x_155, 2);
+ lean_ctor_release(x_155, 3);
+ x_160 = x_155;
+} else {
+ lean_dec_ref(x_155);
+ x_160 = lean_box(0);
+}
+x_161 = lean_st_ref_get(x_2, x_6);
 x_162 = lean_ctor_get(x_161, 0);
 lean_inc(x_162);
 x_163 = lean_ctor_get(x_161, 1);
 lean_inc(x_163);
 lean_dec(x_161);
-x_164 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_162, x_154);
-x_165 = lean_array_get_size(x_155);
-x_166 = lean_usize_of_nat(x_165);
-lean_dec(x_165);
-x_167 = 0;
-x_168 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_166, x_167, x_155, x_2, x_3, x_4, x_5, x_163);
-x_169 = lean_ctor_get(x_168, 0);
-lean_inc(x_169);
-x_170 = lean_ctor_get(x_168, 1);
-lean_inc(x_170);
-if (lean_is_exclusive(x_168)) {
- lean_ctor_release(x_168, 0);
- lean_ctor_release(x_168, 1);
- x_171 = x_168;
+x_164 = 1;
+x_165 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_162, x_164, x_157);
+x_166 = lean_st_ref_get(x_2, x_163);
+x_167 = lean_ctor_get(x_166, 0);
+lean_inc(x_167);
+x_168 = lean_ctor_get(x_166, 1);
+lean_inc(x_168);
+lean_dec(x_166);
+x_169 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_167, x_158, x_164);
+x_170 = lean_array_get_size(x_159);
+x_171 = lean_usize_of_nat(x_170);
+lean_dec(x_170);
+x_172 = 0;
+x_173 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__3(x_171, x_172, x_159, x_2, x_3, x_4, x_5, x_168);
+x_174 = lean_ctor_get(x_173, 0);
+lean_inc(x_174);
+x_175 = lean_ctor_get(x_173, 1);
+lean_inc(x_175);
+if (lean_is_exclusive(x_173)) {
+ lean_ctor_release(x_173, 0);
+ lean_ctor_release(x_173, 1);
+ x_176 = x_173;
 } else {
- lean_dec_ref(x_168);
- x_171 = lean_box(0);
+ lean_dec_ref(x_173);
+ x_176 = lean_box(0);
 }
-if (lean_is_scalar(x_156)) {
- x_172 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_160)) {
+ x_177 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_172 = x_156;
+ x_177 = x_160;
 }
-lean_ctor_set(x_172, 0, x_152);
-lean_ctor_set(x_172, 1, x_160);
-lean_ctor_set(x_172, 2, x_164);
-lean_ctor_set(x_172, 3, x_169);
-x_173 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_173, 0, x_172);
-if (lean_is_scalar(x_171)) {
- x_174 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_177, 0, x_156);
+lean_ctor_set(x_177, 1, x_165);
+lean_ctor_set(x_177, 2, x_169);
+lean_ctor_set(x_177, 3, x_174);
+x_178 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_178, 0, x_177);
+if (lean_is_scalar(x_176)) {
+ x_179 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_174 = x_171;
+ x_179 = x_176;
 }
-lean_ctor_set(x_174, 0, x_173);
-lean_ctor_set(x_174, 1, x_170);
-return x_174;
+lean_ctor_set(x_179, 0, x_178);
+lean_ctor_set(x_179, 1, x_175);
+return x_179;
 }
 }
 case 5:
 {
-uint8_t x_175; 
-x_175 = !lean_is_exclusive(x_1);
-if (x_175 == 0)
+uint8_t x_180; 
+x_180 = !lean_is_exclusive(x_1);
+if (x_180 == 0)
 {
-lean_object* x_176; lean_object* x_177; uint8_t x_178; 
-x_176 = lean_ctor_get(x_1, 0);
-x_177 = lean_st_ref_get(x_2, x_6);
-x_178 = !lean_is_exclusive(x_177);
-if (x_178 == 0)
+lean_object* x_181; lean_object* x_182; uint8_t x_183; 
+x_181 = lean_ctor_get(x_1, 0);
+x_182 = lean_st_ref_get(x_2, x_6);
+x_183 = !lean_is_exclusive(x_182);
+if (x_183 == 0)
 {
-lean_object* x_179; lean_object* x_180; 
-x_179 = lean_ctor_get(x_177, 0);
-x_180 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_179, x_176);
-lean_ctor_set(x_1, 0, x_180);
-lean_ctor_set(x_177, 0, x_1);
-return x_177;
+lean_object* x_184; uint8_t x_185; lean_object* x_186; 
+x_184 = lean_ctor_get(x_182, 0);
+x_185 = 1;
+x_186 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_184, x_181, x_185);
+lean_ctor_set(x_1, 0, x_186);
+lean_ctor_set(x_182, 0, x_1);
+return x_182;
 }
 else
 {
-lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; 
-x_181 = lean_ctor_get(x_177, 0);
-x_182 = lean_ctor_get(x_177, 1);
-lean_inc(x_182);
-lean_inc(x_181);
-lean_dec(x_177);
-x_183 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_181, x_176);
-lean_ctor_set(x_1, 0, x_183);
-x_184 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_184, 0, x_1);
-lean_ctor_set(x_184, 1, x_182);
-return x_184;
-}
-}
-else
-{
-lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-x_185 = lean_ctor_get(x_1, 0);
-lean_inc(x_185);
-lean_dec(x_1);
-x_186 = lean_st_ref_get(x_2, x_6);
-x_187 = lean_ctor_get(x_186, 0);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_186, 1);
+lean_object* x_187; lean_object* x_188; uint8_t x_189; lean_object* x_190; lean_object* x_191; 
+x_187 = lean_ctor_get(x_182, 0);
+x_188 = lean_ctor_get(x_182, 1);
 lean_inc(x_188);
-if (lean_is_exclusive(x_186)) {
- lean_ctor_release(x_186, 0);
- lean_ctor_release(x_186, 1);
- x_189 = x_186;
-} else {
- lean_dec_ref(x_186);
- x_189 = lean_box(0);
+lean_inc(x_187);
+lean_dec(x_182);
+x_189 = 1;
+x_190 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_187, x_181, x_189);
+lean_ctor_set(x_1, 0, x_190);
+x_191 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_191, 0, x_1);
+lean_ctor_set(x_191, 1, x_188);
+return x_191;
 }
-x_190 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_187, x_185);
-x_191 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_191, 0, x_190);
-if (lean_is_scalar(x_189)) {
- x_192 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_192 = x_189;
 }
-lean_ctor_set(x_192, 0, x_191);
-lean_ctor_set(x_192, 1, x_188);
-return x_192;
+else
+{
+lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; uint8_t x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; 
+x_192 = lean_ctor_get(x_1, 0);
+lean_inc(x_192);
+lean_dec(x_1);
+x_193 = lean_st_ref_get(x_2, x_6);
+x_194 = lean_ctor_get(x_193, 0);
+lean_inc(x_194);
+x_195 = lean_ctor_get(x_193, 1);
+lean_inc(x_195);
+if (lean_is_exclusive(x_193)) {
+ lean_ctor_release(x_193, 0);
+ lean_ctor_release(x_193, 1);
+ x_196 = x_193;
+} else {
+ lean_dec_ref(x_193);
+ x_196 = lean_box(0);
+}
+x_197 = 1;
+x_198 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_194, x_192, x_197);
+x_199 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_199, 0, x_198);
+if (lean_is_scalar(x_196)) {
+ x_200 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_200 = x_196;
+}
+lean_ctor_set(x_200, 0, x_199);
+lean_ctor_set(x_200, 1, x_195);
+return x_200;
 }
 }
 default: 
 {
-uint8_t x_193; 
-x_193 = !lean_is_exclusive(x_1);
-if (x_193 == 0)
+uint8_t x_201; 
+x_201 = !lean_is_exclusive(x_1);
+if (x_201 == 0)
 {
-lean_object* x_194; lean_object* x_195; uint8_t x_196; 
-x_194 = lean_ctor_get(x_1, 0);
-x_195 = lean_st_ref_get(x_2, x_6);
-x_196 = !lean_is_exclusive(x_195);
-if (x_196 == 0)
+lean_object* x_202; lean_object* x_203; uint8_t x_204; 
+x_202 = lean_ctor_get(x_1, 0);
+x_203 = lean_st_ref_get(x_2, x_6);
+x_204 = !lean_is_exclusive(x_203);
+if (x_204 == 0)
 {
-lean_object* x_197; lean_object* x_198; 
-x_197 = lean_ctor_get(x_195, 0);
-x_198 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_197, x_194);
-lean_ctor_set(x_1, 0, x_198);
-lean_ctor_set(x_195, 0, x_1);
-return x_195;
+lean_object* x_205; uint8_t x_206; lean_object* x_207; 
+x_205 = lean_ctor_get(x_203, 0);
+x_206 = 1;
+x_207 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_205, x_206, x_202);
+lean_ctor_set(x_1, 0, x_207);
+lean_ctor_set(x_203, 0, x_1);
+return x_203;
 }
 else
 {
-lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
-x_199 = lean_ctor_get(x_195, 0);
-x_200 = lean_ctor_get(x_195, 1);
-lean_inc(x_200);
-lean_inc(x_199);
-lean_dec(x_195);
-x_201 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_199, x_194);
-lean_ctor_set(x_1, 0, x_201);
-x_202 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_202, 0, x_1);
-lean_ctor_set(x_202, 1, x_200);
-return x_202;
+lean_object* x_208; lean_object* x_209; uint8_t x_210; lean_object* x_211; lean_object* x_212; 
+x_208 = lean_ctor_get(x_203, 0);
+x_209 = lean_ctor_get(x_203, 1);
+lean_inc(x_209);
+lean_inc(x_208);
+lean_dec(x_203);
+x_210 = 1;
+x_211 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_208, x_210, x_202);
+lean_ctor_set(x_1, 0, x_211);
+x_212 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_212, 0, x_1);
+lean_ctor_set(x_212, 1, x_209);
+return x_212;
 }
 }
 else
 {
-lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
-x_203 = lean_ctor_get(x_1, 0);
-lean_inc(x_203);
+lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; uint8_t x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; 
+x_213 = lean_ctor_get(x_1, 0);
+lean_inc(x_213);
 lean_dec(x_1);
-x_204 = lean_st_ref_get(x_2, x_6);
-x_205 = lean_ctor_get(x_204, 0);
-lean_inc(x_205);
-x_206 = lean_ctor_get(x_204, 1);
-lean_inc(x_206);
-if (lean_is_exclusive(x_204)) {
- lean_ctor_release(x_204, 0);
- lean_ctor_release(x_204, 1);
- x_207 = x_204;
+x_214 = lean_st_ref_get(x_2, x_6);
+x_215 = lean_ctor_get(x_214, 0);
+lean_inc(x_215);
+x_216 = lean_ctor_get(x_214, 1);
+lean_inc(x_216);
+if (lean_is_exclusive(x_214)) {
+ lean_ctor_release(x_214, 0);
+ lean_ctor_release(x_214, 1);
+ x_217 = x_214;
 } else {
- lean_dec_ref(x_204);
- x_207 = lean_box(0);
+ lean_dec_ref(x_214);
+ x_217 = lean_box(0);
 }
-x_208 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_205, x_203);
-x_209 = lean_alloc_ctor(6, 1, 0);
-lean_ctor_set(x_209, 0, x_208);
-if (lean_is_scalar(x_207)) {
- x_210 = lean_alloc_ctor(0, 2, 0);
+x_218 = 1;
+x_219 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_215, x_218, x_213);
+x_220 = lean_alloc_ctor(6, 1, 0);
+lean_ctor_set(x_220, 0, x_219);
+if (lean_is_scalar(x_217)) {
+ x_221 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_210 = x_207;
+ x_221 = x_217;
 }
-lean_ctor_set(x_210, 0, x_209);
-lean_ctor_set(x_210, 1, x_206);
-return x_210;
+lean_ctor_set(x_221, 0, x_220);
+lean_ctor_set(x_221, 1, x_216);
+return x_221;
 }
 }
 }
@@ -5400,16 +5728,18 @@ lean_dec(x_2);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_7;
+return x_9;
 }
 }
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeCode___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
@@ -5725,7 +6055,7 @@ uint8_t x_7;
 x_7 = !lean_is_exclusive(x_1);
 if (x_7 == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t 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_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; lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
 x_8 = lean_ctor_get(x_1, 2);
 x_9 = lean_ctor_get(x_1, 3);
 x_10 = lean_ctor_get(x_1, 4);
@@ -5735,104 +6065,106 @@ lean_inc(x_12);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_12, x_8);
-x_15 = lean_array_get_size(x_9);
-x_16 = lean_usize_of_nat(x_15);
-lean_dec(x_15);
-x_17 = 0;
-x_18 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_16, x_17, x_9, x_2, x_3, x_4, x_5, x_13);
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
+x_14 = 1;
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_12, x_14, x_8);
+x_16 = lean_array_get_size(x_9);
+x_17 = lean_usize_of_nat(x_16);
+lean_dec(x_16);
+x_18 = 0;
+x_19 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_17, x_18, x_9, x_2, x_3, x_4, x_5, x_13);
+x_20 = lean_ctor_get(x_19, 0);
 lean_inc(x_20);
-lean_dec(x_18);
-x_21 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_10, x_2, x_3, x_4, x_5, x_20);
-x_22 = !lean_is_exclusive(x_21);
-if (x_22 == 0)
+x_21 = lean_ctor_get(x_19, 1);
+lean_inc(x_21);
+lean_dec(x_19);
+x_22 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_10, x_2, x_3, x_4, x_5, x_21);
+x_23 = !lean_is_exclusive(x_22);
+if (x_23 == 0)
 {
-lean_object* x_23; 
-x_23 = lean_ctor_get(x_21, 0);
-lean_ctor_set(x_1, 4, x_23);
-lean_ctor_set(x_1, 3, x_19);
-lean_ctor_set(x_1, 2, x_14);
-lean_ctor_set(x_21, 0, x_1);
-return x_21;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_24 = lean_ctor_get(x_21, 0);
-x_25 = lean_ctor_get(x_21, 1);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_21);
+lean_object* x_24; 
+x_24 = lean_ctor_get(x_22, 0);
 lean_ctor_set(x_1, 4, x_24);
-lean_ctor_set(x_1, 3, x_19);
-lean_ctor_set(x_1, 2, x_14);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_1);
-lean_ctor_set(x_26, 1, x_25);
-return x_26;
+lean_ctor_set(x_1, 3, x_20);
+lean_ctor_set(x_1, 2, x_15);
+lean_ctor_set(x_22, 0, x_1);
+return x_22;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_22, 0);
+x_26 = lean_ctor_get(x_22, 1);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_dec(x_22);
+lean_ctor_set(x_1, 4, x_25);
+lean_ctor_set(x_1, 3, x_20);
+lean_ctor_set(x_1, 2, x_15);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_1);
+lean_ctor_set(x_27, 1, x_26);
+return x_27;
 }
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; size_t x_37; size_t 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; 
-x_27 = lean_ctor_get(x_1, 0);
-x_28 = lean_ctor_get(x_1, 1);
-x_29 = lean_ctor_get(x_1, 2);
-x_30 = lean_ctor_get(x_1, 3);
-x_31 = lean_ctor_get(x_1, 4);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; lean_object* x_37; lean_object* x_38; size_t 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; 
+x_28 = lean_ctor_get(x_1, 0);
+x_29 = lean_ctor_get(x_1, 1);
+x_30 = lean_ctor_get(x_1, 2);
+x_31 = lean_ctor_get(x_1, 3);
+x_32 = lean_ctor_get(x_1, 4);
+lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
 lean_inc(x_28);
-lean_inc(x_27);
 lean_dec(x_1);
-x_32 = lean_st_ref_get(x_2, x_6);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
+x_33 = lean_st_ref_get(x_2, x_6);
+x_34 = lean_ctor_get(x_33, 0);
 lean_inc(x_34);
-lean_dec(x_32);
-x_35 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_33, x_29);
-x_36 = lean_array_get_size(x_30);
-x_37 = lean_usize_of_nat(x_36);
-lean_dec(x_36);
-x_38 = 0;
-x_39 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_37, x_38, x_30, x_2, x_3, x_4, x_5, x_34);
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
-lean_inc(x_41);
-lean_dec(x_39);
-x_42 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_31, x_2, x_3, x_4, x_5, x_41);
-x_43 = lean_ctor_get(x_42, 0);
+x_35 = lean_ctor_get(x_33, 1);
+lean_inc(x_35);
+lean_dec(x_33);
+x_36 = 1;
+x_37 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_34, x_36, x_30);
+x_38 = lean_array_get_size(x_31);
+x_39 = lean_usize_of_nat(x_38);
+lean_dec(x_38);
+x_40 = 0;
+x_41 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Internalize_internalizeFunDecl___spec__1(x_39, x_40, x_31, x_2, x_3, x_4, x_5, x_35);
+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_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-if (lean_is_exclusive(x_42)) {
- lean_ctor_release(x_42, 0);
- lean_ctor_release(x_42, 1);
- x_45 = x_42;
+lean_dec(x_41);
+x_44 = l_Lean_Compiler_LCNF_Internalize_internalizeCode(x_32, x_2, x_3, x_4, x_5, x_43);
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+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_42);
- x_45 = lean_box(0);
+ lean_dec_ref(x_44);
+ x_47 = lean_box(0);
 }
-x_46 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_46, 0, x_27);
-lean_ctor_set(x_46, 1, x_28);
-lean_ctor_set(x_46, 2, x_35);
-lean_ctor_set(x_46, 3, x_40);
-lean_ctor_set(x_46, 4, x_43);
-if (lean_is_scalar(x_45)) {
- x_47 = lean_alloc_ctor(0, 2, 0);
+x_48 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_48, 0, x_28);
+lean_ctor_set(x_48, 1, x_29);
+lean_ctor_set(x_48, 2, x_37);
+lean_ctor_set(x_48, 3, x_42);
+lean_ctor_set(x_48, 4, x_45);
+if (lean_is_scalar(x_47)) {
+ x_49 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_47 = x_45;
+ x_49 = x_47;
 }
-lean_ctor_set(x_47, 0, x_46);
-lean_ctor_set(x_47, 1, x_44);
-return x_47;
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_46);
+return x_49;
 }
 }
 }
@@ -7545,34 +7877,46 @@ x_5 = lean_apply_2(x_2, lean_box(0), x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = lean_ctor_get(x_2, 1);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_4, 2);
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_6 = lean_ctor_get(x_3, 1);
 lean_inc(x_6);
-x_7 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1), 3, 2);
-lean_closure_set(x_7, 0, x_2);
-lean_closure_set(x_7, 1, x_6);
-lean_inc(x_5);
-x_8 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_3, x_7);
-x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg___lambda__1), 3, 2);
-lean_closure_set(x_9, 0, x_4);
-lean_closure_set(x_9, 1, x_1);
-x_10 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_8, x_9);
-return x_10;
+x_7 = lean_ctor_get(x_5, 2);
+lean_inc(x_7);
+x_8 = lean_box(x_1);
+x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_9, 0, x_3);
+lean_closure_set(x_9, 1, x_8);
+lean_closure_set(x_9, 2, x_7);
+lean_inc(x_6);
+x_10 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_4, x_9);
+x_11 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg___lambda__1), 3, 2);
+lean_closure_set(x_11, 0, x_5);
+lean_closure_set(x_11, 1, x_2);
+x_12 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_10, x_11);
+return x_12;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg___boxed), 5, 0);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = lean_unbox(x_1);
+lean_dec(x_1);
+x_7 = l_Lean_Compiler_LCNF_normParam___rarg(x_6, x_2, x_3, x_4, x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normParams___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -7591,28 +7935,40 @@ x_2 = lean_alloc_closure((void*)(l___private_Init_Data_Array_BasicAux_0__mapMono
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-lean_inc(x_2);
-x_5 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg), 4, 3);
-lean_closure_set(x_5, 0, x_1);
-lean_closure_set(x_5, 1, x_2);
-lean_closure_set(x_5, 2, x_3);
-x_6 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normParams___spec__1(lean_box(0));
-x_7 = lean_apply_3(x_6, x_2, x_4, x_5);
-return x_7;
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_6 = lean_box(x_1);
+lean_inc(x_3);
+x_7 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___rarg___boxed), 5, 4);
+lean_closure_set(x_7, 0, x_6);
+lean_closure_set(x_7, 1, x_2);
+lean_closure_set(x_7, 2, x_3);
+lean_closure_set(x_7, 3, x_4);
+x_8 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normParams___spec__1(lean_box(0));
+x_9 = lean_apply_3(x_8, x_3, x_5, x_7);
+return x_9;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParams___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParams___rarg___boxed), 5, 0);
 return x_2;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = lean_unbox(x_1);
+lean_dec(x_1);
+x_7 = l_Lean_Compiler_LCNF_normParams___rarg(x_6, x_2, x_3, x_4, x_5);
+return x_7;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -7625,60 +7981,86 @@ x_6 = lean_apply_2(x_3, lean_box(0), x_5);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___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) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_7 = lean_ctor_get(x_1, 3);
-lean_inc(x_7);
-x_8 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1), 3, 2);
-lean_closure_set(x_8, 0, x_2);
-lean_closure_set(x_8, 1, x_7);
-lean_inc(x_3);
-x_9 = lean_apply_4(x_3, lean_box(0), lean_box(0), x_4, x_8);
-x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__1), 4, 3);
-lean_closure_set(x_10, 0, x_1);
-lean_closure_set(x_10, 1, x_6);
-lean_closure_set(x_10, 2, x_5);
-x_11 = lean_apply_4(x_3, lean_box(0), lean_box(0), x_9, x_10);
-return x_11;
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_8 = lean_ctor_get(x_1, 3);
+lean_inc(x_8);
+x_9 = lean_box(x_3);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_10, 0, x_2);
+lean_closure_set(x_10, 1, x_9);
+lean_closure_set(x_10, 2, x_8);
+lean_inc(x_4);
+x_11 = lean_apply_4(x_4, lean_box(0), lean_box(0), x_5, x_10);
+x_12 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__1), 4, 3);
+lean_closure_set(x_12, 0, x_1);
+lean_closure_set(x_12, 1, x_7);
+lean_closure_set(x_12, 2, x_6);
+x_13 = lean_apply_4(x_4, lean_box(0), lean_box(0), x_11, x_12);
+return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = lean_ctor_get(x_2, 1);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_4, 2);
+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; 
+x_6 = lean_ctor_get(x_3, 1);
 lean_inc(x_6);
-lean_inc(x_2);
-x_7 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1), 3, 2);
-lean_closure_set(x_7, 0, x_2);
-lean_closure_set(x_7, 1, x_6);
-lean_inc(x_5);
+x_7 = lean_ctor_get(x_5, 2);
+lean_inc(x_7);
+x_8 = lean_box(x_1);
 lean_inc(x_3);
-x_8 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_3, x_7);
-lean_inc(x_5);
-x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2), 6, 5);
-lean_closure_set(x_9, 0, x_4);
-lean_closure_set(x_9, 1, x_2);
-lean_closure_set(x_9, 2, x_5);
-lean_closure_set(x_9, 3, x_3);
-lean_closure_set(x_9, 4, x_1);
-x_10 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_8, x_9);
-return x_10;
+x_9 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_9, 0, x_3);
+lean_closure_set(x_9, 1, x_8);
+lean_closure_set(x_9, 2, x_7);
+lean_inc(x_6);
+lean_inc(x_4);
+x_10 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_4, x_9);
+x_11 = lean_box(x_1);
+lean_inc(x_6);
+x_12 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2___boxed), 7, 6);
+lean_closure_set(x_12, 0, x_5);
+lean_closure_set(x_12, 1, x_3);
+lean_closure_set(x_12, 2, x_11);
+lean_closure_set(x_12, 3, x_6);
+lean_closure_set(x_12, 4, x_4);
+lean_closure_set(x_12, 5, x_2);
+x_13 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_10, x_12);
+return x_13;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___rarg___boxed), 5, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1(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_Compiler_LCNF_normLetDecl___rarg___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_3);
+lean_dec(x_3);
+x_9 = l_Lean_Compiler_LCNF_normLetDecl___rarg___lambda__2(x_1, x_2, x_8, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = lean_unbox(x_1);
+lean_dec(x_1);
+x_7 = l_Lean_Compiler_LCNF_normLetDecl___rarg(x_6, x_2, x_3, x_4, x_5);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1(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; 
@@ -7688,1860 +8070,2016 @@ lean_ctor_set(x_6, 1, x_5);
 return x_6;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1___boxed), 5, 0);
+x_1 = lean_alloc_closure((void*)(l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1___boxed), 5, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM() {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM(uint8_t x_1) {
 _start:
 {
-lean_object* x_1; 
-x_1 = l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1;
-return x_1;
+lean_object* x_2; 
+x_2 = l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1;
+return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1___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_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1___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_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___spec__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_ReaderT_read___at_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___spec__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___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 lean_object* l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_7 = lean_ctor_get(x_1, 2);
-lean_inc(x_7);
-x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_7);
-x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_1, x_8, x_3, x_4, x_5, x_6);
-return x_9;
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM(x_2);
+return x_3;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_array_get_size(x_3);
-x_10 = lean_nat_dec_lt(x_2, x_9);
-lean_dec(x_9);
-if (x_10 == 0)
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_2, 2);
+lean_inc(x_8);
+x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_8);
+x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_2, x_9, x_4, x_5, x_6, x_7);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2(uint8_t x_1) {
+_start:
 {
-lean_object* x_11; 
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg___boxed), 7, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_array_get_size(x_4);
+x_11 = lean_nat_dec_lt(x_3, x_10);
+lean_dec(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
-lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_1);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_3);
-lean_ctor_set(x_11, 1, x_8);
-return x_11;
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_4);
+lean_ctor_set(x_12, 1, x_9);
+return x_12;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; 
-x_12 = lean_array_fget(x_3, x_2);
-lean_inc(x_1);
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_array_fget(x_4, x_3);
+lean_inc(x_2);
+lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_12);
-x_13 = lean_apply_6(x_1, x_12, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; uint8_t x_18; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ptr_addr(x_12);
-lean_dec(x_12);
-x_17 = lean_ptr_addr(x_14);
-x_18 = lean_usize_dec_eq(x_16, x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-x_21 = lean_array_fset(x_3, x_2, x_14);
-lean_dec(x_2);
-x_2 = x_20;
-x_3 = x_21;
-x_8 = x_15;
-goto _start;
-}
-else
-{
-lean_object* x_23; lean_object* x_24; 
-lean_dec(x_14);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_add(x_2, x_23);
-lean_dec(x_2);
-x_2 = x_24;
-x_8 = x_15;
-goto _start;
-}
-}
-else
-{
-uint8_t x_26; 
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_26 = !lean_is_exclusive(x_13);
-if (x_26 == 0)
-{
-return x_13;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_13, 0);
-x_28 = lean_ctor_get(x_13, 1);
-lean_inc(x_28);
-lean_inc(x_27);
-lean_dec(x_13);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(x_2, x_8, x_1, x_3, x_4, x_5, x_6, x_7);
-return x_9;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___boxed), 6, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; lean_object* x_8; 
-x_7 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1;
-x_8 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(x_1, x_7, x_2, x_3, x_4, x_5, x_6);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(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; 
-x_7 = lean_ctor_get(x_1, 3);
-lean_inc(x_7);
-lean_inc(x_2);
-x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_7);
-x_9 = lean_ctor_get(x_1, 2);
-lean_inc(x_9);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-x_10 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(x_9, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_10) == 0)
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = lean_ctor_get(x_1, 4);
 lean_inc(x_13);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-x_14 = l_Lean_Compiler_LCNF_normCodeImp(x_13, x_2, x_3, x_4, x_5, x_12);
+x_14 = lean_apply_6(x_2, x_13, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_14) == 0)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
 x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
 x_16 = lean_ctor_get(x_14, 1);
 lean_inc(x_16);
 lean_dec(x_14);
-x_17 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_1, x_8, x_11, x_15, x_3, x_4, x_5, x_16);
-lean_dec(x_5);
-lean_dec(x_4);
+x_17 = lean_ptr_addr(x_13);
+lean_dec(x_13);
+x_18 = lean_ptr_addr(x_15);
+x_19 = lean_usize_dec_eq(x_17, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_3, x_20);
+x_22 = lean_array_fset(x_4, x_3, x_15);
 lean_dec(x_3);
-return x_17;
+x_3 = x_21;
+x_4 = x_22;
+x_9 = x_16;
+goto _start;
 }
 else
 {
-uint8_t x_18; 
-lean_dec(x_11);
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_15);
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_3 = x_25;
+x_9 = x_16;
+goto _start;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_13);
 lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_1);
-x_18 = !lean_is_exclusive(x_14);
-if (x_18 == 0)
+lean_dec(x_2);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
 {
 return x_14;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_14, 0);
-x_20 = lean_ctor_get(x_14, 1);
-lean_inc(x_20);
-lean_inc(x_19);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+x_29 = lean_ctor_get(x_14, 1);
+lean_inc(x_29);
+lean_inc(x_28);
 lean_dec(x_14);
-x_21 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_21, 0, x_19);
-lean_ctor_set(x_21, 1, x_20);
-return x_21;
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(x_1, x_3, x_9, x_2, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(uint8_t 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) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = lean_box(x_2);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg___boxed), 7, 1);
+lean_closure_set(x_10, 0, x_9);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(x_1, x_3, x_10, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_8 = lean_ctor_get(x_2, 3);
+lean_inc(x_8);
+lean_inc(x_3);
+x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_8);
+x_10 = lean_ctor_get(x_2, 2);
+lean_inc(x_10);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+x_11 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(x_1, x_1, x_10, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_11) == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_11, 1);
+lean_inc(x_13);
+lean_dec(x_11);
+x_14 = lean_ctor_get(x_2, 4);
+lean_inc(x_14);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_15 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_14, x_3, x_4, x_5, x_6, x_13);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_15, 1);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_2, x_9, x_12, x_16, x_4, x_5, x_6, x_17);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_18;
+}
+else
+{
+uint8_t x_19; 
+lean_dec(x_12);
+lean_dec(x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_19 = !lean_is_exclusive(x_15);
+if (x_19 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_15, 0);
+x_21 = lean_ctor_get(x_15, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_15);
+x_22 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+return x_22;
 }
 }
 }
 else
 {
-uint8_t x_22; 
-lean_dec(x_8);
+uint8_t x_23; 
+lean_dec(x_9);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_1);
-x_22 = !lean_is_exclusive(x_10);
-if (x_22 == 0)
+x_23 = !lean_is_exclusive(x_11);
+if (x_23 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_11, 0);
+x_25 = lean_ctor_get(x_11, 1);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_11);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_24);
+lean_ctor_set(x_26, 1, x_25);
+return x_26;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_8 = lean_ctor_get(x_2, 2);
+lean_inc(x_8);
+lean_inc(x_3);
+x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_8);
+x_10 = lean_ctor_get(x_2, 3);
+lean_inc(x_10);
+x_11 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_10);
+x_12 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_2, x_9, x_11, x_4, x_5, x_6, x_7);
+return x_12;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(uint8_t x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg___boxed), 7, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; 
+x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_2);
+x_9 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_9, 0, x_8);
+lean_ctor_set(x_9, 1, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(uint8_t x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg___boxed), 7, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_array_get_size(x_4);
+x_11 = lean_nat_dec_lt(x_3, x_10);
+lean_dec(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_4);
+lean_ctor_set(x_12, 1, x_9);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_array_fget(x_4, x_3);
+lean_inc(x_2);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_13);
+x_14 = lean_apply_6(x_2, x_13, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_ptr_addr(x_13);
+lean_dec(x_13);
+x_18 = lean_ptr_addr(x_15);
+x_19 = lean_usize_dec_eq(x_17, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_3, x_20);
+x_22 = lean_array_fset(x_4, x_3, x_15);
+lean_dec(x_3);
+x_3 = x_21;
+x_4 = x_22;
+x_9 = x_16;
+goto _start;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_15);
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_3 = x_25;
+x_9 = x_16;
+goto _start;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+x_29 = lean_ctor_get(x_14, 1);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_14);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(x_1, x_3, x_9, x_2, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(uint8_t 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) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = lean_box(x_2);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg___boxed), 7, 1);
+lean_closure_set(x_10, 0, x_9);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(x_1, x_3, x_10, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_2, 2);
+lean_inc(x_8);
+x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_8);
+x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_2, x_9, x_4, x_5, x_6, x_7);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7(uint8_t x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg___boxed), 7, 0);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__9(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_array_get_size(x_4);
+x_11 = lean_nat_dec_lt(x_3, x_10);
+lean_dec(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_4);
+lean_ctor_set(x_12, 1, x_9);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_array_fget(x_4, x_3);
+lean_inc(x_2);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_13);
+x_14 = lean_apply_6(x_2, x_13, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_ptr_addr(x_13);
+lean_dec(x_13);
+x_18 = lean_ptr_addr(x_15);
+x_19 = lean_usize_dec_eq(x_17, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_3, x_20);
+x_22 = lean_array_fset(x_4, x_3, x_15);
+lean_dec(x_3);
+x_3 = x_21;
+x_4 = x_22;
+x_9 = x_16;
+goto _start;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_15);
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_3 = x_25;
+x_9 = x_16;
+goto _start;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+x_29 = lean_ctor_get(x_14, 1);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_14);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__8(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__9(x_1, x_3, x_9, x_2, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___spec__6(uint8_t 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) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = lean_box(x_2);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg___boxed), 7, 1);
+lean_closure_set(x_10, 0, x_9);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__8(x_1, x_3, x_10, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_array_get_size(x_4);
+x_11 = lean_nat_dec_lt(x_3, x_10);
+lean_dec(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_4);
+lean_ctor_set(x_12, 1, x_9);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_array_fget(x_4, x_3);
+lean_inc(x_2);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_13);
+x_14 = lean_apply_6(x_2, x_13, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_ptr_addr(x_13);
+lean_dec(x_13);
+x_18 = lean_ptr_addr(x_15);
+x_19 = lean_usize_dec_eq(x_17, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_3, x_20);
+x_22 = lean_array_fset(x_4, x_3, x_15);
+lean_dec(x_3);
+x_3 = x_21;
+x_4 = x_22;
+x_9 = x_16;
+goto _start;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_15);
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_3 = x_25;
+x_9 = x_16;
+goto _start;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+x_29 = lean_ctor_get(x_14, 1);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_14);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__10(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11(x_1, x_3, x_9, x_2, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_2, 1);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_2, 2);
+lean_inc(x_9);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+x_10 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___spec__6(x_1, x_1, x_8, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_10) == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* 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 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_9, x_3, x_4, x_5, x_6, x_12);
+if (lean_obj_tag(x_13) == 0)
+{
+uint8_t x_14; 
+x_14 = !lean_is_exclusive(x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_13, 0);
+x_16 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_2, x_11, x_15);
+lean_ctor_set(x_13, 0, x_16);
+return x_13;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_17 = lean_ctor_get(x_13, 0);
+x_18 = lean_ctor_get(x_13, 1);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_dec(x_13);
+x_19 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_2, x_11, x_17);
+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;
+}
+}
+else
+{
+uint8_t x_21; 
+lean_dec(x_11);
+lean_dec(x_2);
+x_21 = !lean_is_exclusive(x_13);
+if (x_21 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_13, 0);
+x_23 = lean_ctor_get(x_13, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_13);
+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;
+}
+}
+}
+else
+{
+uint8_t x_25; 
+lean_dec(x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_25 = !lean_is_exclusive(x_10);
+if (x_25 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_23 = lean_ctor_get(x_10, 0);
-x_24 = lean_ctor_get(x_10, 1);
-lean_inc(x_24);
-lean_inc(x_23);
-lean_dec(x_10);
-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;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_7 = lean_ctor_get(x_1, 2);
-lean_inc(x_7);
-lean_inc(x_2);
-x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_7);
-x_9 = lean_ctor_get(x_1, 3);
-lean_inc(x_9);
-x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_9);
-x_11 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_1, x_8, x_10, x_3, x_4, x_5, x_6);
-return x_11;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; lean_object* x_8; 
-x_7 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_1);
-x_8 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_8, 0, x_7);
-lean_ctor_set(x_8, 1, x_6);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_array_get_size(x_3);
-x_10 = lean_nat_dec_lt(x_2, x_9);
-lean_dec(x_9);
-if (x_10 == 0)
-{
-lean_object* x_11; 
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_3);
-lean_ctor_set(x_11, 1, x_8);
-return x_11;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = lean_array_fget(x_3, x_2);
-lean_inc(x_1);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_12);
-x_13 = lean_apply_6(x_1, x_12, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; uint8_t x_18; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ptr_addr(x_12);
-lean_dec(x_12);
-x_17 = lean_ptr_addr(x_14);
-x_18 = lean_usize_dec_eq(x_16, x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-x_21 = lean_array_fset(x_3, x_2, x_14);
-lean_dec(x_2);
-x_2 = x_20;
-x_3 = x_21;
-x_8 = x_15;
-goto _start;
-}
-else
-{
-lean_object* x_23; lean_object* x_24; 
-lean_dec(x_14);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_add(x_2, x_23);
-lean_dec(x_2);
-x_2 = x_24;
-x_8 = x_15;
-goto _start;
-}
-}
-else
-{
-uint8_t x_26; 
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_26 = !lean_is_exclusive(x_13);
-if (x_26 == 0)
-{
-return x_13;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_13, 0);
-x_28 = lean_ctor_get(x_13, 1);
-lean_inc(x_28);
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_10, 0);
+x_27 = lean_ctor_get(x_10, 1);
 lean_inc(x_27);
-lean_dec(x_13);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(x_2, x_8, x_1, x_3, x_4, x_5, x_6, x_7);
-return x_9;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___boxed), 6, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___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; lean_object* x_8; 
-x_7 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1;
-x_8 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(x_1, x_7, x_2, x_3, x_4, x_5, x_6);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_array_get_size(x_3);
-x_10 = lean_nat_dec_lt(x_2, x_9);
-lean_dec(x_9);
-if (x_10 == 0)
-{
-lean_object* x_11; 
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_3);
-lean_ctor_set(x_11, 1, x_8);
-return x_11;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = lean_array_fget(x_3, x_2);
-lean_inc(x_1);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_12);
-x_13 = lean_apply_6(x_1, x_12, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; uint8_t x_18; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ptr_addr(x_12);
-lean_dec(x_12);
-x_17 = lean_ptr_addr(x_14);
-x_18 = lean_usize_dec_eq(x_16, x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-x_21 = lean_array_fset(x_3, x_2, x_14);
-lean_dec(x_2);
-x_2 = x_20;
-x_3 = x_21;
-x_8 = x_15;
-goto _start;
-}
-else
-{
-lean_object* x_23; lean_object* x_24; 
-lean_dec(x_14);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_add(x_2, x_23);
-lean_dec(x_2);
-x_2 = x_24;
-x_8 = x_15;
-goto _start;
-}
-}
-else
-{
-uint8_t x_26; 
-lean_dec(x_12);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_26 = !lean_is_exclusive(x_13);
-if (x_26 == 0)
-{
-return x_13;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_13, 0);
-x_28 = lean_ctor_get(x_13, 1);
-lean_inc(x_28);
-lean_inc(x_27);
-lean_dec(x_13);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___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) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__7(x_2, x_8, x_1, x_3, x_4, x_5, x_6, x_7);
-return x_9;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_7 = lean_ctor_get(x_1, 1);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_1, 2);
-lean_inc(x_8);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-x_9 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(x_7, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_9) == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
-lean_inc(x_11);
-lean_dec(x_9);
-x_12 = l_Lean_Compiler_LCNF_normCodeImp(x_8, x_2, x_3, x_4, x_5, x_11);
-if (lean_obj_tag(x_12) == 0)
-{
-uint8_t x_13; 
-x_13 = !lean_is_exclusive(x_12);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_ctor_get(x_12, 0);
-x_15 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_1, x_10, x_14);
-lean_ctor_set(x_12, 0, x_15);
-return x_12;
-}
-else
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_16 = lean_ctor_get(x_12, 0);
-x_17 = lean_ctor_get(x_12, 1);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_dec(x_12);
-x_18 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp(x_1, x_10, x_16);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_17);
-return x_19;
-}
-}
-else
-{
-uint8_t x_20; 
-lean_dec(x_10);
-lean_dec(x_1);
-x_20 = !lean_is_exclusive(x_12);
-if (x_20 == 0)
-{
-return x_12;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_12, 0);
-x_22 = lean_ctor_get(x_12, 1);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_dec(x_12);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
-}
-}
-}
-else
-{
-uint8_t x_24; 
-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_24 = !lean_is_exclusive(x_9);
-if (x_24 == 0)
-{
-return x_9;
-}
-else
-{
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_9, 0);
-x_26 = lean_ctor_get(x_9, 1);
 lean_inc(x_26);
-lean_inc(x_25);
-lean_dec(x_9);
-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;
+lean_dec(x_10);
+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;
 }
 }
 }
 else
 {
-lean_object* x_28; lean_object* x_29; 
-x_28 = lean_ctor_get(x_1, 0);
-lean_inc(x_28);
-x_29 = l_Lean_Compiler_LCNF_normCodeImp(x_28, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_29) == 0)
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_ctor_get(x_2, 0);
+lean_inc(x_29);
+x_30 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_29, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_30) == 0)
 {
-uint8_t x_30; 
-x_30 = !lean_is_exclusive(x_29);
-if (x_30 == 0)
+uint8_t x_31; 
+x_31 = !lean_is_exclusive(x_30);
+if (x_31 == 0)
 {
-lean_object* x_31; lean_object* x_32; 
-x_31 = lean_ctor_get(x_29, 0);
-x_32 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_1, x_31);
-lean_ctor_set(x_29, 0, x_32);
-return x_29;
+lean_object* x_32; lean_object* x_33; 
+x_32 = lean_ctor_get(x_30, 0);
+x_33 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_2, x_32);
+lean_ctor_set(x_30, 0, x_33);
+return x_30;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_33 = lean_ctor_get(x_29, 0);
-x_34 = lean_ctor_get(x_29, 1);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_34 = lean_ctor_get(x_30, 0);
+x_35 = lean_ctor_get(x_30, 1);
+lean_inc(x_35);
 lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_29);
-x_35 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_1, x_33);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-return x_36;
+lean_dec(x_30);
+x_36 = l___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltCodeImp(x_2, x_34);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_35);
+return x_37;
 }
 }
 else
 {
-uint8_t x_37; 
-lean_dec(x_1);
-x_37 = !lean_is_exclusive(x_29);
-if (x_37 == 0)
+uint8_t x_38; 
+lean_dec(x_2);
+x_38 = !lean_is_exclusive(x_30);
+if (x_38 == 0)
 {
-return x_29;
+return x_30;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_29, 0);
-x_39 = lean_ctor_get(x_29, 1);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_30, 0);
+x_40 = lean_ctor_get(x_30, 1);
+lean_inc(x_40);
 lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_29);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
+lean_dec(x_30);
+x_41 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_41, 0, x_39);
+lean_ctor_set(x_41, 1, x_40);
+return x_41;
 }
 }
 }
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_normCodeImp___closed__1() {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCodeImp___lambda__1), 6, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp(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:
-{
-switch (lean_obj_tag(x_1)) {
+switch (lean_obj_tag(x_2)) {
 case 0:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_7 = lean_ctor_get(x_1, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_1, 1);
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_8 = lean_ctor_get(x_2, 0);
 lean_inc(x_8);
-lean_inc(x_2);
-lean_inc(x_7);
-x_9 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(x_7, x_2, x_3, x_4, x_5, x_6);
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
+x_9 = lean_ctor_get(x_2, 1);
+lean_inc(x_9);
+lean_inc(x_3);
+lean_inc(x_8);
+x_10 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
+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);
+lean_inc(x_9);
+x_13 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_9, x_3, x_4, x_5, x_6, x_12);
+if (lean_obj_tag(x_13) == 0)
+{
+uint8_t x_14; 
+x_14 = !lean_is_exclusive(x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; size_t x_16; size_t x_17; uint8_t x_18; 
+x_15 = lean_ctor_get(x_13, 0);
+x_16 = lean_ptr_addr(x_9);
 lean_dec(x_9);
-lean_inc(x_8);
-x_12 = l_Lean_Compiler_LCNF_normCodeImp(x_8, x_2, x_3, x_4, x_5, x_11);
-if (lean_obj_tag(x_12) == 0)
-{
-uint8_t x_13; 
-x_13 = !lean_is_exclusive(x_12);
-if (x_13 == 0)
-{
-lean_object* x_14; size_t x_15; size_t x_16; uint8_t x_17; 
-x_14 = lean_ctor_get(x_12, 0);
-x_15 = lean_ptr_addr(x_8);
-lean_dec(x_8);
-x_16 = lean_ptr_addr(x_14);
-x_17 = lean_usize_dec_eq(x_15, x_16);
-if (x_17 == 0)
-{
-uint8_t x_18; 
-lean_dec(x_7);
-x_18 = !lean_is_exclusive(x_1);
+x_17 = lean_ptr_addr(x_15);
+x_18 = lean_usize_dec_eq(x_16, x_17);
 if (x_18 == 0)
 {
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_1, 1);
-lean_dec(x_19);
-x_20 = lean_ctor_get(x_1, 0);
+uint8_t x_19; 
+lean_dec(x_8);
+x_19 = !lean_is_exclusive(x_2);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_ctor_get(x_2, 1);
 lean_dec(x_20);
-lean_ctor_set(x_1, 1, x_14);
-lean_ctor_set(x_1, 0, x_10);
-lean_ctor_set(x_12, 0, x_1);
-return x_12;
+x_21 = lean_ctor_get(x_2, 0);
+lean_dec(x_21);
+lean_ctor_set(x_2, 1, x_15);
+lean_ctor_set(x_2, 0, x_11);
+lean_ctor_set(x_13, 0, x_2);
+return x_13;
 }
 else
 {
-lean_object* x_21; 
-lean_dec(x_1);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_10);
-lean_ctor_set(x_21, 1, x_14);
-lean_ctor_set(x_12, 0, x_21);
-return x_12;
+lean_object* x_22; 
+lean_dec(x_2);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_11);
+lean_ctor_set(x_22, 1, x_15);
+lean_ctor_set(x_13, 0, x_22);
+return x_13;
 }
 }
 else
 {
-size_t x_22; size_t x_23; uint8_t x_24; 
-x_22 = lean_ptr_addr(x_7);
-lean_dec(x_7);
-x_23 = lean_ptr_addr(x_10);
-x_24 = lean_usize_dec_eq(x_22, x_23);
-if (x_24 == 0)
-{
-uint8_t x_25; 
-x_25 = !lean_is_exclusive(x_1);
+size_t x_23; size_t x_24; uint8_t x_25; 
+x_23 = lean_ptr_addr(x_8);
+lean_dec(x_8);
+x_24 = lean_ptr_addr(x_11);
+x_25 = lean_usize_dec_eq(x_23, x_24);
 if (x_25 == 0)
 {
-lean_object* x_26; lean_object* x_27; 
-x_26 = lean_ctor_get(x_1, 1);
-lean_dec(x_26);
-x_27 = lean_ctor_get(x_1, 0);
+uint8_t x_26; 
+x_26 = !lean_is_exclusive(x_2);
+if (x_26 == 0)
+{
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_2, 1);
 lean_dec(x_27);
-lean_ctor_set(x_1, 1, x_14);
-lean_ctor_set(x_1, 0, x_10);
-lean_ctor_set(x_12, 0, x_1);
-return x_12;
+x_28 = lean_ctor_get(x_2, 0);
+lean_dec(x_28);
+lean_ctor_set(x_2, 1, x_15);
+lean_ctor_set(x_2, 0, x_11);
+lean_ctor_set(x_13, 0, x_2);
+return x_13;
 }
 else
 {
-lean_object* x_28; 
-lean_dec(x_1);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_10);
-lean_ctor_set(x_28, 1, x_14);
-lean_ctor_set(x_12, 0, x_28);
-return x_12;
+lean_object* x_29; 
+lean_dec(x_2);
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_11);
+lean_ctor_set(x_29, 1, x_15);
+lean_ctor_set(x_13, 0, x_29);
+return x_13;
 }
 }
 else
 {
-lean_dec(x_14);
-lean_dec(x_10);
-lean_ctor_set(x_12, 0, x_1);
-return x_12;
+lean_dec(x_15);
+lean_dec(x_11);
+lean_ctor_set(x_13, 0, x_2);
+return x_13;
 }
 }
 }
 else
 {
-lean_object* x_29; lean_object* x_30; size_t x_31; size_t x_32; uint8_t x_33; 
-x_29 = lean_ctor_get(x_12, 0);
-x_30 = lean_ctor_get(x_12, 1);
+lean_object* x_30; lean_object* x_31; size_t x_32; size_t x_33; uint8_t x_34; 
+x_30 = lean_ctor_get(x_13, 0);
+x_31 = lean_ctor_get(x_13, 1);
+lean_inc(x_31);
 lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_12);
-x_31 = lean_ptr_addr(x_8);
+lean_dec(x_13);
+x_32 = lean_ptr_addr(x_9);
+lean_dec(x_9);
+x_33 = lean_ptr_addr(x_30);
+x_34 = lean_usize_dec_eq(x_32, x_33);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
 lean_dec(x_8);
-x_32 = lean_ptr_addr(x_29);
-x_33 = lean_usize_dec_eq(x_31, x_32);
-if (x_33 == 0)
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_7);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_34 = x_1;
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_35 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_34 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_35 = lean_box(0);
 }
-if (lean_is_scalar(x_34)) {
- x_35 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_35)) {
+ x_36 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_35 = x_34;
+ x_36 = x_35;
 }
-lean_ctor_set(x_35, 0, x_10);
-lean_ctor_set(x_35, 1, x_29);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 0, x_11);
 lean_ctor_set(x_36, 1, x_30);
-return x_36;
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_31);
+return x_37;
 }
 else
 {
-size_t x_37; size_t x_38; uint8_t x_39; 
-x_37 = lean_ptr_addr(x_7);
-lean_dec(x_7);
-x_38 = lean_ptr_addr(x_10);
-x_39 = lean_usize_dec_eq(x_37, x_38);
-if (x_39 == 0)
+size_t x_38; size_t x_39; uint8_t x_40; 
+x_38 = lean_ptr_addr(x_8);
+lean_dec(x_8);
+x_39 = lean_ptr_addr(x_11);
+x_40 = lean_usize_dec_eq(x_38, x_39);
+if (x_40 == 0)
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_40 = x_1;
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_41 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_40 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_41 = lean_box(0);
 }
-if (lean_is_scalar(x_40)) {
- x_41 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_41)) {
+ x_42 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_41 = x_40;
+ x_42 = x_41;
 }
-lean_ctor_set(x_41, 0, x_10);
-lean_ctor_set(x_41, 1, x_29);
-x_42 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 0, x_11);
 lean_ctor_set(x_42, 1, x_30);
-return x_42;
-}
-else
-{
-lean_object* x_43; 
-lean_dec(x_29);
-lean_dec(x_10);
 x_43 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_43, 0, x_1);
-lean_ctor_set(x_43, 1, x_30);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_43, 1, x_31);
 return x_43;
 }
+else
+{
+lean_object* x_44; 
+lean_dec(x_30);
+lean_dec(x_11);
+x_44 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_44, 0, x_2);
+lean_ctor_set(x_44, 1, x_31);
+return x_44;
+}
 }
 }
 }
 else
 {
-uint8_t x_44; 
-lean_dec(x_10);
+uint8_t x_45; 
+lean_dec(x_11);
+lean_dec(x_9);
 lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_1);
-x_44 = !lean_is_exclusive(x_12);
-if (x_44 == 0)
+lean_dec(x_2);
+x_45 = !lean_is_exclusive(x_13);
+if (x_45 == 0)
 {
-return x_12;
+return x_13;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_12, 0);
-x_46 = lean_ctor_get(x_12, 1);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_13, 0);
+x_47 = lean_ctor_get(x_13, 1);
+lean_inc(x_47);
 lean_inc(x_46);
-lean_inc(x_45);
-lean_dec(x_12);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_46);
-return x_47;
+lean_dec(x_13);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
 }
 }
 case 1:
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_1, 0);
-lean_inc(x_48);
-x_49 = lean_ctor_get(x_1, 1);
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_2, 0);
 lean_inc(x_49);
+x_50 = lean_ctor_get(x_2, 1);
+lean_inc(x_50);
+lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_48);
-x_50 = l_Lean_Compiler_LCNF_normFunDeclImp(x_48, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_50, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_50, 1);
-lean_inc(x_52);
-lean_dec(x_50);
 lean_inc(x_49);
-x_53 = l_Lean_Compiler_LCNF_normCodeImp(x_49, x_2, x_3, x_4, x_5, x_52);
-if (lean_obj_tag(x_53) == 0)
+x_51 = l_Lean_Compiler_LCNF_normFunDeclImp(x_1, x_49, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_51) == 0)
 {
-uint8_t x_54; 
-x_54 = !lean_is_exclusive(x_53);
-if (x_54 == 0)
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_51, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_51, 1);
+lean_inc(x_53);
+lean_dec(x_51);
+lean_inc(x_50);
+x_54 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_50, x_3, x_4, x_5, x_6, x_53);
+if (lean_obj_tag(x_54) == 0)
 {
-lean_object* x_55; size_t x_56; size_t x_57; uint8_t x_58; 
-x_55 = lean_ctor_get(x_53, 0);
-x_56 = lean_ptr_addr(x_49);
-lean_dec(x_49);
-x_57 = lean_ptr_addr(x_55);
-x_58 = lean_usize_dec_eq(x_56, x_57);
-if (x_58 == 0)
+uint8_t x_55; 
+x_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
 {
-uint8_t x_59; 
-lean_dec(x_48);
-x_59 = !lean_is_exclusive(x_1);
+lean_object* x_56; size_t x_57; size_t x_58; uint8_t x_59; 
+x_56 = lean_ctor_get(x_54, 0);
+x_57 = lean_ptr_addr(x_50);
+lean_dec(x_50);
+x_58 = lean_ptr_addr(x_56);
+x_59 = lean_usize_dec_eq(x_57, x_58);
 if (x_59 == 0)
 {
-lean_object* x_60; lean_object* x_61; 
-x_60 = lean_ctor_get(x_1, 1);
-lean_dec(x_60);
-x_61 = lean_ctor_get(x_1, 0);
+uint8_t x_60; 
+lean_dec(x_49);
+x_60 = !lean_is_exclusive(x_2);
+if (x_60 == 0)
+{
+lean_object* x_61; lean_object* x_62; 
+x_61 = lean_ctor_get(x_2, 1);
 lean_dec(x_61);
-lean_ctor_set(x_1, 1, x_55);
-lean_ctor_set(x_1, 0, x_51);
-lean_ctor_set(x_53, 0, x_1);
-return x_53;
+x_62 = lean_ctor_get(x_2, 0);
+lean_dec(x_62);
+lean_ctor_set(x_2, 1, x_56);
+lean_ctor_set(x_2, 0, x_52);
+lean_ctor_set(x_54, 0, x_2);
+return x_54;
 }
 else
 {
-lean_object* x_62; 
-lean_dec(x_1);
-x_62 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_62, 0, x_51);
-lean_ctor_set(x_62, 1, x_55);
-lean_ctor_set(x_53, 0, x_62);
-return x_53;
+lean_object* x_63; 
+lean_dec(x_2);
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_52);
+lean_ctor_set(x_63, 1, x_56);
+lean_ctor_set(x_54, 0, x_63);
+return x_54;
 }
 }
 else
 {
-size_t x_63; size_t x_64; uint8_t x_65; 
-x_63 = lean_ptr_addr(x_48);
-lean_dec(x_48);
-x_64 = lean_ptr_addr(x_51);
-x_65 = lean_usize_dec_eq(x_63, x_64);
-if (x_65 == 0)
-{
-uint8_t x_66; 
-x_66 = !lean_is_exclusive(x_1);
+size_t x_64; size_t x_65; uint8_t x_66; 
+x_64 = lean_ptr_addr(x_49);
+lean_dec(x_49);
+x_65 = lean_ptr_addr(x_52);
+x_66 = lean_usize_dec_eq(x_64, x_65);
 if (x_66 == 0)
 {
-lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_1, 1);
-lean_dec(x_67);
-x_68 = lean_ctor_get(x_1, 0);
+uint8_t x_67; 
+x_67 = !lean_is_exclusive(x_2);
+if (x_67 == 0)
+{
+lean_object* x_68; lean_object* x_69; 
+x_68 = lean_ctor_get(x_2, 1);
 lean_dec(x_68);
-lean_ctor_set(x_1, 1, x_55);
-lean_ctor_set(x_1, 0, x_51);
-lean_ctor_set(x_53, 0, x_1);
-return x_53;
+x_69 = lean_ctor_get(x_2, 0);
+lean_dec(x_69);
+lean_ctor_set(x_2, 1, x_56);
+lean_ctor_set(x_2, 0, x_52);
+lean_ctor_set(x_54, 0, x_2);
+return x_54;
 }
 else
 {
-lean_object* x_69; 
-lean_dec(x_1);
-x_69 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_69, 0, x_51);
-lean_ctor_set(x_69, 1, x_55);
-lean_ctor_set(x_53, 0, x_69);
-return x_53;
+lean_object* x_70; 
+lean_dec(x_2);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_52);
+lean_ctor_set(x_70, 1, x_56);
+lean_ctor_set(x_54, 0, x_70);
+return x_54;
 }
 }
 else
 {
-lean_dec(x_55);
-lean_dec(x_51);
-lean_ctor_set(x_53, 0, x_1);
-return x_53;
+lean_dec(x_56);
+lean_dec(x_52);
+lean_ctor_set(x_54, 0, x_2);
+return x_54;
 }
 }
 }
 else
 {
-lean_object* x_70; lean_object* x_71; size_t x_72; size_t x_73; uint8_t x_74; 
-x_70 = lean_ctor_get(x_53, 0);
-x_71 = lean_ctor_get(x_53, 1);
+lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; uint8_t x_75; 
+x_71 = lean_ctor_get(x_54, 0);
+x_72 = lean_ctor_get(x_54, 1);
+lean_inc(x_72);
 lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_53);
-x_72 = lean_ptr_addr(x_49);
+lean_dec(x_54);
+x_73 = lean_ptr_addr(x_50);
+lean_dec(x_50);
+x_74 = lean_ptr_addr(x_71);
+x_75 = lean_usize_dec_eq(x_73, x_74);
+if (x_75 == 0)
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
 lean_dec(x_49);
-x_73 = lean_ptr_addr(x_70);
-x_74 = lean_usize_dec_eq(x_72, x_73);
-if (x_74 == 0)
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-lean_dec(x_48);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_75 = x_1;
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_76 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_75 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_76 = lean_box(0);
 }
-if (lean_is_scalar(x_75)) {
- x_76 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_76 = x_75;
+ x_77 = x_76;
 }
-lean_ctor_set(x_76, 0, x_51);
-lean_ctor_set(x_76, 1, x_70);
-x_77 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 0, x_52);
 lean_ctor_set(x_77, 1, x_71);
-return x_77;
+x_78 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_78, 0, x_77);
+lean_ctor_set(x_78, 1, x_72);
+return x_78;
 }
 else
 {
-size_t x_78; size_t x_79; uint8_t x_80; 
-x_78 = lean_ptr_addr(x_48);
-lean_dec(x_48);
-x_79 = lean_ptr_addr(x_51);
-x_80 = lean_usize_dec_eq(x_78, x_79);
-if (x_80 == 0)
+size_t x_79; size_t x_80; uint8_t x_81; 
+x_79 = lean_ptr_addr(x_49);
+lean_dec(x_49);
+x_80 = lean_ptr_addr(x_52);
+x_81 = lean_usize_dec_eq(x_79, x_80);
+if (x_81 == 0)
 {
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_81 = x_1;
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_82 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_81 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_82 = lean_box(0);
 }
-if (lean_is_scalar(x_81)) {
- x_82 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_82)) {
+ x_83 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_82 = x_81;
+ x_83 = x_82;
 }
-lean_ctor_set(x_82, 0, x_51);
-lean_ctor_set(x_82, 1, x_70);
-x_83 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_83, 0, x_82);
+lean_ctor_set(x_83, 0, x_52);
 lean_ctor_set(x_83, 1, x_71);
-return x_83;
-}
-else
-{
-lean_object* x_84; 
-lean_dec(x_70);
-lean_dec(x_51);
 x_84 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_84, 0, x_1);
-lean_ctor_set(x_84, 1, x_71);
+lean_ctor_set(x_84, 0, x_83);
+lean_ctor_set(x_84, 1, x_72);
 return x_84;
 }
+else
+{
+lean_object* x_85; 
+lean_dec(x_71);
+lean_dec(x_52);
+x_85 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_85, 0, x_2);
+lean_ctor_set(x_85, 1, x_72);
+return x_85;
+}
 }
 }
 }
 else
 {
-uint8_t x_85; 
-lean_dec(x_51);
+uint8_t x_86; 
+lean_dec(x_52);
+lean_dec(x_50);
 lean_dec(x_49);
-lean_dec(x_48);
-lean_dec(x_1);
-x_85 = !lean_is_exclusive(x_53);
-if (x_85 == 0)
+lean_dec(x_2);
+x_86 = !lean_is_exclusive(x_54);
+if (x_86 == 0)
 {
-return x_53;
+return x_54;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_53, 0);
-x_87 = lean_ctor_get(x_53, 1);
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_54, 0);
+x_88 = lean_ctor_get(x_54, 1);
+lean_inc(x_88);
 lean_inc(x_87);
-lean_inc(x_86);
-lean_dec(x_53);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_86);
-lean_ctor_set(x_88, 1, x_87);
-return x_88;
+lean_dec(x_54);
+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_89; 
+uint8_t x_90; 
+lean_dec(x_50);
 lean_dec(x_49);
-lean_dec(x_48);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_1);
-x_89 = !lean_is_exclusive(x_50);
-if (x_89 == 0)
+x_90 = !lean_is_exclusive(x_51);
+if (x_90 == 0)
 {
-return x_50;
+return x_51;
 }
 else
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_50, 0);
-x_91 = lean_ctor_get(x_50, 1);
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_51, 0);
+x_92 = lean_ctor_get(x_51, 1);
+lean_inc(x_92);
 lean_inc(x_91);
-lean_inc(x_90);
-lean_dec(x_50);
-x_92 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-return x_92;
+lean_dec(x_51);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
 }
 }
 }
 case 2:
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_1, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_1, 1);
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_2, 0);
 lean_inc(x_94);
+x_95 = lean_ctor_get(x_2, 1);
+lean_inc(x_95);
+lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_93);
-x_95 = l_Lean_Compiler_LCNF_normFunDeclImp(x_93, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_95) == 0)
-{
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-lean_dec(x_95);
 lean_inc(x_94);
-x_98 = l_Lean_Compiler_LCNF_normCodeImp(x_94, x_2, x_3, x_4, x_5, x_97);
-if (lean_obj_tag(x_98) == 0)
+x_96 = l_Lean_Compiler_LCNF_normFunDeclImp(x_1, x_94, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_96) == 0)
 {
-uint8_t x_99; 
-x_99 = !lean_is_exclusive(x_98);
-if (x_99 == 0)
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_96, 0);
+lean_inc(x_97);
+x_98 = lean_ctor_get(x_96, 1);
+lean_inc(x_98);
+lean_dec(x_96);
+lean_inc(x_95);
+x_99 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_95, x_3, x_4, x_5, x_6, x_98);
+if (lean_obj_tag(x_99) == 0)
 {
-lean_object* x_100; size_t x_101; size_t x_102; uint8_t x_103; 
-x_100 = lean_ctor_get(x_98, 0);
-x_101 = lean_ptr_addr(x_94);
-lean_dec(x_94);
-x_102 = lean_ptr_addr(x_100);
-x_103 = lean_usize_dec_eq(x_101, x_102);
-if (x_103 == 0)
+uint8_t x_100; 
+x_100 = !lean_is_exclusive(x_99);
+if (x_100 == 0)
 {
-uint8_t x_104; 
-lean_dec(x_93);
-x_104 = !lean_is_exclusive(x_1);
+lean_object* x_101; size_t x_102; size_t x_103; uint8_t x_104; 
+x_101 = lean_ctor_get(x_99, 0);
+x_102 = lean_ptr_addr(x_95);
+lean_dec(x_95);
+x_103 = lean_ptr_addr(x_101);
+x_104 = lean_usize_dec_eq(x_102, x_103);
 if (x_104 == 0)
 {
-lean_object* x_105; lean_object* x_106; 
-x_105 = lean_ctor_get(x_1, 1);
-lean_dec(x_105);
-x_106 = lean_ctor_get(x_1, 0);
+uint8_t x_105; 
+lean_dec(x_94);
+x_105 = !lean_is_exclusive(x_2);
+if (x_105 == 0)
+{
+lean_object* x_106; lean_object* x_107; 
+x_106 = lean_ctor_get(x_2, 1);
 lean_dec(x_106);
-lean_ctor_set(x_1, 1, x_100);
-lean_ctor_set(x_1, 0, x_96);
-lean_ctor_set(x_98, 0, x_1);
-return x_98;
+x_107 = lean_ctor_get(x_2, 0);
+lean_dec(x_107);
+lean_ctor_set(x_2, 1, x_101);
+lean_ctor_set(x_2, 0, x_97);
+lean_ctor_set(x_99, 0, x_2);
+return x_99;
 }
 else
 {
-lean_object* x_107; 
-lean_dec(x_1);
-x_107 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_107, 0, x_96);
-lean_ctor_set(x_107, 1, x_100);
-lean_ctor_set(x_98, 0, x_107);
-return x_98;
+lean_object* x_108; 
+lean_dec(x_2);
+x_108 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_108, 0, x_97);
+lean_ctor_set(x_108, 1, x_101);
+lean_ctor_set(x_99, 0, x_108);
+return x_99;
 }
 }
 else
 {
-size_t x_108; size_t x_109; uint8_t x_110; 
-x_108 = lean_ptr_addr(x_93);
-lean_dec(x_93);
-x_109 = lean_ptr_addr(x_96);
-x_110 = lean_usize_dec_eq(x_108, x_109);
-if (x_110 == 0)
-{
-uint8_t x_111; 
-x_111 = !lean_is_exclusive(x_1);
+size_t x_109; size_t x_110; uint8_t x_111; 
+x_109 = lean_ptr_addr(x_94);
+lean_dec(x_94);
+x_110 = lean_ptr_addr(x_97);
+x_111 = lean_usize_dec_eq(x_109, x_110);
 if (x_111 == 0)
 {
-lean_object* x_112; lean_object* x_113; 
-x_112 = lean_ctor_get(x_1, 1);
-lean_dec(x_112);
-x_113 = lean_ctor_get(x_1, 0);
+uint8_t x_112; 
+x_112 = !lean_is_exclusive(x_2);
+if (x_112 == 0)
+{
+lean_object* x_113; lean_object* x_114; 
+x_113 = lean_ctor_get(x_2, 1);
 lean_dec(x_113);
-lean_ctor_set(x_1, 1, x_100);
-lean_ctor_set(x_1, 0, x_96);
-lean_ctor_set(x_98, 0, x_1);
-return x_98;
+x_114 = lean_ctor_get(x_2, 0);
+lean_dec(x_114);
+lean_ctor_set(x_2, 1, x_101);
+lean_ctor_set(x_2, 0, x_97);
+lean_ctor_set(x_99, 0, x_2);
+return x_99;
 }
 else
 {
-lean_object* x_114; 
-lean_dec(x_1);
-x_114 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_114, 0, x_96);
-lean_ctor_set(x_114, 1, x_100);
-lean_ctor_set(x_98, 0, x_114);
-return x_98;
+lean_object* x_115; 
+lean_dec(x_2);
+x_115 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_115, 0, x_97);
+lean_ctor_set(x_115, 1, x_101);
+lean_ctor_set(x_99, 0, x_115);
+return x_99;
 }
 }
 else
 {
-lean_dec(x_100);
-lean_dec(x_96);
-lean_ctor_set(x_98, 0, x_1);
-return x_98;
+lean_dec(x_101);
+lean_dec(x_97);
+lean_ctor_set(x_99, 0, x_2);
+return x_99;
 }
 }
 }
 else
 {
-lean_object* x_115; lean_object* x_116; size_t x_117; size_t x_118; uint8_t x_119; 
-x_115 = lean_ctor_get(x_98, 0);
-x_116 = lean_ctor_get(x_98, 1);
+lean_object* x_116; lean_object* x_117; size_t x_118; size_t x_119; uint8_t x_120; 
+x_116 = lean_ctor_get(x_99, 0);
+x_117 = lean_ctor_get(x_99, 1);
+lean_inc(x_117);
 lean_inc(x_116);
-lean_inc(x_115);
-lean_dec(x_98);
-x_117 = lean_ptr_addr(x_94);
+lean_dec(x_99);
+x_118 = lean_ptr_addr(x_95);
+lean_dec(x_95);
+x_119 = lean_ptr_addr(x_116);
+x_120 = lean_usize_dec_eq(x_118, x_119);
+if (x_120 == 0)
+{
+lean_object* x_121; lean_object* x_122; lean_object* x_123; 
 lean_dec(x_94);
-x_118 = lean_ptr_addr(x_115);
-x_119 = lean_usize_dec_eq(x_117, x_118);
-if (x_119 == 0)
-{
-lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-lean_dec(x_93);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_120 = x_1;
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_121 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_120 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_121 = lean_box(0);
 }
-if (lean_is_scalar(x_120)) {
- x_121 = lean_alloc_ctor(2, 2, 0);
+if (lean_is_scalar(x_121)) {
+ x_122 = lean_alloc_ctor(2, 2, 0);
 } else {
- x_121 = x_120;
+ x_122 = x_121;
 }
-lean_ctor_set(x_121, 0, x_96);
-lean_ctor_set(x_121, 1, x_115);
-x_122 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_122, 0, x_121);
+lean_ctor_set(x_122, 0, x_97);
 lean_ctor_set(x_122, 1, x_116);
-return x_122;
+x_123 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_123, 0, x_122);
+lean_ctor_set(x_123, 1, x_117);
+return x_123;
 }
 else
 {
-size_t x_123; size_t x_124; uint8_t x_125; 
-x_123 = lean_ptr_addr(x_93);
-lean_dec(x_93);
-x_124 = lean_ptr_addr(x_96);
-x_125 = lean_usize_dec_eq(x_123, x_124);
-if (x_125 == 0)
+size_t x_124; size_t x_125; uint8_t x_126; 
+x_124 = lean_ptr_addr(x_94);
+lean_dec(x_94);
+x_125 = lean_ptr_addr(x_97);
+x_126 = lean_usize_dec_eq(x_124, x_125);
+if (x_126 == 0)
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_126 = x_1;
+lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_127 = x_2;
 } else {
- lean_dec_ref(x_1);
- x_126 = lean_box(0);
+ lean_dec_ref(x_2);
+ x_127 = lean_box(0);
 }
-if (lean_is_scalar(x_126)) {
- x_127 = lean_alloc_ctor(2, 2, 0);
+if (lean_is_scalar(x_127)) {
+ x_128 = lean_alloc_ctor(2, 2, 0);
 } else {
- x_127 = x_126;
+ x_128 = x_127;
 }
-lean_ctor_set(x_127, 0, x_96);
-lean_ctor_set(x_127, 1, x_115);
-x_128 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_128, 0, x_127);
+lean_ctor_set(x_128, 0, x_97);
 lean_ctor_set(x_128, 1, x_116);
-return x_128;
-}
-else
-{
-lean_object* x_129; 
-lean_dec(x_115);
-lean_dec(x_96);
 x_129 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_129, 0, x_1);
-lean_ctor_set(x_129, 1, x_116);
+lean_ctor_set(x_129, 0, x_128);
+lean_ctor_set(x_129, 1, x_117);
 return x_129;
 }
+else
+{
+lean_object* x_130; 
+lean_dec(x_116);
+lean_dec(x_97);
+x_130 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_130, 0, x_2);
+lean_ctor_set(x_130, 1, x_117);
+return x_130;
+}
 }
 }
 }
 else
 {
-uint8_t x_130; 
-lean_dec(x_96);
+uint8_t x_131; 
+lean_dec(x_97);
+lean_dec(x_95);
 lean_dec(x_94);
-lean_dec(x_93);
-lean_dec(x_1);
-x_130 = !lean_is_exclusive(x_98);
-if (x_130 == 0)
+lean_dec(x_2);
+x_131 = !lean_is_exclusive(x_99);
+if (x_131 == 0)
 {
-return x_98;
+return x_99;
 }
 else
 {
-lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_131 = lean_ctor_get(x_98, 0);
-x_132 = lean_ctor_get(x_98, 1);
+lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+x_132 = lean_ctor_get(x_99, 0);
+x_133 = lean_ctor_get(x_99, 1);
+lean_inc(x_133);
 lean_inc(x_132);
-lean_inc(x_131);
-lean_dec(x_98);
-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;
+lean_dec(x_99);
+x_134 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_134, 0, x_132);
+lean_ctor_set(x_134, 1, x_133);
+return x_134;
 }
 }
 }
 else
 {
-uint8_t x_134; 
+uint8_t x_135; 
+lean_dec(x_95);
 lean_dec(x_94);
-lean_dec(x_93);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_1);
-x_134 = !lean_is_exclusive(x_95);
-if (x_134 == 0)
+x_135 = !lean_is_exclusive(x_96);
+if (x_135 == 0)
 {
-return x_95;
+return x_96;
 }
 else
 {
-lean_object* x_135; lean_object* x_136; lean_object* x_137; 
-x_135 = lean_ctor_get(x_95, 0);
-x_136 = lean_ctor_get(x_95, 1);
+lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_136 = lean_ctor_get(x_96, 0);
+x_137 = lean_ctor_get(x_96, 1);
+lean_inc(x_137);
 lean_inc(x_136);
-lean_inc(x_135);
-lean_dec(x_95);
-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;
+lean_dec(x_96);
+x_138 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_138, 0, x_136);
+lean_ctor_set(x_138, 1, x_137);
+return x_138;
 }
 }
 }
 case 3:
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
-x_138 = lean_ctor_get(x_1, 0);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_1, 1);
+lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_139 = lean_ctor_get(x_2, 0);
 lean_inc(x_139);
-lean_inc(x_138);
-lean_inc(x_2);
-x_140 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_2, x_138);
+x_140 = lean_ctor_get(x_2, 1);
+lean_inc(x_140);
 lean_inc(x_139);
-x_141 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(x_139, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_141) == 0)
+lean_inc(x_3);
+x_141 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_3, x_139, x_1);
+lean_inc(x_140);
+x_142 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(x_1, x_1, x_140, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_142) == 0)
 {
-uint8_t x_142; 
-x_142 = !lean_is_exclusive(x_141);
-if (x_142 == 0)
+uint8_t x_143; 
+x_143 = !lean_is_exclusive(x_142);
+if (x_143 == 0)
 {
-lean_object* x_143; uint8_t x_144; 
-x_143 = lean_ctor_get(x_141, 0);
-x_144 = lean_name_eq(x_138, x_140);
-lean_dec(x_138);
-if (x_144 == 0)
-{
-uint8_t x_145; 
+lean_object* x_144; uint8_t x_145; 
+x_144 = lean_ctor_get(x_142, 0);
+x_145 = lean_name_eq(x_139, x_141);
 lean_dec(x_139);
-x_145 = !lean_is_exclusive(x_1);
 if (x_145 == 0)
 {
-lean_object* x_146; lean_object* x_147; 
-x_146 = lean_ctor_get(x_1, 1);
-lean_dec(x_146);
-x_147 = lean_ctor_get(x_1, 0);
+uint8_t x_146; 
+lean_dec(x_140);
+x_146 = !lean_is_exclusive(x_2);
+if (x_146 == 0)
+{
+lean_object* x_147; lean_object* x_148; 
+x_147 = lean_ctor_get(x_2, 1);
 lean_dec(x_147);
-lean_ctor_set(x_1, 1, x_143);
-lean_ctor_set(x_1, 0, x_140);
-lean_ctor_set(x_141, 0, x_1);
-return x_141;
+x_148 = lean_ctor_get(x_2, 0);
+lean_dec(x_148);
+lean_ctor_set(x_2, 1, x_144);
+lean_ctor_set(x_2, 0, x_141);
+lean_ctor_set(x_142, 0, x_2);
+return x_142;
 }
 else
 {
-lean_object* x_148; 
-lean_dec(x_1);
-x_148 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_148, 0, x_140);
-lean_ctor_set(x_148, 1, x_143);
-lean_ctor_set(x_141, 0, x_148);
-return x_141;
+lean_object* x_149; 
+lean_dec(x_2);
+x_149 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_149, 0, x_141);
+lean_ctor_set(x_149, 1, x_144);
+lean_ctor_set(x_142, 0, x_149);
+return x_142;
 }
 }
 else
 {
-size_t x_149; size_t x_150; uint8_t x_151; 
-x_149 = lean_ptr_addr(x_139);
-lean_dec(x_139);
-x_150 = lean_ptr_addr(x_143);
-x_151 = lean_usize_dec_eq(x_149, x_150);
-if (x_151 == 0)
-{
-uint8_t x_152; 
-x_152 = !lean_is_exclusive(x_1);
+size_t x_150; size_t x_151; uint8_t x_152; 
+x_150 = lean_ptr_addr(x_140);
+lean_dec(x_140);
+x_151 = lean_ptr_addr(x_144);
+x_152 = lean_usize_dec_eq(x_150, x_151);
 if (x_152 == 0)
 {
-lean_object* x_153; lean_object* x_154; 
-x_153 = lean_ctor_get(x_1, 1);
-lean_dec(x_153);
-x_154 = lean_ctor_get(x_1, 0);
+uint8_t x_153; 
+x_153 = !lean_is_exclusive(x_2);
+if (x_153 == 0)
+{
+lean_object* x_154; lean_object* x_155; 
+x_154 = lean_ctor_get(x_2, 1);
 lean_dec(x_154);
-lean_ctor_set(x_1, 1, x_143);
-lean_ctor_set(x_1, 0, x_140);
-lean_ctor_set(x_141, 0, x_1);
-return x_141;
+x_155 = lean_ctor_get(x_2, 0);
+lean_dec(x_155);
+lean_ctor_set(x_2, 1, x_144);
+lean_ctor_set(x_2, 0, x_141);
+lean_ctor_set(x_142, 0, x_2);
+return x_142;
 }
 else
 {
-lean_object* x_155; 
-lean_dec(x_1);
-x_155 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_155, 0, x_140);
-lean_ctor_set(x_155, 1, x_143);
-lean_ctor_set(x_141, 0, x_155);
-return x_141;
+lean_object* x_156; 
+lean_dec(x_2);
+x_156 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_156, 0, x_141);
+lean_ctor_set(x_156, 1, x_144);
+lean_ctor_set(x_142, 0, x_156);
+return x_142;
 }
 }
 else
 {
-lean_dec(x_143);
-lean_dec(x_140);
-lean_ctor_set(x_141, 0, x_1);
-return x_141;
-}
-}
-}
-else
-{
-lean_object* x_156; lean_object* x_157; uint8_t x_158; 
-x_156 = lean_ctor_get(x_141, 0);
-x_157 = lean_ctor_get(x_141, 1);
-lean_inc(x_157);
-lean_inc(x_156);
+lean_dec(x_144);
 lean_dec(x_141);
-x_158 = lean_name_eq(x_138, x_140);
-lean_dec(x_138);
-if (x_158 == 0)
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; 
-lean_dec(x_139);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_159 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_159 = lean_box(0);
+lean_ctor_set(x_142, 0, x_2);
+return x_142;
 }
-if (lean_is_scalar(x_159)) {
- x_160 = lean_alloc_ctor(3, 2, 0);
-} else {
- x_160 = x_159;
 }
-lean_ctor_set(x_160, 0, x_140);
-lean_ctor_set(x_160, 1, x_156);
-x_161 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_161, 0, x_160);
-lean_ctor_set(x_161, 1, x_157);
-return x_161;
 }
 else
 {
-size_t x_162; size_t x_163; uint8_t x_164; 
-x_162 = lean_ptr_addr(x_139);
+lean_object* x_157; lean_object* x_158; uint8_t x_159; 
+x_157 = lean_ctor_get(x_142, 0);
+x_158 = lean_ctor_get(x_142, 1);
+lean_inc(x_158);
+lean_inc(x_157);
+lean_dec(x_142);
+x_159 = lean_name_eq(x_139, x_141);
 lean_dec(x_139);
-x_163 = lean_ptr_addr(x_156);
-x_164 = lean_usize_dec_eq(x_162, x_163);
-if (x_164 == 0)
+if (x_159 == 0)
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- x_165 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_165 = lean_box(0);
-}
-if (lean_is_scalar(x_165)) {
- x_166 = lean_alloc_ctor(3, 2, 0);
-} else {
- x_166 = x_165;
-}
-lean_ctor_set(x_166, 0, x_140);
-lean_ctor_set(x_166, 1, x_156);
-x_167 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_167, 0, x_166);
-lean_ctor_set(x_167, 1, x_157);
-return x_167;
-}
-else
-{
-lean_object* x_168; 
-lean_dec(x_156);
+lean_object* x_160; lean_object* x_161; lean_object* x_162; 
 lean_dec(x_140);
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_160 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_160 = lean_box(0);
+}
+if (lean_is_scalar(x_160)) {
+ x_161 = lean_alloc_ctor(3, 2, 0);
+} else {
+ x_161 = x_160;
+}
+lean_ctor_set(x_161, 0, x_141);
+lean_ctor_set(x_161, 1, x_157);
+x_162 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_162, 0, x_161);
+lean_ctor_set(x_162, 1, x_158);
+return x_162;
+}
+else
+{
+size_t x_163; size_t x_164; uint8_t x_165; 
+x_163 = lean_ptr_addr(x_140);
+lean_dec(x_140);
+x_164 = lean_ptr_addr(x_157);
+x_165 = lean_usize_dec_eq(x_163, x_164);
+if (x_165 == 0)
+{
+lean_object* x_166; lean_object* x_167; lean_object* x_168; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ lean_ctor_release(x_2, 1);
+ x_166 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_166 = lean_box(0);
+}
+if (lean_is_scalar(x_166)) {
+ x_167 = lean_alloc_ctor(3, 2, 0);
+} else {
+ x_167 = x_166;
+}
+lean_ctor_set(x_167, 0, x_141);
+lean_ctor_set(x_167, 1, x_157);
 x_168 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_168, 0, x_1);
-lean_ctor_set(x_168, 1, x_157);
+lean_ctor_set(x_168, 0, x_167);
+lean_ctor_set(x_168, 1, x_158);
 return x_168;
 }
+else
+{
+lean_object* x_169; 
+lean_dec(x_157);
+lean_dec(x_141);
+x_169 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_169, 0, x_2);
+lean_ctor_set(x_169, 1, x_158);
+return x_169;
+}
 }
 }
 }
 else
 {
-uint8_t x_169; 
+uint8_t x_170; 
+lean_dec(x_141);
 lean_dec(x_140);
 lean_dec(x_139);
-lean_dec(x_138);
-lean_dec(x_1);
-x_169 = !lean_is_exclusive(x_141);
-if (x_169 == 0)
+lean_dec(x_2);
+x_170 = !lean_is_exclusive(x_142);
+if (x_170 == 0)
 {
-return x_141;
+return x_142;
 }
 else
 {
-lean_object* x_170; lean_object* x_171; lean_object* x_172; 
-x_170 = lean_ctor_get(x_141, 0);
-x_171 = lean_ctor_get(x_141, 1);
+lean_object* x_171; lean_object* x_172; lean_object* x_173; 
+x_171 = lean_ctor_get(x_142, 0);
+x_172 = lean_ctor_get(x_142, 1);
+lean_inc(x_172);
 lean_inc(x_171);
-lean_inc(x_170);
-lean_dec(x_141);
-x_172 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_172, 0, x_170);
-lean_ctor_set(x_172, 1, x_171);
-return x_172;
+lean_dec(x_142);
+x_173 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_173, 0, x_171);
+lean_ctor_set(x_173, 1, x_172);
+return x_173;
 }
 }
 }
 case 4:
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_173 = lean_ctor_get(x_1, 0);
-lean_inc(x_173);
-x_174 = lean_ctor_get(x_173, 1);
+lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; 
+x_174 = lean_ctor_get(x_2, 0);
 lean_inc(x_174);
-lean_inc(x_2);
-x_175 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_174);
-x_176 = lean_ctor_get(x_173, 2);
-lean_inc(x_176);
-lean_inc(x_2);
-x_177 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_2, x_176);
-x_178 = lean_ctor_get(x_173, 3);
-lean_inc(x_178);
-x_179 = l_Lean_Compiler_LCNF_normCodeImp___closed__1;
-x_180 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__6(x_178, x_179, x_2, x_3, x_4, x_5, x_6);
-if (lean_obj_tag(x_180) == 0)
+x_175 = lean_ctor_get(x_174, 1);
+lean_inc(x_175);
+lean_inc(x_3);
+x_176 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_175);
+x_177 = lean_ctor_get(x_174, 2);
+lean_inc(x_177);
+lean_inc(x_3);
+x_178 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_3, x_177, x_1);
+x_179 = lean_ctor_get(x_174, 3);
+lean_inc(x_179);
+x_180 = lean_box(x_1);
+x_181 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCodeImp___lambda__1___boxed), 7, 1);
+lean_closure_set(x_181, 0, x_180);
+x_182 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__10(x_1, x_179, x_181, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_182) == 0)
 {
-uint8_t x_181; 
-x_181 = !lean_is_exclusive(x_180);
-if (x_181 == 0)
+uint8_t x_183; 
+x_183 = !lean_is_exclusive(x_182);
+if (x_183 == 0)
 {
-uint8_t x_182; 
-x_182 = !lean_is_exclusive(x_173);
-if (x_182 == 0)
+uint8_t x_184; 
+x_184 = !lean_is_exclusive(x_174);
+if (x_184 == 0)
 {
-lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; size_t x_188; size_t x_189; uint8_t x_190; 
-x_183 = lean_ctor_get(x_180, 0);
-x_184 = lean_ctor_get(x_173, 0);
-x_185 = lean_ctor_get(x_173, 1);
-x_186 = lean_ctor_get(x_173, 2);
-x_187 = lean_ctor_get(x_173, 3);
-x_188 = lean_ptr_addr(x_187);
+lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; size_t x_190; size_t x_191; uint8_t x_192; 
+x_185 = lean_ctor_get(x_182, 0);
+x_186 = lean_ctor_get(x_174, 0);
+x_187 = lean_ctor_get(x_174, 1);
+x_188 = lean_ctor_get(x_174, 2);
+x_189 = lean_ctor_get(x_174, 3);
+x_190 = lean_ptr_addr(x_189);
+lean_dec(x_189);
+x_191 = lean_ptr_addr(x_185);
+x_192 = lean_usize_dec_eq(x_190, x_191);
+if (x_192 == 0)
+{
+uint8_t x_193; 
+lean_dec(x_188);
 lean_dec(x_187);
-x_189 = lean_ptr_addr(x_183);
-x_190 = lean_usize_dec_eq(x_188, x_189);
-if (x_190 == 0)
+x_193 = !lean_is_exclusive(x_2);
+if (x_193 == 0)
 {
-uint8_t x_191; 
+lean_object* x_194; 
+x_194 = lean_ctor_get(x_2, 0);
+lean_dec(x_194);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+lean_ctor_set(x_182, 0, x_2);
+return x_182;
+}
+else
+{
+lean_object* x_195; 
+lean_dec(x_2);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+x_195 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_195, 0, x_174);
+lean_ctor_set(x_182, 0, x_195);
+return x_182;
+}
+}
+else
+{
+size_t x_196; size_t x_197; uint8_t x_198; 
+x_196 = lean_ptr_addr(x_187);
+lean_dec(x_187);
+x_197 = lean_ptr_addr(x_176);
+x_198 = lean_usize_dec_eq(x_196, x_197);
+if (x_198 == 0)
+{
+uint8_t x_199; 
+lean_dec(x_188);
+x_199 = !lean_is_exclusive(x_2);
+if (x_199 == 0)
+{
+lean_object* x_200; 
+x_200 = lean_ctor_get(x_2, 0);
+lean_dec(x_200);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+lean_ctor_set(x_182, 0, x_2);
+return x_182;
+}
+else
+{
+lean_object* x_201; 
+lean_dec(x_2);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+x_201 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_201, 0, x_174);
+lean_ctor_set(x_182, 0, x_201);
+return x_182;
+}
+}
+else
+{
+uint8_t x_202; 
+x_202 = lean_name_eq(x_188, x_178);
+lean_dec(x_188);
+if (x_202 == 0)
+{
+uint8_t x_203; 
+x_203 = !lean_is_exclusive(x_2);
+if (x_203 == 0)
+{
+lean_object* x_204; 
+x_204 = lean_ctor_get(x_2, 0);
+lean_dec(x_204);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+lean_ctor_set(x_182, 0, x_2);
+return x_182;
+}
+else
+{
+lean_object* x_205; 
+lean_dec(x_2);
+lean_ctor_set(x_174, 3, x_185);
+lean_ctor_set(x_174, 2, x_178);
+lean_ctor_set(x_174, 1, x_176);
+x_205 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_205, 0, x_174);
+lean_ctor_set(x_182, 0, x_205);
+return x_182;
+}
+}
+else
+{
+lean_free_object(x_174);
 lean_dec(x_186);
 lean_dec(x_185);
-x_191 = !lean_is_exclusive(x_1);
-if (x_191 == 0)
-{
-lean_object* x_192; 
-x_192 = lean_ctor_get(x_1, 0);
-lean_dec(x_192);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-lean_ctor_set(x_180, 0, x_1);
-return x_180;
-}
-else
-{
-lean_object* x_193; 
-lean_dec(x_1);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-x_193 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_193, 0, x_173);
-lean_ctor_set(x_180, 0, x_193);
-return x_180;
-}
-}
-else
-{
-size_t x_194; size_t x_195; uint8_t x_196; 
-x_194 = lean_ptr_addr(x_185);
-lean_dec(x_185);
-x_195 = lean_ptr_addr(x_175);
-x_196 = lean_usize_dec_eq(x_194, x_195);
-if (x_196 == 0)
-{
-uint8_t x_197; 
-lean_dec(x_186);
-x_197 = !lean_is_exclusive(x_1);
-if (x_197 == 0)
-{
-lean_object* x_198; 
-x_198 = lean_ctor_get(x_1, 0);
-lean_dec(x_198);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-lean_ctor_set(x_180, 0, x_1);
-return x_180;
-}
-else
-{
-lean_object* x_199; 
-lean_dec(x_1);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-x_199 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_199, 0, x_173);
-lean_ctor_set(x_180, 0, x_199);
-return x_180;
-}
-}
-else
-{
-uint8_t x_200; 
-x_200 = lean_name_eq(x_186, x_177);
-lean_dec(x_186);
-if (x_200 == 0)
-{
-uint8_t x_201; 
-x_201 = !lean_is_exclusive(x_1);
-if (x_201 == 0)
-{
-lean_object* x_202; 
-x_202 = lean_ctor_get(x_1, 0);
-lean_dec(x_202);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-lean_ctor_set(x_180, 0, x_1);
-return x_180;
-}
-else
-{
-lean_object* x_203; 
-lean_dec(x_1);
-lean_ctor_set(x_173, 3, x_183);
-lean_ctor_set(x_173, 2, x_177);
-lean_ctor_set(x_173, 1, x_175);
-x_203 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_203, 0, x_173);
-lean_ctor_set(x_180, 0, x_203);
-return x_180;
-}
-}
-else
-{
-lean_free_object(x_173);
-lean_dec(x_184);
-lean_dec(x_183);
-lean_dec(x_177);
-lean_dec(x_175);
-lean_ctor_set(x_180, 0, x_1);
-return x_180;
+lean_dec(x_178);
+lean_dec(x_176);
+lean_ctor_set(x_182, 0, x_2);
+return x_182;
 }
 }
 }
 }
 else
 {
-lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; size_t x_209; size_t x_210; uint8_t x_211; 
-x_204 = lean_ctor_get(x_180, 0);
-x_205 = lean_ctor_get(x_173, 0);
-x_206 = lean_ctor_get(x_173, 1);
-x_207 = lean_ctor_get(x_173, 2);
-x_208 = lean_ctor_get(x_173, 3);
+lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; size_t x_211; size_t x_212; uint8_t x_213; 
+x_206 = lean_ctor_get(x_182, 0);
+x_207 = lean_ctor_get(x_174, 0);
+x_208 = lean_ctor_get(x_174, 1);
+x_209 = lean_ctor_get(x_174, 2);
+x_210 = lean_ctor_get(x_174, 3);
+lean_inc(x_210);
+lean_inc(x_209);
 lean_inc(x_208);
 lean_inc(x_207);
-lean_inc(x_206);
-lean_inc(x_205);
-lean_dec(x_173);
-x_209 = lean_ptr_addr(x_208);
+lean_dec(x_174);
+x_211 = lean_ptr_addr(x_210);
+lean_dec(x_210);
+x_212 = lean_ptr_addr(x_206);
+x_213 = lean_usize_dec_eq(x_211, x_212);
+if (x_213 == 0)
+{
+lean_object* x_214; lean_object* x_215; lean_object* x_216; 
+lean_dec(x_209);
 lean_dec(x_208);
-x_210 = lean_ptr_addr(x_204);
-x_211 = lean_usize_dec_eq(x_209, x_210);
-if (x_211 == 0)
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_214 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_214 = lean_box(0);
+}
+x_215 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_215, 0, x_207);
+lean_ctor_set(x_215, 1, x_176);
+lean_ctor_set(x_215, 2, x_178);
+lean_ctor_set(x_215, 3, x_206);
+if (lean_is_scalar(x_214)) {
+ x_216 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_216 = x_214;
+}
+lean_ctor_set(x_216, 0, x_215);
+lean_ctor_set(x_182, 0, x_216);
+return x_182;
+}
+else
+{
+size_t x_217; size_t x_218; uint8_t x_219; 
+x_217 = lean_ptr_addr(x_208);
+lean_dec(x_208);
+x_218 = lean_ptr_addr(x_176);
+x_219 = lean_usize_dec_eq(x_217, x_218);
+if (x_219 == 0)
+{
+lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+lean_dec(x_209);
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_220 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_220 = lean_box(0);
+}
+x_221 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_221, 0, x_207);
+lean_ctor_set(x_221, 1, x_176);
+lean_ctor_set(x_221, 2, x_178);
+lean_ctor_set(x_221, 3, x_206);
+if (lean_is_scalar(x_220)) {
+ x_222 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_222 = x_220;
+}
+lean_ctor_set(x_222, 0, x_221);
+lean_ctor_set(x_182, 0, x_222);
+return x_182;
+}
+else
+{
+uint8_t x_223; 
+x_223 = lean_name_eq(x_209, x_178);
+lean_dec(x_209);
+if (x_223 == 0)
+{
+lean_object* x_224; lean_object* x_225; lean_object* x_226; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_224 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_224 = lean_box(0);
+}
+x_225 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_225, 0, x_207);
+lean_ctor_set(x_225, 1, x_176);
+lean_ctor_set(x_225, 2, x_178);
+lean_ctor_set(x_225, 3, x_206);
+if (lean_is_scalar(x_224)) {
+ x_226 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_226 = x_224;
+}
+lean_ctor_set(x_226, 0, x_225);
+lean_ctor_set(x_182, 0, x_226);
+return x_182;
+}
+else
 {
-lean_object* x_212; lean_object* x_213; lean_object* x_214; 
 lean_dec(x_207);
 lean_dec(x_206);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_212 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_212 = lean_box(0);
-}
-x_213 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_213, 0, x_205);
-lean_ctor_set(x_213, 1, x_175);
-lean_ctor_set(x_213, 2, x_177);
-lean_ctor_set(x_213, 3, x_204);
-if (lean_is_scalar(x_212)) {
- x_214 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_214 = x_212;
-}
-lean_ctor_set(x_214, 0, x_213);
-lean_ctor_set(x_180, 0, x_214);
-return x_180;
-}
-else
-{
-size_t x_215; size_t x_216; uint8_t x_217; 
-x_215 = lean_ptr_addr(x_206);
-lean_dec(x_206);
-x_216 = lean_ptr_addr(x_175);
-x_217 = lean_usize_dec_eq(x_215, x_216);
-if (x_217 == 0)
-{
-lean_object* x_218; lean_object* x_219; lean_object* x_220; 
-lean_dec(x_207);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_218 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_218 = lean_box(0);
-}
-x_219 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_219, 0, x_205);
-lean_ctor_set(x_219, 1, x_175);
-lean_ctor_set(x_219, 2, x_177);
-lean_ctor_set(x_219, 3, x_204);
-if (lean_is_scalar(x_218)) {
- x_220 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_220 = x_218;
-}
-lean_ctor_set(x_220, 0, x_219);
-lean_ctor_set(x_180, 0, x_220);
-return x_180;
-}
-else
-{
-uint8_t x_221; 
-x_221 = lean_name_eq(x_207, x_177);
-lean_dec(x_207);
-if (x_221 == 0)
-{
-lean_object* x_222; lean_object* x_223; lean_object* x_224; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_222 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_222 = lean_box(0);
-}
-x_223 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_223, 0, x_205);
-lean_ctor_set(x_223, 1, x_175);
-lean_ctor_set(x_223, 2, x_177);
-lean_ctor_set(x_223, 3, x_204);
-if (lean_is_scalar(x_222)) {
- x_224 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_224 = x_222;
-}
-lean_ctor_set(x_224, 0, x_223);
-lean_ctor_set(x_180, 0, x_224);
-return x_180;
-}
-else
-{
-lean_dec(x_205);
-lean_dec(x_204);
-lean_dec(x_177);
-lean_dec(x_175);
-lean_ctor_set(x_180, 0, x_1);
-return x_180;
+lean_dec(x_178);
+lean_dec(x_176);
+lean_ctor_set(x_182, 0, x_2);
+return x_182;
 }
 }
 }
@@ -9549,151 +10087,151 @@ return x_180;
 }
 else
 {
-lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; size_t x_232; size_t x_233; uint8_t x_234; 
-x_225 = lean_ctor_get(x_180, 0);
-x_226 = lean_ctor_get(x_180, 1);
-lean_inc(x_226);
-lean_inc(x_225);
-lean_dec(x_180);
-x_227 = lean_ctor_get(x_173, 0);
-lean_inc(x_227);
-x_228 = lean_ctor_get(x_173, 1);
+lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; size_t x_234; size_t x_235; uint8_t x_236; 
+x_227 = lean_ctor_get(x_182, 0);
+x_228 = lean_ctor_get(x_182, 1);
 lean_inc(x_228);
-x_229 = lean_ctor_get(x_173, 2);
+lean_inc(x_227);
+lean_dec(x_182);
+x_229 = lean_ctor_get(x_174, 0);
 lean_inc(x_229);
-x_230 = lean_ctor_get(x_173, 3);
+x_230 = lean_ctor_get(x_174, 1);
 lean_inc(x_230);
-if (lean_is_exclusive(x_173)) {
- lean_ctor_release(x_173, 0);
- lean_ctor_release(x_173, 1);
- lean_ctor_release(x_173, 2);
- lean_ctor_release(x_173, 3);
- x_231 = x_173;
+x_231 = lean_ctor_get(x_174, 2);
+lean_inc(x_231);
+x_232 = lean_ctor_get(x_174, 3);
+lean_inc(x_232);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ lean_ctor_release(x_174, 2);
+ lean_ctor_release(x_174, 3);
+ x_233 = x_174;
 } else {
- lean_dec_ref(x_173);
- x_231 = lean_box(0);
+ lean_dec_ref(x_174);
+ x_233 = lean_box(0);
 }
-x_232 = lean_ptr_addr(x_230);
-lean_dec(x_230);
-x_233 = lean_ptr_addr(x_225);
-x_234 = lean_usize_dec_eq(x_232, x_233);
-if (x_234 == 0)
+x_234 = lean_ptr_addr(x_232);
+lean_dec(x_232);
+x_235 = lean_ptr_addr(x_227);
+x_236 = lean_usize_dec_eq(x_234, x_235);
+if (x_236 == 0)
 {
-lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; 
-lean_dec(x_229);
-lean_dec(x_228);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_235 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_235 = lean_box(0);
-}
-if (lean_is_scalar(x_231)) {
- x_236 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_236 = x_231;
-}
-lean_ctor_set(x_236, 0, x_227);
-lean_ctor_set(x_236, 1, x_175);
-lean_ctor_set(x_236, 2, x_177);
-lean_ctor_set(x_236, 3, x_225);
-if (lean_is_scalar(x_235)) {
- x_237 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_237 = x_235;
-}
-lean_ctor_set(x_237, 0, x_236);
-x_238 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_238, 0, x_237);
-lean_ctor_set(x_238, 1, x_226);
-return x_238;
-}
-else
-{
-size_t x_239; size_t x_240; uint8_t x_241; 
-x_239 = lean_ptr_addr(x_228);
-lean_dec(x_228);
-x_240 = lean_ptr_addr(x_175);
-x_241 = lean_usize_dec_eq(x_239, x_240);
-if (x_241 == 0)
-{
-lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; 
-lean_dec(x_229);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_242 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_242 = lean_box(0);
-}
-if (lean_is_scalar(x_231)) {
- x_243 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_243 = x_231;
-}
-lean_ctor_set(x_243, 0, x_227);
-lean_ctor_set(x_243, 1, x_175);
-lean_ctor_set(x_243, 2, x_177);
-lean_ctor_set(x_243, 3, x_225);
-if (lean_is_scalar(x_242)) {
- x_244 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_244 = x_242;
-}
-lean_ctor_set(x_244, 0, x_243);
-x_245 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_245, 0, x_244);
-lean_ctor_set(x_245, 1, x_226);
-return x_245;
-}
-else
-{
-uint8_t x_246; 
-x_246 = lean_name_eq(x_229, x_177);
-lean_dec(x_229);
-if (x_246 == 0)
-{
-lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_247 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_247 = lean_box(0);
-}
-if (lean_is_scalar(x_231)) {
- x_248 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_248 = x_231;
-}
-lean_ctor_set(x_248, 0, x_227);
-lean_ctor_set(x_248, 1, x_175);
-lean_ctor_set(x_248, 2, x_177);
-lean_ctor_set(x_248, 3, x_225);
-if (lean_is_scalar(x_247)) {
- x_249 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_249 = x_247;
-}
-lean_ctor_set(x_249, 0, x_248);
-x_250 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_250, 0, x_249);
-lean_ctor_set(x_250, 1, x_226);
-return x_250;
-}
-else
-{
-lean_object* x_251; 
+lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; 
 lean_dec(x_231);
+lean_dec(x_230);
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_237 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_237 = lean_box(0);
+}
+if (lean_is_scalar(x_233)) {
+ x_238 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_238 = x_233;
+}
+lean_ctor_set(x_238, 0, x_229);
+lean_ctor_set(x_238, 1, x_176);
+lean_ctor_set(x_238, 2, x_178);
+lean_ctor_set(x_238, 3, x_227);
+if (lean_is_scalar(x_237)) {
+ x_239 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_239 = x_237;
+}
+lean_ctor_set(x_239, 0, x_238);
+x_240 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_240, 0, x_239);
+lean_ctor_set(x_240, 1, x_228);
+return x_240;
+}
+else
+{
+size_t x_241; size_t x_242; uint8_t x_243; 
+x_241 = lean_ptr_addr(x_230);
+lean_dec(x_230);
+x_242 = lean_ptr_addr(x_176);
+x_243 = lean_usize_dec_eq(x_241, x_242);
+if (x_243 == 0)
+{
+lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; 
+lean_dec(x_231);
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_244 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_244 = lean_box(0);
+}
+if (lean_is_scalar(x_233)) {
+ x_245 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_245 = x_233;
+}
+lean_ctor_set(x_245, 0, x_229);
+lean_ctor_set(x_245, 1, x_176);
+lean_ctor_set(x_245, 2, x_178);
+lean_ctor_set(x_245, 3, x_227);
+if (lean_is_scalar(x_244)) {
+ x_246 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_246 = x_244;
+}
+lean_ctor_set(x_246, 0, x_245);
+x_247 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_247, 0, x_246);
+lean_ctor_set(x_247, 1, x_228);
+return x_247;
+}
+else
+{
+uint8_t x_248; 
+x_248 = lean_name_eq(x_231, x_178);
+lean_dec(x_231);
+if (x_248 == 0)
+{
+lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; 
+if (lean_is_exclusive(x_2)) {
+ lean_ctor_release(x_2, 0);
+ x_249 = x_2;
+} else {
+ lean_dec_ref(x_2);
+ x_249 = lean_box(0);
+}
+if (lean_is_scalar(x_233)) {
+ x_250 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_250 = x_233;
+}
+lean_ctor_set(x_250, 0, x_229);
+lean_ctor_set(x_250, 1, x_176);
+lean_ctor_set(x_250, 2, x_178);
+lean_ctor_set(x_250, 3, x_227);
+if (lean_is_scalar(x_249)) {
+ x_251 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_251 = x_249;
+}
+lean_ctor_set(x_251, 0, x_250);
+x_252 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_252, 0, x_251);
+lean_ctor_set(x_252, 1, x_228);
+return x_252;
+}
+else
+{
+lean_object* x_253; 
+lean_dec(x_233);
+lean_dec(x_229);
 lean_dec(x_227);
-lean_dec(x_225);
-lean_dec(x_177);
-lean_dec(x_175);
-x_251 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_251, 0, x_1);
-lean_ctor_set(x_251, 1, x_226);
-return x_251;
+lean_dec(x_178);
+lean_dec(x_176);
+x_253 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_253, 0, x_2);
+lean_ctor_set(x_253, 1, x_228);
+return x_253;
 }
 }
 }
@@ -9701,290 +10239,526 @@ return x_251;
 }
 else
 {
-uint8_t x_252; 
-lean_dec(x_177);
-lean_dec(x_175);
-lean_dec(x_173);
-lean_dec(x_1);
-x_252 = !lean_is_exclusive(x_180);
-if (x_252 == 0)
+uint8_t x_254; 
+lean_dec(x_178);
+lean_dec(x_176);
+lean_dec(x_174);
+lean_dec(x_2);
+x_254 = !lean_is_exclusive(x_182);
+if (x_254 == 0)
 {
-return x_180;
+return x_182;
 }
 else
 {
-lean_object* x_253; lean_object* x_254; lean_object* x_255; 
-x_253 = lean_ctor_get(x_180, 0);
-x_254 = lean_ctor_get(x_180, 1);
-lean_inc(x_254);
-lean_inc(x_253);
-lean_dec(x_180);
-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;
+lean_object* x_255; lean_object* x_256; lean_object* x_257; 
+x_255 = lean_ctor_get(x_182, 0);
+x_256 = lean_ctor_get(x_182, 1);
+lean_inc(x_256);
+lean_inc(x_255);
+lean_dec(x_182);
+x_257 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_257, 0, x_255);
+lean_ctor_set(x_257, 1, x_256);
+return x_257;
 }
 }
 }
 case 5:
 {
-lean_object* x_256; lean_object* x_257; uint8_t x_258; 
+lean_object* x_258; lean_object* x_259; uint8_t x_260; 
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-x_256 = lean_ctor_get(x_1, 0);
-lean_inc(x_256);
-lean_inc(x_256);
-x_257 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_2, x_256);
-x_258 = lean_name_eq(x_256, x_257);
-lean_dec(x_256);
-if (x_258 == 0)
+x_258 = lean_ctor_get(x_2, 0);
+lean_inc(x_258);
+lean_inc(x_258);
+x_259 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_3, x_258, x_1);
+x_260 = lean_name_eq(x_258, x_259);
+lean_dec(x_258);
+if (x_260 == 0)
 {
-uint8_t x_259; 
-x_259 = !lean_is_exclusive(x_1);
-if (x_259 == 0)
-{
-lean_object* x_260; lean_object* x_261; 
-x_260 = lean_ctor_get(x_1, 0);
-lean_dec(x_260);
-lean_ctor_set(x_1, 0, x_257);
-x_261 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_261, 0, x_1);
-lean_ctor_set(x_261, 1, x_6);
-return x_261;
-}
-else
+uint8_t x_261; 
+x_261 = !lean_is_exclusive(x_2);
+if (x_261 == 0)
 {
 lean_object* x_262; lean_object* x_263; 
-lean_dec(x_1);
-x_262 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_262, 0, x_257);
+x_262 = lean_ctor_get(x_2, 0);
+lean_dec(x_262);
+lean_ctor_set(x_2, 0, x_259);
 x_263 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_263, 0, x_262);
-lean_ctor_set(x_263, 1, x_6);
+lean_ctor_set(x_263, 0, x_2);
+lean_ctor_set(x_263, 1, x_7);
 return x_263;
 }
+else
+{
+lean_object* x_264; lean_object* x_265; 
+lean_dec(x_2);
+x_264 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_264, 0, x_259);
+x_265 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_265, 0, x_264);
+lean_ctor_set(x_265, 1, x_7);
+return x_265;
+}
 }
 else
 {
-lean_object* x_264; 
-lean_dec(x_257);
-x_264 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_264, 0, x_1);
-lean_ctor_set(x_264, 1, x_6);
-return x_264;
+lean_object* x_266; 
+lean_dec(x_259);
+x_266 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_266, 0, x_2);
+lean_ctor_set(x_266, 1, x_7);
+return x_266;
 }
 }
 default: 
 {
-lean_object* x_265; lean_object* x_266; size_t x_267; size_t x_268; uint8_t x_269; 
+lean_object* x_267; lean_object* x_268; size_t x_269; size_t x_270; uint8_t x_271; 
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-x_265 = lean_ctor_get(x_1, 0);
-lean_inc(x_265);
-lean_inc(x_265);
-x_266 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_265);
-x_267 = lean_ptr_addr(x_265);
-lean_dec(x_265);
-x_268 = lean_ptr_addr(x_266);
-x_269 = lean_usize_dec_eq(x_267, x_268);
-if (x_269 == 0)
+x_267 = lean_ctor_get(x_2, 0);
+lean_inc(x_267);
+lean_inc(x_267);
+x_268 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_3, x_1, x_267);
+x_269 = lean_ptr_addr(x_267);
+lean_dec(x_267);
+x_270 = lean_ptr_addr(x_268);
+x_271 = lean_usize_dec_eq(x_269, x_270);
+if (x_271 == 0)
 {
-uint8_t x_270; 
-x_270 = !lean_is_exclusive(x_1);
-if (x_270 == 0)
-{
-lean_object* x_271; lean_object* x_272; 
-x_271 = lean_ctor_get(x_1, 0);
-lean_dec(x_271);
-lean_ctor_set(x_1, 0, x_266);
-x_272 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_272, 0, x_1);
-lean_ctor_set(x_272, 1, x_6);
-return x_272;
-}
-else
+uint8_t x_272; 
+x_272 = !lean_is_exclusive(x_2);
+if (x_272 == 0)
 {
 lean_object* x_273; lean_object* x_274; 
-lean_dec(x_1);
-x_273 = lean_alloc_ctor(6, 1, 0);
-lean_ctor_set(x_273, 0, x_266);
+x_273 = lean_ctor_get(x_2, 0);
+lean_dec(x_273);
+lean_ctor_set(x_2, 0, x_268);
 x_274 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_274, 0, x_273);
-lean_ctor_set(x_274, 1, x_6);
+lean_ctor_set(x_274, 0, x_2);
+lean_ctor_set(x_274, 1, x_7);
 return x_274;
 }
+else
+{
+lean_object* x_275; lean_object* x_276; 
+lean_dec(x_2);
+x_275 = lean_alloc_ctor(6, 1, 0);
+lean_ctor_set(x_275, 0, x_268);
+x_276 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_276, 0, x_275);
+lean_ctor_set(x_276, 1, x_7);
+return x_276;
+}
 }
 else
 {
-lean_object* x_275; 
-lean_dec(x_266);
-x_275 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_275, 0, x_1);
-lean_ctor_set(x_275, 1, x_6);
-return x_275;
+lean_object* x_277; 
+lean_dec(x_268);
+x_277 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_277, 0, x_2);
+lean_ctor_set(x_277, 1, x_7);
+return x_277;
 }
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___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_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___rarg(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-return x_7;
+return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normFunDeclImp___spec__2(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; lean_object* x_11; 
+x_10 = lean_unbox(x_1);
+lean_dec(x_1);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normFunDeclImp___spec__4(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___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_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normFunDeclImp___spec__3(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; uint8_t x_10; lean_object* x_11; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = lean_unbox(x_2);
+lean_dec(x_2);
+x_11 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1(x_9, x_10, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDeclImp___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normFunDeclImp(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___rarg(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-return x_7;
+return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___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_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(x_1, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_normCodeImp___spec__1(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___rarg(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-return x_7;
+return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3___boxed(lean_object* x_1) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDeclImp), 6, 2);
-lean_closure_set(x_4, 0, x_1);
-lean_closure_set(x_4, 1, x_3);
-x_5 = lean_apply_2(x_2, lean_box(0), x_4);
-return x_5;
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_normCodeImp___spec__3(x_2);
+return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; lean_object* x_11; 
+x_10 = lean_unbox(x_1);
+lean_dec(x_1);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__5(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__4(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; uint8_t x_10; lean_object* x_11; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = lean_unbox(x_2);
+lean_dec(x_2);
+x_11 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2(x_9, x_10, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___rarg(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = lean_unbox(x_1);
+lean_dec(x_1);
+x_3 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_normCodeImp___spec__7(x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___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, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; lean_object* x_11; 
+x_10 = lean_unbox(x_1);
+lean_dec(x_1);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__9(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__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) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__8(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___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) {
+_start:
+{
+uint8_t x_9; uint8_t x_10; lean_object* x_11; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = lean_unbox(x_2);
+lean_dec(x_2);
+x_11 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normCodeImp___spec__6(x_9, x_10, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; lean_object* x_11; 
+x_10 = lean_unbox(x_1);
+lean_dec(x_1);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_normCodeImp___spec__11(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___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) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_normCodeImp___spec__10(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normCodeImp___lambda__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCodeImp___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_1);
+lean_dec(x_1);
+x_9 = l_Lean_Compiler_LCNF_normCodeImp(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1(uint8_t 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; 
-x_5 = lean_ctor_get(x_2, 1);
-lean_inc(x_5);
-lean_dec(x_2);
-x_6 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1), 3, 2);
-lean_closure_set(x_6, 0, x_4);
-lean_closure_set(x_6, 1, x_1);
-x_7 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_3, x_6);
+x_5 = lean_box(x_1);
+x_6 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDeclImp___boxed), 7, 3);
+lean_closure_set(x_6, 0, x_5);
+lean_closure_set(x_6, 1, x_2);
+lean_closure_set(x_6, 2, x_4);
+x_7 = lean_apply_2(x_3, lean_box(0), x_6);
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_6 = lean_ctor_get(x_3, 1);
+lean_inc(x_6);
+lean_dec(x_3);
+x_7 = lean_box(x_1);
+x_8 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_8, 0, x_7);
+lean_closure_set(x_8, 1, x_5);
+lean_closure_set(x_8, 2, x_2);
+x_9 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_4, x_8);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDecl___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normFunDecl___rarg___boxed), 5, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCodeImp), 6, 2);
-lean_closure_set(x_4, 0, x_1);
-lean_closure_set(x_4, 1, x_3);
-x_5 = lean_apply_2(x_2, lean_box(0), x_4);
-return x_5;
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Compiler_LCNF_normFunDecl___rarg___lambda__1(x_5, x_2, x_3, x_4);
+return x_6;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normFunDecl___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = lean_unbox(x_1);
+lean_dec(x_1);
+x_7 = l_Lean_Compiler_LCNF_normFunDecl___rarg(x_6, x_2, x_3, x_4, x_5);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___lambda__1(uint8_t 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; 
-x_5 = lean_ctor_get(x_2, 1);
-lean_inc(x_5);
-lean_dec(x_2);
-x_6 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCode___rarg___lambda__1), 3, 2);
-lean_closure_set(x_6, 0, x_4);
-lean_closure_set(x_6, 1, x_1);
-x_7 = lean_apply_4(x_5, lean_box(0), lean_box(0), x_3, x_6);
+x_5 = lean_box(x_1);
+x_6 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCodeImp___boxed), 7, 3);
+lean_closure_set(x_6, 0, x_5);
+lean_closure_set(x_6, 1, x_2);
+lean_closure_set(x_6, 2, x_4);
+x_7 = lean_apply_2(x_3, lean_box(0), x_6);
 return x_7;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_6 = lean_ctor_get(x_3, 1);
+lean_inc(x_6);
+lean_dec(x_3);
+x_7 = lean_box(x_1);
+x_8 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCode___rarg___lambda__1___boxed), 4, 3);
+lean_closure_set(x_8, 0, x_7);
+lean_closure_set(x_8, 1, x_5);
+lean_closure_set(x_8, 2, x_2);
+x_9 = lean_apply_4(x_6, lean_box(0), lean_box(0), x_4, x_8);
+return x_9;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCode___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normCode___rarg___boxed), 5, 0);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(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_Compiler_LCNF_normCode___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_7; lean_object* x_8; 
-x_7 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_1);
-x_8 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_8, 0, x_7);
-lean_ctor_set(x_8, 1, x_6);
+uint8_t x_5; lean_object* x_6; 
+x_5 = lean_unbox(x_1);
+lean_dec(x_1);
+x_6 = l_Lean_Compiler_LCNF_normCode___rarg___lambda__1(x_5, x_2, x_3, x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normCode___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = lean_unbox(x_1);
+lean_dec(x_1);
+x_7 = l_Lean_Compiler_LCNF_normCode___rarg(x_6, x_2, x_3, x_4, x_5);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(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) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; 
+x_8 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_2, x_3, x_1);
+x_9 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_9, 0, x_8);
+lean_ctor_set(x_9, 1, x_7);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_3);
+lean_dec(x_3);
+x_9 = l_Lean_Compiler_LCNF_replaceExprFVars(x_1, x_2, x_8, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVars(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) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_Lean_Compiler_LCNF_normCodeImp(x_3, x_1, x_2, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceExprFVars___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_Compiler_LCNF_replaceFVars___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_replaceExprFVars(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-lean_dec(x_4);
+uint8_t x_8; lean_object* x_9; 
+x_8 = lean_unbox(x_3);
 lean_dec(x_3);
-return x_7;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVars(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_2, x_3, x_4, x_5, x_6);
-return x_7;
-}
-}
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_replaceFVar___spec__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = l_Std_mkHashMapImp___rarg(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_replaceFVar(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; 
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_Std_mkHashMapImp___rarg(x_8);
-x_10 = l_Lean_Expr_fvar___override(x_3);
-x_11 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_9, x_2, x_10);
-x_12 = l_Lean_Compiler_LCNF_normCodeImp(x_1, x_11, x_4, x_5, x_6, x_7);
-return x_12;
-}
-}
-LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_replaceFVar___spec__1___boxed(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = l_Std_mkHashMap___at_Lean_Compiler_LCNF_replaceFVar___spec__1(x_1);
-lean_dec(x_1);
-return x_2;
+x_9 = l_Lean_Compiler_LCNF_replaceFVars(x_1, x_2, x_8, x_4, x_5, x_6, x_7);
+return x_9;
 }
 }
 static lean_object* _init_l_Lean_Compiler_LCNF_mkFreshJpName___closed__1() {
@@ -10071,7 +10845,15 @@ lean_dec(x_3);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_cleanup___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Std_mkHashMapImp___rarg(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2(size_t x_1, size_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 uint8_t x_8; 
@@ -10108,7 +10890,7 @@ x_19 = lean_st_ref_set(x_4, x_14, x_15);
 x_20 = lean_ctor_get(x_19, 1);
 lean_inc(x_20);
 lean_dec(x_19);
-x_21 = l_Lean_Compiler_LCNF_CompilerM_State_lctx___default___closed__1;
+x_21 = l_Std_mkHashMapImp___rarg(x_11);
 x_22 = l_Lean_Compiler_LCNF_Decl_internalize(x_10, x_21, x_4, x_5, x_6, x_20);
 x_23 = lean_ctor_get(x_22, 0);
 lean_inc(x_23);
@@ -10137,7 +10919,7 @@ x_32 = lean_st_ref_set(x_4, x_31, x_15);
 x_33 = lean_ctor_get(x_32, 1);
 lean_inc(x_33);
 lean_dec(x_32);
-x_34 = l_Lean_Compiler_LCNF_CompilerM_State_lctx___default___closed__1;
+x_34 = l_Std_mkHashMapImp___rarg(x_11);
 x_35 = l_Lean_Compiler_LCNF_Decl_internalize(x_10, x_34, x_4, x_5, x_6, x_33);
 x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
@@ -10184,14 +10966,23 @@ x_11 = lean_array_get_size(x_1);
 x_12 = lean_usize_of_nat(x_11);
 lean_dec(x_11);
 x_13 = 0;
-x_14 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1(x_12, x_13, x_1, x_2, x_3, x_4, x_10);
+x_14 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2(x_12, x_13, x_1, x_2, x_3, x_4, x_10);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_14;
 }
 }
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_Compiler_LCNF_cleanup___spec__1___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Std_mkHashMap___at_Lean_Compiler_LCNF_cleanup___spec__1(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 size_t x_8; size_t x_9; lean_object* x_10; 
@@ -10199,7 +10990,7 @@ x_8 = lean_unbox_usize(x_1);
 lean_dec(x_1);
 x_9 = lean_unbox_usize(x_2);
 lean_dec(x_2);
-x_10 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__1(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
+x_10 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_cleanup___spec__2(x_8, x_9, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -10359,22 +11150,16 @@ l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___clo
 lean_mark_persistent(l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__1);
 l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2 = _init_l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2();
 lean_mark_persistent(l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__2);
-l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3 = _init_l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3();
-lean_mark_persistent(l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp___closed__3);
-l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1 = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM___closed__1);
-l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeM);
-l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1 = _init_l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM___closed__1);
-l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM = _init_l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM();
-lean_mark_persistent(l_Lean_Compiler_LCNF_instMonadFVarSubstReaderTFVarSubstCompilerM);
-l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1 = _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_normFunDeclImp___spec__1___closed__1);
-l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1 = _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_normCodeImp___spec__2___closed__1);
-l_Lean_Compiler_LCNF_normCodeImp___closed__1 = _init_l_Lean_Compiler_LCNF_normCodeImp___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normCodeImp___closed__1);
+l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1 = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue___closed__1);
+l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstInternalizeMTrue);
+l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1 = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM___closed__1);
+l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM = _init_l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Internalize_instMonadFVarSubstStateInternalizeM);
+l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1 = _init_l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_instMonadFVarSubstNormalizerM___closed__1);
 l_Lean_Compiler_LCNF_mkFreshJpName___closed__1 = _init_l_Lean_Compiler_LCNF_mkFreshJpName___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_mkFreshJpName___closed__1);
 l_Lean_Compiler_LCNF_mkFreshJpName___closed__2 = _init_l_Lean_Compiler_LCNF_mkFreshJpName___closed__2();
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Main.c b/stage0/stdlib/Lean/Compiler/LCNF/Main.c
index 91daa258c4..99c708a4ec 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Main.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Main.c
@@ -17,6 +17,7 @@ static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__13;
 lean_object* l_Lean_Compiler_LCNF_ppDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__23;
 lean_object* l_Lean_KVMap_setBool(lean_object*, lean_object*, uint8_t);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2;
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__21;
@@ -29,13 +30,12 @@ lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isMatcher___at_Lean_Compiler_LCNF_shouldGenerateCode___spec__1(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_Main___hyg_1198____closed__2;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_PassManager_run___spec__5(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PassManager_run___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__6;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__1;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1;
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__17;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__1___closed__1;
@@ -53,11 +53,12 @@ static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__8;
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_PassManager_run___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__2;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3;
+lean_object* l_Nat_max(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3;
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__5;
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5;
 uint8_t lean_usize_dec_lt(size_t, size_t);
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5;
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__19;
 LEAN_EXPORT lean_object* l_ReaderT_pure___at_Lean_Compiler_LCNF_PassManager_run___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_PassInstaller_runFromDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -126,7 +127,7 @@ static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__10;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___lambda__2___closed__11;
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__7;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_PassManager_run___spec__3___lambda__1(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_Main___hyg_1198_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200_(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_shouldGenerateCode___closed__3;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3168,108 +3169,262 @@ return x_76;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PassManager_run(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_6; lean_object* x_7; uint8_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_6; lean_object* x_7; uint8_t x_8; uint8_t x_9; 
 x_6 = lean_array_get_size(x_1);
 x_7 = lean_unsigned_to_nat(0u);
 x_8 = lean_nat_dec_lt(x_7, x_6);
+x_9 = !lean_is_exclusive(x_3);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_10 = lean_ctor_get(x_3, 4);
+x_11 = lean_unsigned_to_nat(8192u);
+x_12 = l_Nat_max(x_11, x_10);
+lean_dec(x_10);
+lean_ctor_set(x_3, 4, x_12);
 if (x_8 == 0)
 {
-lean_object* x_18; 
+lean_object* x_22; 
 lean_dec(x_6);
 lean_dec(x_1);
-x_18 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_9 = x_18;
-x_10 = x_5;
-goto block_17;
+x_22 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_13 = x_22;
+x_14 = x_5;
+goto block_21;
 }
 else
 {
-uint8_t x_19; 
-x_19 = lean_nat_dec_le(x_6, x_6);
-if (x_19 == 0)
+uint8_t x_23; 
+x_23 = lean_nat_dec_le(x_6, x_6);
+if (x_23 == 0)
 {
-lean_object* x_20; 
+lean_object* x_24; 
 lean_dec(x_6);
 lean_dec(x_1);
-x_20 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_9 = x_20;
-x_10 = x_5;
-goto block_17;
+x_24 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_13 = x_24;
+x_14 = x_5;
+goto block_21;
 }
 else
 {
-size_t x_21; size_t x_22; lean_object* x_23; lean_object* x_24; 
-x_21 = 0;
-x_22 = lean_usize_of_nat(x_6);
+size_t x_25; size_t x_26; lean_object* x_27; lean_object* x_28; 
+x_25 = 0;
+x_26 = lean_usize_of_nat(x_6);
 lean_dec(x_6);
-x_23 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_27 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
 lean_inc(x_4);
 lean_inc(x_3);
-x_24 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__7(x_1, x_21, x_22, x_23, x_2, x_3, x_4, x_5);
+x_28 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__7(x_1, x_25, x_26, x_27, x_2, x_3, x_4, x_5);
 lean_dec(x_1);
-if (lean_obj_tag(x_24) == 0)
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-x_26 = lean_ctor_get(x_24, 1);
-lean_inc(x_26);
-lean_dec(x_24);
-x_9 = x_25;
-x_10 = x_26;
-goto block_17;
-}
-else
-{
-uint8_t x_27; 
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_27 = !lean_is_exclusive(x_24);
-if (x_27 == 0)
-{
-return x_24;
-}
-else
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_28 = lean_ctor_get(x_24, 0);
-x_29 = lean_ctor_get(x_24, 1);
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_ctor_get(x_28, 0);
 lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_24);
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_28);
-lean_ctor_set(x_30, 1, x_29);
-return x_30;
-}
-}
-}
-}
-block_17:
-{
-uint8_t x_11; 
-x_11 = l_Array_isEmpty___rarg(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_13 = lean_box(0);
-x_14 = l_Lean_Compiler_LCNF_PassManager_run___lambda__2(x_9, x_12, x_13, x_2, x_3, x_4, x_10);
-return x_14;
+x_30 = lean_ctor_get(x_28, 1);
+lean_inc(x_30);
+lean_dec(x_28);
+x_13 = x_29;
+x_14 = x_30;
+goto block_21;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; 
-lean_dec(x_9);
-lean_dec(x_4);
+uint8_t x_31; 
 lean_dec(x_3);
+lean_dec(x_4);
 lean_dec(x_2);
-x_15 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
-x_16 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_10);
-return x_16;
+x_31 = !lean_is_exclusive(x_28);
+if (x_31 == 0)
+{
+return x_28;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_28, 0);
+x_33 = lean_ctor_get(x_28, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_28);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
+}
+}
+}
+}
+block_21:
+{
+uint8_t x_15; 
+x_15 = l_Array_isEmpty___rarg(x_13);
+if (x_15 == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_17 = lean_box(0);
+x_18 = l_Lean_Compiler_LCNF_PassManager_run___lambda__2(x_13, x_16, x_17, x_2, x_3, x_4, x_14);
+return x_18;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; 
+lean_dec(x_13);
+lean_dec(x_3);
+lean_dec(x_4);
+lean_dec(x_2);
+x_19 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_14);
+return x_20;
+}
+}
+}
+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; 
+x_35 = lean_ctor_get(x_3, 0);
+x_36 = lean_ctor_get(x_3, 1);
+x_37 = lean_ctor_get(x_3, 2);
+x_38 = lean_ctor_get(x_3, 3);
+x_39 = lean_ctor_get(x_3, 4);
+x_40 = lean_ctor_get(x_3, 5);
+x_41 = lean_ctor_get(x_3, 6);
+x_42 = lean_ctor_get(x_3, 7);
+x_43 = lean_ctor_get(x_3, 8);
+x_44 = lean_ctor_get(x_3, 9);
+x_45 = lean_ctor_get(x_3, 10);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_inc(x_37);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_3);
+x_46 = lean_unsigned_to_nat(8192u);
+x_47 = l_Nat_max(x_46, x_39);
+lean_dec(x_39);
+x_48 = lean_alloc_ctor(0, 11, 0);
+lean_ctor_set(x_48, 0, x_35);
+lean_ctor_set(x_48, 1, x_36);
+lean_ctor_set(x_48, 2, x_37);
+lean_ctor_set(x_48, 3, x_38);
+lean_ctor_set(x_48, 4, x_47);
+lean_ctor_set(x_48, 5, x_40);
+lean_ctor_set(x_48, 6, x_41);
+lean_ctor_set(x_48, 7, x_42);
+lean_ctor_set(x_48, 8, x_43);
+lean_ctor_set(x_48, 9, x_44);
+lean_ctor_set(x_48, 10, x_45);
+if (x_8 == 0)
+{
+lean_object* x_58; 
+lean_dec(x_6);
+lean_dec(x_1);
+x_58 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_49 = x_58;
+x_50 = x_5;
+goto block_57;
+}
+else
+{
+uint8_t x_59; 
+x_59 = lean_nat_dec_le(x_6, x_6);
+if (x_59 == 0)
+{
+lean_object* x_60; 
+lean_dec(x_6);
+lean_dec(x_1);
+x_60 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_49 = x_60;
+x_50 = x_5;
+goto block_57;
+}
+else
+{
+size_t x_61; size_t x_62; lean_object* x_63; lean_object* x_64; 
+x_61 = 0;
+x_62 = lean_usize_of_nat(x_6);
+lean_dec(x_6);
+x_63 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+lean_inc(x_4);
+lean_inc(x_48);
+x_64 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_PassManager_run___spec__7(x_1, x_61, x_62, x_63, x_2, x_48, x_4, x_5);
+lean_dec(x_1);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_ctor_get(x_64, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_64, 1);
+lean_inc(x_66);
+lean_dec(x_64);
+x_49 = x_65;
+x_50 = x_66;
+goto block_57;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+lean_dec(x_48);
+lean_dec(x_4);
+lean_dec(x_2);
+x_67 = lean_ctor_get(x_64, 0);
+lean_inc(x_67);
+x_68 = lean_ctor_get(x_64, 1);
+lean_inc(x_68);
+if (lean_is_exclusive(x_64)) {
+ lean_ctor_release(x_64, 0);
+ lean_ctor_release(x_64, 1);
+ x_69 = x_64;
+} else {
+ lean_dec_ref(x_64);
+ x_69 = lean_box(0);
+}
+if (lean_is_scalar(x_69)) {
+ x_70 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_70 = x_69;
+}
+lean_ctor_set(x_70, 0, x_67);
+lean_ctor_set(x_70, 1, x_68);
+return x_70;
+}
+}
+}
+block_57:
+{
+uint8_t x_51; 
+x_51 = l_Array_isEmpty___rarg(x_49);
+if (x_51 == 0)
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_53 = lean_box(0);
+x_54 = l_Lean_Compiler_LCNF_PassManager_run___lambda__2(x_49, x_52, x_53, x_2, x_48, x_4, x_50);
+return x_54;
+}
+else
+{
+lean_object* x_55; lean_object* x_56; 
+lean_dec(x_49);
+lean_dec(x_48);
+lean_dec(x_4);
+lean_dec(x_2);
+x_55 = l_Lean_Compiler_LCNF_shouldGenerateCode___closed__9;
+x_56 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_50);
+return x_56;
+}
 }
 }
 }
@@ -3435,7 +3590,7 @@ x_7 = l_Lean_Compiler_LCNF_CompilerM_run___rarg(x_5, x_6, x_2, x_3, x_4);
 return x_7;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3445,7 +3600,7 @@ 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_Main___hyg_1198____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -3453,17 +3608,17 @@ x_1 = lean_mk_string_from_bytes("test", 4);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___closed__2;
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__2;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2;
 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_Main___hyg_1198____closed__4() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -3471,21 +3626,21 @@ x_1 = lean_mk_string_from_bytes("jp", 2);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_checkpoint___spec__1___closed__2;
-x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__4;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200_(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_Main___hyg_1198____closed__1;
+x_2 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)
@@ -3494,7 +3649,7 @@ lean_object* x_5; lean_object* x_6; lean_object* x_7;
 x_5 = lean_ctor_get(x_4, 1);
 lean_inc(x_5);
 lean_dec(x_4);
-x_6 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3;
+x_6 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3;
 x_7 = l_Lean_registerTraceClass(x_6, x_3, x_5);
 if (lean_obj_tag(x_7) == 0)
 {
@@ -3510,7 +3665,7 @@ lean_object* x_11; lean_object* x_12; uint8_t x_13; lean_object* x_14;
 x_11 = lean_ctor_get(x_10, 1);
 lean_inc(x_11);
 lean_dec(x_10);
-x_12 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5;
+x_12 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5;
 x_13 = 0;
 x_14 = l_Lean_registerTraceClass(x_12, x_13, x_11);
 return x_14;
@@ -3738,17 +3893,17 @@ l_Lean_Compiler_LCNF_compileStage1Impl___closed__2 = _init_l_Lean_Compiler_LCNF_
 lean_mark_persistent(l_Lean_Compiler_LCNF_compileStage1Impl___closed__2);
 l_Lean_Compiler_LCNF_compileStage1Impl___closed__3 = _init_l_Lean_Compiler_LCNF_compileStage1Impl___closed__3();
 lean_mark_persistent(l_Lean_Compiler_LCNF_compileStage1Impl___closed__3);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__2);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__3);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__4 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__4();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__4);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198____closed__5);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1198_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__2);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__3);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__4);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200____closed__5);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Main___hyg_1200_(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/PassManager.c b/stage0/stdlib/Lean/Compiler/LCNF/PassManager.c
index 4400ef2cd7..200fe6efab 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PassManager.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PassManager.c
@@ -34,7 +34,6 @@ static lean_object* l_Lean_Compiler_LCNF_PassInstaller_installAfter___elambda__1
 static lean_object* l_Lean_Compiler_LCNF_PassInstaller_initFn____x40_Lean_Compiler_LCNF_PassManager___hyg_1339____lambda__3___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PassInstaller_withEachOccurrence___elambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Phase_instToStringPhase(uint8_t);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PassInstaller_installAfter___elambda__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_PassInstaller_runFromDecl___closed__6;
 static lean_object* l_Lean_Compiler_LCNF_instInhabitedPass___lambda__1___closed__1;
@@ -244,6 +243,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Phase_instLEPhase;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Phase_instLTPhase;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PassInstaller_installBeforeEachOccurrence(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_instInhabitedPass___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PassInstaller_runFromDecl___closed__14;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -3085,7 +3085,7 @@ if (x_10 == 0)
 lean_object* x_11; lean_object* x_12; uint8_t x_13; 
 lean_dec(x_1);
 x_11 = l_Lean_Compiler_LCNF_PassInstaller_initFn____x40_Lean_Compiler_LCNF_PassManager___hyg_1339____lambda__2___closed__2;
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_4, x_5, x_8);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_4, x_5, x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 x_13 = !lean_is_exclusive(x_12);
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/PrettyPrinter.c b/stage0/stdlib/Lean/Compiler/LCNF/PrettyPrinter.c
index cf68dd7085..14fd8cb503 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/PrettyPrinter.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/PrettyPrinter.c
@@ -13,6 +13,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+uint8_t l_Lean_Expr_isType0(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppDecl_x27_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_pp_letVarTypes;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__13;
@@ -20,10 +22,12 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppApp(lean_object*, lean_object
 size_t lean_usize_add(size_t, size_t);
 static lean_object* l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__1;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__7;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppFunDecl___closed__2;
 lean_object* l_Std_Format_indentD(lean_object*);
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_ppDecl___spec__1(lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
+uint8_t l_Lean_Expr_isProp(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppLetDecl___closed__5;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppFunDecl___closed__1;
@@ -39,6 +43,8 @@ lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*)
 lean_object* lean_array_get_size(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_run(lean_object*);
+lean_object* l_Lean_Compiler_LCNF_Decl_internalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppFunDecl___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -46,9 +52,9 @@ static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__3;
 uint8_t lean_usize_dec_lt(size_t, size_t);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_prefixJoin___spec__1___rarg___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_PP_ppExpr___closed__12;
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__10;
 extern lean_object* l_Lean_levelZero;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_run___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__6;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__19;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppAlt(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -60,23 +66,25 @@ lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean
 lean_object* lean_array_fget(lean_object*, lean_object*);
 uint8_t l_Lean_Option_get___at_Lean_getSanitizeNames___spec__1(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__11;
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__7;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppParams___closed__1;
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__4;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__6;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__1;
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
+lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__5;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__3;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__10;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppArgs___closed__1;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__5;
 extern lean_object* l_Lean_Expr_instHashableExpr;
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppExpr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_sort___override(lean_object*);
 lean_object* l_Lean_Meta_InfoCacheKey_instHashableInfoCacheKey___boxed(lean_object*);
@@ -84,9 +92,11 @@ static lean_object* l_Lean_Compiler_LCNF_PP_ppExpr___closed__16;
 LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_ppDecl___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__3;
+uint8_t l_Lean_Expr_isConst(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_prefixJoin___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppDecl_x27(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_getBinderName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppParams___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -95,15 +105,18 @@ size_t lean_usize_of_nat(lean_object*);
 extern lean_object* l_Lean_pp_explicit;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__10;
 lean_object* l_instBEqProd___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__6;
+static lean_object* l_Lean_Compiler_LCNF_PP_ppArg___closed__9;
 extern lean_object* l_Lean_pp_funBinderTypes;
+static lean_object* l_Lean_Compiler_LCNF_ppDecl_x27___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__7;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppAlt___closed__5;
+static lean_object* l_Lean_Compiler_LCNF_ppDecl_x27___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppAlt___closed__3;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppAlt___closed__1;
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_join___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_join___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_LCtx_toLocalContext(lean_object*);
+lean_object* l_Lean_Compiler_LCNF_CompilerM_run___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_PP_ppAlt___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__2;
@@ -119,7 +132,6 @@ static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_PP_run___rarg___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppCode___closed__9;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_prefixJoin(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__8;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_prefixJoin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instHashableProd___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
@@ -128,7 +140,6 @@ static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__4;
 extern lean_object* l_Lean_Expr_instBEqExpr;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_join___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppFVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_PP_ppParam___closed__9;
 lean_object* lean_string_length(lean_object*);
 static lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_PrettyPrinter_0__Lean_Compiler_LCNF_PP_join___spec__1___rarg___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_PP_ppAlt___closed__6;
@@ -1112,6 +1123,60 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__4() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("(", 1);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_PP_ppArg___closed__4;
+x_2 = lean_string_length(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_PP_ppArg___closed__5;
+x_2 = lean_nat_to_int(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_PP_ppArg___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__8() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes(")", 1);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_PP_ppArg___closed__8;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_PP_ppArg(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:
 {
@@ -1136,18 +1201,129 @@ return x_12;
 }
 else
 {
-lean_object* x_13; 
-x_13 = l_Lean_Compiler_LCNF_PP_ppExpr(x_1, x_2, x_3, x_4, x_5, x_6);
-return x_13;
+uint8_t x_13; 
+x_13 = l_Lean_Expr_isConst(x_1);
+if (x_13 == 0)
+{
+uint8_t x_14; 
+x_14 = l_Lean_Expr_isProp(x_1);
+if (x_14 == 0)
+{
+uint8_t x_15; 
+x_15 = l_Lean_Expr_isType0(x_1);
+if (x_15 == 0)
+{
+lean_object* x_16; 
+x_16 = l_Lean_Compiler_LCNF_PP_ppExpr(x_1, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_16) == 0)
+{
+uint8_t x_17; 
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 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; uint8_t x_25; lean_object* x_26; 
+x_18 = lean_ctor_get(x_16, 0);
+x_19 = l_Lean_Compiler_LCNF_PP_ppArg___closed__7;
+x_20 = lean_alloc_ctor(4, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+x_21 = l_Lean_Compiler_LCNF_PP_ppArg___closed__9;
+x_22 = lean_alloc_ctor(4, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+x_23 = l_Lean_Compiler_LCNF_PP_ppArg___closed__6;
+x_24 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_22);
+x_25 = 0;
+x_26 = lean_alloc_ctor(5, 1, 1);
+lean_ctor_set(x_26, 0, x_24);
+lean_ctor_set_uint8(x_26, sizeof(void*)*1, x_25);
+lean_ctor_set(x_16, 0, x_26);
+return x_16;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; lean_object* x_36; lean_object* x_37; 
+x_27 = lean_ctor_get(x_16, 0);
+x_28 = lean_ctor_get(x_16, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_16);
+x_29 = l_Lean_Compiler_LCNF_PP_ppArg___closed__7;
+x_30 = lean_alloc_ctor(4, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_27);
+x_31 = l_Lean_Compiler_LCNF_PP_ppArg___closed__9;
+x_32 = lean_alloc_ctor(4, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+x_33 = l_Lean_Compiler_LCNF_PP_ppArg___closed__6;
+x_34 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_32);
+x_35 = 0;
+x_36 = lean_alloc_ctor(5, 1, 1);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set_uint8(x_36, sizeof(void*)*1, 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_28);
+return x_37;
 }
 }
 else
 {
-lean_object* x_14; lean_object* x_15; 
-x_14 = l_Lean_Expr_fvarId_x21(x_1);
-x_15 = l_Lean_Compiler_LCNF_PP_ppFVar(x_14, x_2, x_3, x_4, x_5, x_6);
+uint8_t x_38; 
+x_38 = !lean_is_exclusive(x_16);
+if (x_38 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_16, 0);
+x_40 = lean_ctor_get(x_16, 1);
+lean_inc(x_40);
+lean_inc(x_39);
+lean_dec(x_16);
+x_41 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_41, 0, x_39);
+lean_ctor_set(x_41, 1, x_40);
+return x_41;
+}
+}
+}
+else
+{
+lean_object* x_42; 
+x_42 = l_Lean_Compiler_LCNF_PP_ppExpr(x_1, x_2, x_3, x_4, x_5, x_6);
+return x_42;
+}
+}
+else
+{
+lean_object* x_43; 
+x_43 = l_Lean_Compiler_LCNF_PP_ppExpr(x_1, x_2, x_3, x_4, x_5, x_6);
+return x_43;
+}
+}
+else
+{
+lean_object* x_44; 
+x_44 = l_Lean_Compiler_LCNF_PP_ppExpr(x_1, x_2, x_3, x_4, x_5, x_6);
+return x_44;
+}
+}
+}
+else
+{
+lean_object* x_45; lean_object* x_46; 
+x_45 = l_Lean_Expr_fvarId_x21(x_1);
+x_46 = l_Lean_Compiler_LCNF_PP_ppFVar(x_45, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
-return x_15;
+return x_46;
 }
 }
 }
@@ -1498,60 +1674,6 @@ static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("(", 1);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_PP_ppParam___closed__4;
-x_2 = lean_string_length(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__6() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_PP_ppParam___closed__5;
-x_2 = lean_nat_to_int(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_PP_ppParam___closed__4;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__8() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes(")", 1);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__9() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_PP_ppParam___closed__8;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__10() {
-_start:
-{
-lean_object* x_1; 
 x_1 = lean_mk_string_from_bytes("@&", 2);
 return x_1;
 }
@@ -1574,7 +1696,7 @@ goto block_75;
 else
 {
 lean_object* x_77; 
-x_77 = l_Lean_Compiler_LCNF_PP_ppParam___closed__10;
+x_77 = l_Lean_Compiler_LCNF_PP_ppParam___closed__4;
 x_11 = x_77;
 goto block_75;
 }
@@ -1646,15 +1768,15 @@ lean_ctor_set(x_37, 1, x_25);
 x_38 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_30);
-x_39 = l_Lean_Compiler_LCNF_PP_ppParam___closed__7;
+x_39 = l_Lean_Compiler_LCNF_PP_ppArg___closed__7;
 x_40 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
-x_41 = l_Lean_Compiler_LCNF_PP_ppParam___closed__9;
+x_41 = l_Lean_Compiler_LCNF_PP_ppArg___closed__9;
 x_42 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
-x_43 = l_Lean_Compiler_LCNF_PP_ppParam___closed__6;
+x_43 = l_Lean_Compiler_LCNF_PP_ppArg___closed__6;
 x_44 = lean_alloc_ctor(3, 2, 0);
 lean_ctor_set(x_44, 0, x_43);
 lean_ctor_set(x_44, 1, x_42);
@@ -1702,15 +1824,15 @@ lean_ctor_set(x_60, 1, x_47);
 x_61 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_61, 0, x_60);
 lean_ctor_set(x_61, 1, x_53);
-x_62 = l_Lean_Compiler_LCNF_PP_ppParam___closed__7;
+x_62 = l_Lean_Compiler_LCNF_PP_ppArg___closed__7;
 x_63 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_63, 0, x_62);
 lean_ctor_set(x_63, 1, x_61);
-x_64 = l_Lean_Compiler_LCNF_PP_ppParam___closed__9;
+x_64 = l_Lean_Compiler_LCNF_PP_ppArg___closed__9;
 x_65 = lean_alloc_ctor(4, 2, 0);
 lean_ctor_set(x_65, 0, x_63);
 lean_ctor_set(x_65, 1, x_64);
-x_66 = l_Lean_Compiler_LCNF_PP_ppParam___closed__6;
+x_66 = l_Lean_Compiler_LCNF_PP_ppArg___closed__6;
 x_67 = lean_alloc_ctor(3, 2, 0);
 lean_ctor_set(x_67, 0, x_66);
 lean_ctor_set(x_67, 1, x_65);
@@ -3699,6 +3821,65 @@ x_10 = l_Lean_Compiler_LCNF_PP_run___rarg(x_9, x_2, x_3, x_4, x_5);
 return x_10;
 }
 }
+static lean_object* _init_l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(0u);
+x_2 = l_Std_mkHashMapImp___rarg(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppDecl_x27_go(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_6 = l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1;
+x_7 = l_Lean_Compiler_LCNF_Decl_internalize(x_1, x_6, x_2, x_3, x_4, x_5);
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = l_Lean_Compiler_LCNF_ppDecl(x_8, x_2, x_3, x_4, x_9);
+return x_10;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_ppDecl_x27___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1;
+x_2 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_2, 0, x_1);
+lean_ctor_set(x_2, 1, x_1);
+lean_ctor_set(x_2, 2, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_ppDecl_x27___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Compiler_LCNF_ppDecl_x27___closed__1;
+x_2 = lean_unsigned_to_nat(1u);
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ppDecl_x27(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; 
+x_5 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_ppDecl_x27_go), 5, 1);
+lean_closure_set(x_5, 0, x_1);
+x_6 = l_Lean_Compiler_LCNF_ppDecl_x27___closed__2;
+x_7 = l_Lean_Compiler_LCNF_CompilerM_run___rarg(x_5, x_6, x_2, x_3, x_4);
+return x_7;
+}
+}
 lean_object* initialize_Init(uint8_t builtin, lean_object*);
 lean_object* initialize_Lean_PrettyPrinter(uint8_t builtin, lean_object*);
 lean_object* initialize_Lean_Compiler_LCNF_CompilerM(uint8_t builtin, lean_object*);
@@ -3770,6 +3951,18 @@ l_Lean_Compiler_LCNF_PP_ppArg___closed__2 = _init_l_Lean_Compiler_LCNF_PP_ppArg_
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__2);
 l_Lean_Compiler_LCNF_PP_ppArg___closed__3 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__3();
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__3);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__4 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__4();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__4);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__5 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__5();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__5);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__6 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__6();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__6);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__7 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__7();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__7);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__8 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__8();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__8);
+l_Lean_Compiler_LCNF_PP_ppArg___closed__9 = _init_l_Lean_Compiler_LCNF_PP_ppArg___closed__9();
+lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArg___closed__9);
 l_Lean_Compiler_LCNF_PP_ppArgs___closed__1 = _init_l_Lean_Compiler_LCNF_PP_ppArgs___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppArgs___closed__1);
 l_Lean_Compiler_LCNF_PP_ppApp___closed__1 = _init_l_Lean_Compiler_LCNF_PP_ppApp___closed__1();
@@ -3786,18 +3979,6 @@ l_Lean_Compiler_LCNF_PP_ppParam___closed__3 = _init_l_Lean_Compiler_LCNF_PP_ppPa
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__3);
 l_Lean_Compiler_LCNF_PP_ppParam___closed__4 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__4();
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__4);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__5 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__5();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__5);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__6 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__6();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__6);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__7 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__7();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__7);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__8 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__8();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__8);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__9 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__9();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__9);
-l_Lean_Compiler_LCNF_PP_ppParam___closed__10 = _init_l_Lean_Compiler_LCNF_PP_ppParam___closed__10();
-lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParam___closed__10);
 l_Lean_Compiler_LCNF_PP_ppParams___closed__1 = _init_l_Lean_Compiler_LCNF_PP_ppParams___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_PP_ppParams___closed__1);
 l_Lean_Compiler_LCNF_PP_ppLetDecl___closed__1 = _init_l_Lean_Compiler_LCNF_PP_ppLetDecl___closed__1();
@@ -3854,6 +4035,12 @@ l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__1 = _init_l_Lean_Compiler_LCNF
 lean_mark_persistent(l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__1);
 l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__2 = _init_l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__2();
 lean_mark_persistent(l_Lean_Compiler_LCNF_ppDecl___lambda__1___closed__2);
+l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1 = _init_l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_ppDecl_x27_go___closed__1);
+l_Lean_Compiler_LCNF_ppDecl_x27___closed__1 = _init_l_Lean_Compiler_LCNF_ppDecl_x27___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_ppDecl_x27___closed__1);
+l_Lean_Compiler_LCNF_ppDecl_x27___closed__2 = _init_l_Lean_Compiler_LCNF_ppDecl_x27___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_ppDecl_x27___closed__2);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Simp.c b/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
index dcfeafba5f..6a4e088e8c 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Simp.c
@@ -18,7 +18,6 @@ static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__11;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_restore(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__1;
 lean_object* l_Lean_Compiler_LCNF_ppDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM;
 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;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visitCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -31,7 +30,7 @@ uint8_t l_Std_HashSetImp_contains___at_Lean_Compiler_LCNF_ElimDead_elimDead___sp
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___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_Simp_inlineApp_x3f___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_Simp_simpCasesOnCtor_x3f(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__3(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__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* l_Lean_registerTraceClass(lean_object*, uint8_t, lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__4___closed__4;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -44,14 +43,15 @@ LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_Simp_Fun
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_eraseLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_arity(lean_object*);
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_eraseLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_betaReduce___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_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstStateSimpM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_eraseCodeDecls___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isReturnOf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases_go(lean_object*, lean_object*, 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*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -62,10 +62,10 @@ static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Si
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markSimplified(lean_object*);
 uint64_t l___private_Lean_Expr_0__Lean_hashFVarId____x40_Lean_Expr___hyg_1681_(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_simp___closed__1;
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_Compiler_LCNF_Simp_findCtor___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_Config_etaPoly___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7;
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_hasLocalInst(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1;
 extern lean_object* l_Lean_maxRecDepthErrorMessage;
@@ -74,6 +74,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add(lean_objec
 LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__8___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incVisited(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
 static lean_object* l_Lean_Compiler_LCNF_Simp_applyImplementedBy_x3f___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markUsedFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -84,9 +85,10 @@ lean_object* lean_environment_find(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simp___spec__7(lean_object*, 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_FunDeclInfoMap_format___spec__4___closed__5;
 lean_object* l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__1;
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__2___closed__1;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3(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_inlineApp_x3f___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_constructorApp_x3f(lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__6;
@@ -111,25 +113,25 @@ 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*);
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isReturnOf___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_Config_implementedBy___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_markUsedCode___spec__1___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_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simp___spec__5(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_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__3;
 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_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f___lambda__1___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_Simp_instMonadFVarSubstSimpMFalse___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_mkHashSetImp___rarg(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_eraseLetDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___boxed(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21(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_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_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_instReprFunDeclInfo___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__6;
@@ -137,7 +139,6 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_L
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_findExpr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_lt(size_t, size_t);
 extern lean_object* l_Lean_Compiler_implementedByAttr;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Compiler_LCNF_Code_isFun(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isUsed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo_go(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -152,16 +153,19 @@ LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDi
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs_getNumOccsOf___spec__1___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_withDiscrCtor(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*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___rarg(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_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withDiscrCtor___rarg___boxed(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_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__3;
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_specializePartialApp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_uint64_to_usize(uint64_t);
 LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__7(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incVisited___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__3(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incVisited___boxed(lean_object*);
@@ -176,6 +180,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_noConfusion___rar
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__2;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_eraseFunDecl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstStateSimpM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_isTemplateLike(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_setBlack___rarg(lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__18;
@@ -201,9 +206,10 @@ LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDisc
 extern lean_object* l_Lean_Compiler_LCNF_instInhabitedParam;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_shouldInlineLocal(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__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_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick(lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6;
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__16;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Context_discrCtorMap___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo_go___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -211,8 +217,10 @@ lean_object* lean_nat_sub(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_inline___default;
 lean_object* l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInline___boxed(lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1;
 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*);
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__1;
+static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__1;
 lean_object* l_Lean_Compiler_LCNF_Decl_getArity(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_CompilerM_codeBind(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -225,23 +233,23 @@ static lean_object* l_Lean_getConstInfoCtor___at_Lean_Compiler_LCNF_Simp_withDis
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__7;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInline___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__6(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_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(uint8_t, 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__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_State_used___default___closed__1;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_withAddMustInline(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getConstInfoCtor___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_applyImplementedBy_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Code_alphaEqv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs(lean_object*);
-lean_object* l_Lean_Compiler_LCNF_replaceFVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_noConfusion___rarg___closed__1;
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__1;
 lean_object* l_Lean_Compiler_LCNF_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Expr_fvarId_x21(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_attachCodeDecls___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_simp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, 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*);
@@ -255,8 +263,9 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_arity___b
 lean_object* l_instInhabited___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_toCtorIdx(uint8_t);
 lean_object* l_panic___at_Lean_Expr_getRevArg_x21___spec__1(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2;
+lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(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;
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Simp_instInhabitedConfig___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -266,25 +275,20 @@ 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_findExpr(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1(lean_object*, size_t, size_t);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_eraseCodeDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMap_toList___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__1(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__1;
 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_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3___boxed(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___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_toCtorIdx___boxed(lean_object*);
 lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs_getNumOccsOf___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_sort___override(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Config_smallThreshold___default;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__3;
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__2;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_noConfusion___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Pass_mkPerDeclaration(lean_object*, lean_object*, uint8_t, lean_object*);
@@ -296,10 +300,8 @@ lean_object* l_Lean_Compiler_LCNF_isClass_x3f(lean_object*, lean_object*, lean_o
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnParam_x3f_go(lean_object*, lean_object*);
 static lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f___spec__1___closed__2;
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__1(lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__8;
 size_t lean_usize_modn(size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addFunOcc___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -309,35 +311,32 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1(lea
 uint8_t l_Lean_Expr_isConst(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_ppCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 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*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5;
 static lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f___spec__1___closed__1;
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(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_simp___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__3(lean_object*, lean_object*, uint8_t);
-lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*);
+lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(lean_object*, lean_object*, uint8_t);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___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_Simp_addMustInline(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isUsed___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markUsedFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_BinderInfo_isInstImplicit(uint8_t);
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__4;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_getBinderName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addSubst___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_attachCodeDecls_go(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_attachCodeDecls_go___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo_go___lambda__2___boxed(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*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Decl_simp___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_Simp_simp___lambda__4(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_simpProj_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_findFunDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f___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*);
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__6;
@@ -346,6 +345,7 @@ static lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__3;
 uint8_t l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_Compiler_LCNF_Simp_findCtor___spec__1___boxed(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___closed__1;
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__5;
 static lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1;
 lean_object* l_Lean_Compiler_LCNF_Decl_instantiateParamsLevelParams(lean_object*, lean_object*);
@@ -358,8 +358,9 @@ LEAN_EXPORT lean_object* l_Std_HashMapImp_erase___at_Lean_Compiler_LCNF_Simp_Fun
 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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(lean_object*);
-lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Compiler_LCNF_normFunDeclImp(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_erase___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_restore___spec__2___boxed(lean_object*, lean_object*);
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__11;
 lean_object* l_Lean_Expr_fvar___override(lean_object*);
 extern lean_object* l_Lean_instInhabitedFVarId;
@@ -376,19 +377,17 @@ LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_FunDeclI
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_isTemplateLike___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_const___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_expand___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_add___spec__5(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addSubst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_noConfusion___rarg___lambda__1___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f___lambda__2(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_updateFunDeclInfo_go___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simpValue_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incVisited___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___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_LetDecl_updateValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panic___at_Lean_Compiler_LCNF_attachCodeDecls_go___spec__1(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(uint8_t, 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__12;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_simp(lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -403,7 +402,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInline___rarg(lean_object*
 lean_object* l_Lean_Compiler_LCNF_eraseCode(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__9(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_inlineJp_x3f___lambda__1___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_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_eraseParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instInhabitedReaderT___rarg___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_Core_instMonadCoreM;
@@ -421,6 +420,7 @@ lean_object* l_Lean_Compiler_LCNF_getStage1Decl_x3f(lean_object*, lean_object*,
 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_EXPORT uint8_t l_Lean_Compiler_LCNF_Simp_State_simplified___default;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3;
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__19;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -440,18 +440,18 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__4___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_Simp_isOnceOrMustInline(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__4;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnParam_x3f(lean_object*);
 lean_object* l_Lean_Compiler_LCNF_Code_size_go(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__6___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_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 static lean_object* l_panic___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__1___closed__1;
 static lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___closed__1;
 extern lean_object* l_Lean_instInhabitedName;
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___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_Decl_simp_x3f___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_funDeclInfoMap___default;
 lean_object* l_Lean_Expr_app___override(lean_object*, lean_object*);
@@ -461,24 +461,26 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(lea
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__3(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_isCasesOnParam_x3f_go___boxed(lean_object*, lean_object*);
+static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__10;
 static lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__2;
 lean_object* l_Lean_Compiler_LCNF_getFunDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__5(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_mkNewParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__1___closed__2;
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__4;
+static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 lean_object* lean_mk_array(lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markUsedExpr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___closed__2;
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182_(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_EXPORT lean_object* l_Lean_Compiler_LCNF_simp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_LCNF_mkAuxFunDecl(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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isCtorJmp_x3f(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___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markUsedExpr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173_(uint8_t, lean_object*);
@@ -493,7 +495,6 @@ static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Si
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___boxed(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* l_Lean_Compiler_LCNF_mkAuxParam(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__8___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_simpValue_x3f(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*);
@@ -503,14 +504,13 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases_
 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_incInlineLocal___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_used___default;
-lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, lean_object*);
+lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_betaReduce(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__6(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_Expr_getAppFn(lean_object*);
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__1;
@@ -521,6 +521,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markUsedLetDecl(lean_object*,
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simpProj_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__3(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_Simp___hyg_12182____closed__1;
 LEAN_EXPORT lean_object* l_Std_AssocList_erase___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_restore___spec__2(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*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__13;
@@ -535,26 +536,22 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_
 static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_reprFunDeclInfo____x40_Lean_Compiler_LCNF_Simp___hyg_173____closed__20;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_State_inlineLocal___default;
 lean_object* l_Lean_Compiler_LCNF_CodeDecl_fvarId(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__1;
+static lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_map___default;
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__9;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_updateFunDeclInfo_go___lambda__2(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_Compiler_LCNF_Decl_simp_x3f___closed__2;
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__5;
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__1;
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_specializePartialApp___spec__1___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_attachCodeDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_FunDeclInfo_noConfusion(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___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_nat_to_int(lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3;
 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_EXPORT lean_object* l_panic___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__3;
@@ -568,12 +565,13 @@ LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_Compiler_LCNF_Si
 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addMustInline___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7;
-static lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1;
+static lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___boxed(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__3;
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2;
+static lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1;
 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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_Context_config___default;
@@ -2621,7 +2619,7 @@ x_1 = lean_unsigned_to_nat(0u);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; 
@@ -2672,15 +2670,15 @@ return x_16;
 }
 }
 }
-LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 0);
+x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 0);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
@@ -2709,7 +2707,7 @@ return x_13;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; lean_object* x_9; 
@@ -2721,39 +2719,39 @@ lean_ctor_set(x_9, 1, x_7);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__1___boxed), 6, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__1___boxed), 6, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__2___boxed), 7, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__2___boxed), 7, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM() {
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1;
-x_2 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
+x_1 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2;
+x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___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) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@@ -2762,11 +2760,11 @@ lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___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) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -2776,6 +2774,113 @@ lean_dec(x_1);
 return x_8;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstStateSimpM(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; uint8_t x_13; 
+x_8 = lean_st_ref_get(x_6, x_7);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = lean_st_ref_take(x_3, x_9);
+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_is_exclusive(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_14 = lean_ctor_get(x_11, 0);
+x_15 = lean_apply_1(x_1, x_14);
+lean_ctor_set(x_11, 0, x_15);
+x_16 = lean_st_ref_set(x_3, x_11, x_12);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
+x_19 = lean_box(0);
+lean_ctor_set(x_16, 0, x_19);
+return x_16;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_16, 1);
+lean_inc(x_20);
+lean_dec(x_16);
+x_21 = lean_box(0);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_20);
+return x_22;
+}
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_23 = lean_ctor_get(x_11, 0);
+x_24 = lean_ctor_get(x_11, 1);
+x_25 = lean_ctor_get(x_11, 2);
+x_26 = lean_ctor_get_uint8(x_11, sizeof(void*)*6);
+x_27 = lean_ctor_get(x_11, 3);
+x_28 = lean_ctor_get(x_11, 4);
+x_29 = lean_ctor_get(x_11, 5);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_dec(x_11);
+x_30 = lean_apply_1(x_1, x_23);
+x_31 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_24);
+lean_ctor_set(x_31, 2, x_25);
+lean_ctor_set(x_31, 3, x_27);
+lean_ctor_set(x_31, 4, x_28);
+lean_ctor_set(x_31, 5, x_29);
+lean_ctor_set_uint8(x_31, sizeof(void*)*6, x_26);
+x_32 = lean_st_ref_set(x_3, x_31, x_12);
+x_33 = lean_ctor_get(x_32, 1);
+lean_inc(x_33);
+if (lean_is_exclusive(x_32)) {
+ lean_ctor_release(x_32, 0);
+ lean_ctor_release(x_32, 1);
+ x_34 = x_32;
+} else {
+ lean_dec_ref(x_32);
+ x_34 = lean_box(0);
+}
+x_35 = lean_box(0);
+if (lean_is_scalar(x_34)) {
+ x_36 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_36 = x_34;
+}
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_33);
+return x_36;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstStateSimpM___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstStateSimpM(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_8;
+}
+}
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_Compiler_LCNF_Simp_findCtor___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -8033,7 +8138,7 @@ x_29 = lean_st_ref_set(x_7, x_28, x_18);
 x_30 = !lean_is_exclusive(x_29);
 if (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_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; 
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_dec(x_31);
 x_32 = lean_ctor_get(x_1, 2);
@@ -8045,48 +8150,52 @@ x_36 = lean_nat_sub(x_2, x_26);
 lean_dec(x_2);
 x_37 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_3, x_35, x_36);
 x_38 = 1;
+x_39 = 0;
 lean_inc(x_33);
 lean_inc(x_32);
-x_39 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_39, 0, x_32);
-lean_ctor_set(x_39, 1, x_33);
-lean_ctor_set(x_39, 2, x_4);
-lean_ctor_set(x_39, 3, x_37);
-lean_ctor_set_uint8(x_39, sizeof(void*)*4, x_38);
-x_40 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_29, 0, x_40);
+x_40 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_40, 0, x_32);
+lean_ctor_set(x_40, 1, x_33);
+lean_ctor_set(x_40, 2, x_4);
+lean_ctor_set(x_40, 3, x_37);
+lean_ctor_set_uint8(x_40, sizeof(void*)*4, x_38);
+lean_ctor_set_uint8(x_40, sizeof(void*)*4 + 1, x_39);
+x_41 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_29, 0, x_41);
 return x_29;
 }
 else
 {
-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_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_41 = lean_ctor_get(x_29, 1);
-lean_inc(x_41);
-lean_dec(x_29);
-x_42 = lean_ctor_get(x_1, 2);
-x_43 = lean_ctor_get(x_1, 4);
-x_44 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
-lean_inc(x_2);
-x_45 = lean_mk_array(x_2, x_44);
-x_46 = lean_nat_sub(x_2, x_26);
-lean_dec(x_2);
-x_47 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_3, x_45, x_46);
-x_48 = 1;
-lean_inc(x_43);
+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; uint8_t x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_42 = lean_ctor_get(x_29, 1);
 lean_inc(x_42);
-x_49 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_49, 0, x_42);
-lean_ctor_set(x_49, 1, x_43);
-lean_ctor_set(x_49, 2, x_4);
-lean_ctor_set(x_49, 3, x_47);
-lean_ctor_set_uint8(x_49, sizeof(void*)*4, x_48);
-x_50 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_50, 0, x_49);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_41);
-return x_51;
+lean_dec(x_29);
+x_43 = lean_ctor_get(x_1, 2);
+x_44 = lean_ctor_get(x_1, 4);
+x_45 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
+lean_inc(x_2);
+x_46 = lean_mk_array(x_2, x_45);
+x_47 = lean_nat_sub(x_2, x_26);
+lean_dec(x_2);
+x_48 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_3, x_46, x_47);
+x_49 = 1;
+x_50 = 0;
+lean_inc(x_44);
+lean_inc(x_43);
+x_51 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_51, 0, x_43);
+lean_ctor_set(x_51, 1, x_44);
+lean_ctor_set(x_51, 2, x_4);
+lean_ctor_set(x_51, 3, x_48);
+lean_ctor_set_uint8(x_51, sizeof(void*)*4, x_49);
+lean_ctor_set_uint8(x_51, sizeof(void*)*4 + 1, x_50);
+x_52 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_52, 0, x_51);
+x_53 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_42);
+return x_53;
 }
 }
 }
@@ -8174,152 +8283,155 @@ return x_27;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(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_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
 lean_inc(x_2);
 lean_inc(x_1);
-x_13 = l_Lean_Compiler_LCNF_Decl_instantiateParamsLevelParams(x_1, x_2);
-x_14 = l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(x_1, x_2);
-x_15 = l_Lean_Compiler_LCNF_Simp_incInline___rarg(x_8, x_9, x_10, x_11, x_12);
-x_16 = !lean_is_exclusive(x_15);
-if (x_16 == 0)
+x_14 = l_Lean_Compiler_LCNF_Decl_instantiateParamsLevelParams(x_1, x_2);
+x_15 = l_Lean_Compiler_LCNF_Decl_instantiateValueLevelParams(x_1, x_2);
+x_16 = l_Lean_Compiler_LCNF_Simp_incInline___rarg(x_9, x_10, x_11, x_12, x_13);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
 {
-lean_object* x_17; 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_object* x_24; lean_object* x_25; 
-x_17 = lean_ctor_get(x_15, 0);
-lean_dec(x_17);
-x_18 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
+lean_object* x_18; 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_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
+x_19 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
 lean_inc(x_3);
-x_19 = lean_mk_array(x_3, x_18);
-x_20 = lean_unsigned_to_nat(1u);
-x_21 = lean_nat_sub(x_3, x_20);
+x_20 = lean_mk_array(x_3, x_19);
+x_21 = lean_unsigned_to_nat(1u);
+x_22 = lean_nat_sub(x_3, x_21);
 lean_dec(x_3);
-x_22 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_4, x_19, x_21);
-x_23 = 0;
-x_24 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_24, 0, x_13);
-lean_ctor_set(x_24, 1, x_14);
-lean_ctor_set(x_24, 2, x_5);
-lean_ctor_set(x_24, 3, x_22);
-lean_ctor_set_uint8(x_24, sizeof(void*)*4, x_23);
-x_25 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_15, 0, x_25);
-return x_15;
+x_23 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_4, x_20, x_22);
+x_24 = 0;
+x_25 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_25, 0, x_14);
+lean_ctor_set(x_25, 1, x_15);
+lean_ctor_set(x_25, 2, x_5);
+lean_ctor_set(x_25, 3, x_23);
+lean_ctor_set_uint8(x_25, sizeof(void*)*4, x_24);
+lean_ctor_set_uint8(x_25, sizeof(void*)*4 + 1, x_6);
+x_26 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_16, 0, x_26);
+return x_16;
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_26 = lean_ctor_get(x_15, 1);
-lean_inc(x_26);
-lean_dec(x_15);
-x_27 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_27 = lean_ctor_get(x_16, 1);
+lean_inc(x_27);
+lean_dec(x_16);
+x_28 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__1___closed__1;
 lean_inc(x_3);
-x_28 = lean_mk_array(x_3, x_27);
-x_29 = lean_unsigned_to_nat(1u);
-x_30 = lean_nat_sub(x_3, x_29);
+x_29 = lean_mk_array(x_3, x_28);
+x_30 = lean_unsigned_to_nat(1u);
+x_31 = lean_nat_sub(x_3, x_30);
 lean_dec(x_3);
-x_31 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_4, x_28, x_30);
-x_32 = 0;
-x_33 = lean_alloc_ctor(0, 4, 1);
-lean_ctor_set(x_33, 0, x_13);
-lean_ctor_set(x_33, 1, x_14);
-lean_ctor_set(x_33, 2, x_5);
-lean_ctor_set(x_33, 3, x_31);
-lean_ctor_set_uint8(x_33, sizeof(void*)*4, x_32);
-x_34 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_34, 0, x_33);
-x_35 = lean_alloc_ctor(0, 2, 0);
+x_32 = l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(x_4, x_29, x_31);
+x_33 = 0;
+x_34 = lean_alloc_ctor(0, 4, 2);
+lean_ctor_set(x_34, 0, x_14);
+lean_ctor_set(x_34, 1, x_15);
+lean_ctor_set(x_34, 2, x_5);
+lean_ctor_set(x_34, 3, x_32);
+lean_ctor_set_uint8(x_34, sizeof(void*)*4, x_33);
+lean_ctor_set_uint8(x_34, sizeof(void*)*4 + 1, x_6);
+x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_26);
-return x_35;
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_27);
+return x_36;
 }
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_12 = lean_nat_sub(x_1, x_2);
 x_13 = lean_unsigned_to_nat(1u);
 x_14 = lean_nat_sub(x_12, x_13);
 lean_dec(x_12);
 x_15 = l_Lean_Expr_getRevArg_x21(x_3, x_14);
-x_16 = l_Lean_Compiler_LCNF_Simp_findCtor(x_15, x_6, x_7, x_8, x_9, x_10, x_11);
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
+x_16 = 1;
+x_17 = l_Lean_Compiler_LCNF_Simp_findExpr(x_15, x_16, x_8, x_9, x_10, x_11);
+x_18 = lean_ctor_get(x_17, 0);
 lean_inc(x_18);
-lean_dec(x_16);
-x_19 = lean_st_ref_get(x_10, x_18);
-x_20 = !lean_is_exclusive(x_19);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_21 = lean_ctor_get(x_19, 0);
-x_22 = lean_ctor_get(x_19, 1);
-x_23 = lean_ctor_get(x_21, 0);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = l_Lean_Expr_isConstructorApp(x_23, x_17);
+x_19 = lean_ctor_get(x_17, 1);
+lean_inc(x_19);
 lean_dec(x_17);
-if (x_24 == 0)
+x_20 = lean_st_ref_get(x_10, x_19);
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
 {
-lean_object* x_25; 
+lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_22 = lean_ctor_get(x_20, 0);
+x_23 = lean_ctor_get(x_20, 1);
+x_24 = lean_ctor_get(x_22, 0);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = l_Lean_Expr_isConstructorApp(x_24, x_18);
+lean_dec(x_18);
+if (x_25 == 0)
+{
+lean_object* x_26; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
-x_25 = lean_box(0);
-lean_ctor_set(x_19, 0, x_25);
-return x_19;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; 
-lean_free_object(x_19);
 x_26 = lean_box(0);
-x_27 = lean_apply_7(x_4, x_26, x_6, x_7, x_8, x_9, x_10, x_22);
-return x_27;
+lean_ctor_set(x_20, 0, x_26);
+return x_20;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; 
+lean_free_object(x_20);
+x_27 = lean_box(0);
+x_28 = lean_apply_7(x_4, x_27, x_6, x_7, x_8, x_9, x_10, x_23);
+return x_28;
 }
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_28 = lean_ctor_get(x_19, 0);
-x_29 = lean_ctor_get(x_19, 1);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_19);
-x_30 = lean_ctor_get(x_28, 0);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
+x_29 = lean_ctor_get(x_20, 0);
+x_30 = lean_ctor_get(x_20, 1);
 lean_inc(x_30);
-lean_dec(x_28);
-x_31 = l_Lean_Expr_isConstructorApp(x_30, x_17);
-lean_dec(x_17);
-if (x_31 == 0)
+lean_inc(x_29);
+lean_dec(x_20);
+x_31 = lean_ctor_get(x_29, 0);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = l_Lean_Expr_isConstructorApp(x_31, x_18);
+lean_dec(x_18);
+if (x_32 == 0)
 {
-lean_object* x_32; lean_object* x_33; 
+lean_object* x_33; lean_object* x_34; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
-x_32 = lean_box(0);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_29);
-return x_33;
+x_33 = lean_box(0);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_30);
+return x_34;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; 
-x_34 = lean_box(0);
-x_35 = lean_apply_7(x_4, x_34, x_6, x_7, x_8, x_9, x_10, x_29);
-return x_35;
+lean_object* x_35; lean_object* x_36; 
+x_35 = lean_box(0);
+x_36 = lean_apply_7(x_4, x_35, x_6, x_7, x_8, x_9, x_10, x_30);
+return x_36;
 }
 }
 }
@@ -8332,7 +8444,7 @@ if (x_6 == 0)
 {
 lean_object* x_14; lean_object* x_15; 
 x_14 = lean_box(0);
-x_15 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(x_1, x_2, x_3, x_4, x_5, x_14, x_8, x_9, x_10, x_11, x_12, x_13);
+x_15 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_14, x_8, x_9, x_10, x_11, x_12, x_13);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -8342,46 +8454,23 @@ return x_15;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_box(x_6);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_1);
-x_16 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3___boxed), 12, 5);
-lean_closure_set(x_16, 0, x_1);
-lean_closure_set(x_16, 1, x_2);
-lean_closure_set(x_16, 2, x_3);
-lean_closure_set(x_16, 3, x_4);
-lean_closure_set(x_16, 4, x_5);
-x_17 = l_Lean_Compiler_LCNF_Simp_isCasesOnParam_x3f(x_1);
-if (lean_obj_tag(x_17) == 0)
+x_17 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3___boxed), 13, 6);
+lean_closure_set(x_17, 0, x_1);
+lean_closure_set(x_17, 1, x_2);
+lean_closure_set(x_17, 2, x_3);
+lean_closure_set(x_17, 3, x_4);
+lean_closure_set(x_17, 4, x_5);
+lean_closure_set(x_17, 5, x_16);
+x_18 = l_Lean_Compiler_LCNF_Simp_isCasesOnParam_x3f(x_1);
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_16);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_4);
-lean_dec(x_3);
-x_18 = lean_box(0);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_13);
-return x_19;
-}
-else
-{
-lean_object* x_20; uint8_t x_21; 
-x_20 = lean_ctor_get(x_17, 0);
-lean_inc(x_20);
+lean_object* x_19; lean_object* x_20; 
 lean_dec(x_17);
-x_21 = lean_nat_dec_lt(x_20, x_3);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; 
-lean_dec(x_20);
-lean_dec(x_16);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -8389,20 +8478,45 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_4);
 lean_dec(x_3);
-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_13);
-return x_23;
+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_13);
+return x_20;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_box(0);
-x_25 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4(x_3, x_20, x_4, x_16, x_24, x_8, x_9, x_10, x_11, x_12, x_13);
-lean_dec(x_20);
+lean_object* x_21; uint8_t x_22; 
+x_21 = lean_ctor_get(x_18, 0);
+lean_inc(x_21);
+lean_dec(x_18);
+x_22 = lean_nat_dec_lt(x_21, x_3);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; 
+lean_dec(x_21);
+lean_dec(x_17);
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_4);
 lean_dec(x_3);
-return x_25;
+x_23 = lean_box(0);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_13);
+return x_24;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_box(0);
+x_26 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4(x_3, x_21, x_4, x_17, x_25, x_8, x_9, x_10, x_11, x_12, x_13);
+lean_dec(x_21);
+lean_dec(x_3);
+return x_26;
 }
 }
 }
@@ -9055,18 +9169,20 @@ x_14 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__2(x_1, x_2, x_3,
 return x_14;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__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_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__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_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_13; 
-x_13 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+uint8_t x_14; lean_object* x_15; 
+x_14 = lean_unbox(x_6);
+lean_dec(x_6);
+x_15 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__3(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);
+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_6);
-return x_13;
+return x_15;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
@@ -9122,147 +9238,41 @@ x_11 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___lambda__8(x_1, x_10, x_3,
 return x_11;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addSubst(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) {
+static lean_object* _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1() {
 _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; 
-x_9 = lean_st_ref_get(x_7, x_8);
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_11 = lean_st_ref_take(x_4, x_10);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = !lean_is_exclusive(x_12);
-if (x_14 == 0)
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
-x_15 = lean_ctor_get(x_12, 0);
-x_16 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_15, x_1, x_2);
-lean_ctor_set(x_12, 0, x_16);
-x_17 = lean_st_ref_set(x_4, x_12, x_13);
-x_18 = !lean_is_exclusive(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_17, 0);
-lean_dec(x_19);
-x_20 = lean_box(0);
-lean_ctor_set(x_17, 0, x_20);
-return x_17;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_17, 1);
-lean_inc(x_21);
-lean_dec(x_17);
-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);
-return x_23;
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("Init.Util", 9);
+return x_1;
 }
 }
-else
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_24 = lean_ctor_get(x_12, 0);
-x_25 = lean_ctor_get(x_12, 1);
-x_26 = lean_ctor_get(x_12, 2);
-x_27 = lean_ctor_get_uint8(x_12, sizeof(void*)*6);
-x_28 = lean_ctor_get(x_12, 3);
-x_29 = lean_ctor_get(x_12, 4);
-x_30 = lean_ctor_get(x_12, 5);
-lean_inc(x_30);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_inc(x_26);
-lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_12);
-x_31 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_24, x_1, x_2);
-x_32 = lean_alloc_ctor(0, 6, 1);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_25);
-lean_ctor_set(x_32, 2, x_26);
-lean_ctor_set(x_32, 3, x_28);
-lean_ctor_set(x_32, 4, x_29);
-lean_ctor_set(x_32, 5, x_30);
-lean_ctor_set_uint8(x_32, sizeof(void*)*6, x_27);
-x_33 = lean_st_ref_set(x_4, x_32, x_13);
-x_34 = lean_ctor_get(x_33, 1);
-lean_inc(x_34);
-if (lean_is_exclusive(x_33)) {
- lean_ctor_release(x_33, 0);
- lean_ctor_release(x_33, 1);
- x_35 = x_33;
-} else {
- lean_dec_ref(x_33);
- x_35 = lean_box(0);
-}
-x_36 = lean_box(0);
-if (lean_is_scalar(x_35)) {
- x_37 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_37 = x_35;
-}
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_34);
-return x_37;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_addSubst___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) {
+static lean_object* _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2() {
 _start:
 {
-lean_object* x_9; 
-x_9 = l_Lean_Compiler_LCNF_Simp_addSubst(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);
-lean_dec(x_4);
-lean_dec(x_3);
-return x_9;
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("getElem!", 8);
+return x_1;
 }
 }
-LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1(lean_object* x_1, size_t x_2, size_t x_3) {
+static lean_object* _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3() {
 _start:
 {
-uint8_t x_4; 
-x_4 = lean_usize_dec_eq(x_2, x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; uint8_t x_7; 
-x_5 = lean_array_uget(x_1, x_2);
-x_6 = l_Lean_Compiler_LCNF_AltCore_getCode(x_5);
-lean_dec(x_5);
-x_7 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_6);
-lean_dec(x_6);
-if (x_7 == 0)
-{
-size_t x_8; size_t x_9; 
-x_8 = 1;
-x_9 = lean_usize_add(x_2, x_8);
-x_2 = x_9;
-goto _start;
-}
-else
-{
-uint8_t x_11; 
-x_11 = 1;
-return x_11;
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("index out of bounds", 19);
+return x_1;
 }
 }
-else
+static lean_object* _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4() {
+_start:
 {
-uint8_t x_12; 
-x_12 = 0;
-return x_12;
-}
+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_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1;
+x_2 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2;
+x_3 = lean_unsigned_to_nat(77u);
+x_4 = lean_unsigned_to_nat(36u);
+x_5 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3;
+x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
+return x_6;
 }
 }
 LEAN_EXPORT uint8_t l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(lean_object* x_1) {
@@ -9272,12 +9282,14 @@ switch (lean_obj_tag(x_1)) {
 case 2:
 {
 uint8_t x_2; 
+lean_dec(x_1);
 x_2 = 0;
 return x_2;
 }
 case 3:
 {
 uint8_t x_3; 
+lean_dec(x_1);
 x_3 = 0;
 return x_3;
 }
@@ -9285,7 +9297,11 @@ case 4:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
 x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+lean_dec(x_1);
 x_5 = lean_ctor_get(x_4, 3);
+lean_inc(x_5);
+lean_dec(x_4);
 x_6 = lean_array_get_size(x_5);
 x_7 = lean_unsigned_to_nat(1u);
 x_8 = lean_nat_dec_eq(x_6, x_7);
@@ -9293,6 +9309,7 @@ if (x_8 == 0)
 {
 uint8_t x_9; 
 lean_dec(x_6);
+lean_dec(x_5);
 x_9 = 0;
 return x_9;
 }
@@ -9301,78 +9318,61 @@ else
 lean_object* x_10; uint8_t x_11; 
 x_10 = lean_unsigned_to_nat(0u);
 x_11 = lean_nat_dec_lt(x_10, x_6);
+lean_dec(x_6);
 if (x_11 == 0)
 {
-uint8_t x_12; 
-lean_dec(x_6);
-x_12 = 0;
-return x_12;
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_5);
+x_12 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_13 = l_panic___at_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___spec__2(x_12);
+x_14 = l_Lean_Compiler_LCNF_AltCore_getCode(x_13);
+lean_dec(x_13);
+x_1 = x_14;
+goto _start;
 }
 else
 {
-uint8_t x_13; 
-x_13 = lean_nat_dec_le(x_6, x_6);
-if (x_13 == 0)
-{
-uint8_t x_14; 
-lean_dec(x_6);
-x_14 = 0;
-return x_14;
-}
-else
-{
-size_t x_15; size_t x_16; uint8_t x_17; 
-x_15 = 0;
-x_16 = lean_usize_of_nat(x_6);
-lean_dec(x_6);
-x_17 = l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1(x_5, x_15, x_16);
-return x_17;
-}
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_array_fget(x_5, x_10);
+lean_dec(x_5);
+x_17 = l_Lean_Compiler_LCNF_AltCore_getCode(x_16);
+lean_dec(x_16);
+x_1 = x_17;
+goto _start;
 }
 }
 }
 case 5:
 {
-uint8_t x_18; 
-x_18 = 1;
-return x_18;
-}
-case 6:
-{
 uint8_t x_19; 
+lean_dec(x_1);
 x_19 = 1;
 return x_19;
 }
+case 6:
+{
+uint8_t x_20; 
+lean_dec(x_1);
+x_20 = 1;
+return x_20;
+}
 default: 
 {
-lean_object* x_20; 
-x_20 = lean_ctor_get(x_1, 1);
-x_1 = x_20;
+lean_object* x_21; 
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_dec(x_1);
+x_1 = x_21;
 goto _start;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-size_t x_4; size_t x_5; uint8_t x_6; lean_object* x_7; 
-x_4 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_5 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_6 = l_Array_anyMUnsafe_any___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___spec__1(x_1, x_4, x_5);
-lean_dec(x_1);
-x_7 = lean_box(x_6);
-return x_7;
-}
-}
 LEAN_EXPORT lean_object* l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___boxed(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; lean_object* x_3; 
 x_2 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_1);
-lean_dec(x_1);
 x_3 = lean_box(x_2);
 return x_3;
 }
@@ -9390,7 +9390,6 @@ _start:
 {
 uint8_t x_2; lean_object* x_3; 
 x_2 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick(x_1);
-lean_dec(x_1);
 x_3 = lean_box(x_2);
 return x_3;
 }
@@ -9458,7 +9457,7 @@ lean_ctor_set(x_15, 1, x_28);
 x_29 = lean_ctor_get(x_13, 0);
 lean_inc(x_29);
 lean_dec(x_13);
-x_30 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_16, x_29, x_26);
+x_30 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_16, x_29, x_26);
 lean_ctor_set(x_4, 1, x_30);
 x_31 = 1;
 x_32 = lean_usize_add(x_3, x_31);
@@ -9480,7 +9479,7 @@ lean_ctor_set(x_37, 2, x_19);
 x_38 = lean_ctor_get(x_13, 0);
 lean_inc(x_38);
 lean_dec(x_13);
-x_39 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_16, x_38, x_34);
+x_39 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_16, x_38, x_34);
 lean_ctor_set(x_4, 1, x_39);
 lean_ctor_set(x_4, 0, x_37);
 x_40 = 1;
@@ -9547,7 +9546,7 @@ lean_ctor_set(x_55, 2, x_47);
 x_56 = lean_ctor_get(x_13, 0);
 lean_inc(x_56);
 lean_dec(x_13);
-x_57 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_44, x_56, x_52);
+x_57 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_44, x_56, x_52);
 x_58 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_58, 0, x_55);
 lean_ctor_set(x_58, 1, x_57);
@@ -9686,7 +9685,7 @@ return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_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; size_t x_32; 
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; size_t x_32; size_t x_33; 
 x_13 = lean_ctor_get(x_1, 0);
 x_14 = lean_array_uget(x_13, x_3);
 x_15 = lean_ctor_get(x_4, 0);
@@ -9696,38 +9695,39 @@ lean_inc(x_16);
 lean_dec(x_4);
 x_17 = lean_ctor_get(x_14, 2);
 lean_inc(x_17);
+x_18 = 1;
 lean_inc(x_16);
-x_18 = l_Lean_Compiler_LCNF_replaceExprFVars(x_17, x_16, x_7, x_8, x_9, x_10);
-x_19 = lean_ctor_get(x_18, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 1);
+x_19 = l_Lean_Compiler_LCNF_replaceExprFVars(x_17, x_16, x_18, x_7, x_8, x_9, x_10);
+x_20 = lean_ctor_get(x_19, 0);
 lean_inc(x_20);
-lean_dec(x_18);
-x_21 = 0;
-x_22 = l_Lean_Compiler_LCNF_mkAuxParam(x_19, x_21, x_7, x_8, x_9, x_20);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_22, 1);
+x_21 = lean_ctor_get(x_19, 1);
+lean_inc(x_21);
+lean_dec(x_19);
+x_22 = 0;
+x_23 = l_Lean_Compiler_LCNF_mkAuxParam(x_20, x_22, x_7, x_8, x_9, x_21);
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-lean_inc(x_23);
-x_25 = lean_array_push(x_15, x_23);
-x_26 = lean_ctor_get(x_14, 0);
-lean_inc(x_26);
-lean_dec(x_14);
-x_27 = lean_ctor_get(x_23, 0);
-lean_inc(x_27);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
 lean_dec(x_23);
-x_28 = l_Lean_Expr_fvar___override(x_27);
-x_29 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_16, x_26, x_28);
-x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_25);
-lean_ctor_set(x_30, 1, x_29);
-x_31 = 1;
-x_32 = lean_usize_add(x_3, x_31);
-x_3 = x_32;
-x_4 = x_30;
-x_10 = x_24;
+lean_inc(x_24);
+x_26 = lean_array_push(x_15, x_24);
+x_27 = lean_ctor_get(x_14, 0);
+lean_inc(x_27);
+lean_dec(x_14);
+x_28 = lean_ctor_get(x_24, 0);
+lean_inc(x_28);
+lean_dec(x_24);
+x_29 = l_Lean_Expr_fvar___override(x_28);
+x_30 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_16, x_27, x_29);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_26);
+lean_ctor_set(x_31, 1, x_30);
+x_32 = 1;
+x_33 = lean_usize_add(x_3, x_32);
+x_3 = x_33;
+x_4 = x_31;
+x_10 = x_25;
 goto _start;
 }
 }
@@ -9972,1705 +9972,6 @@ lean_dec(x_1);
 return x_13;
 }
 }
-static lean_object* _init_l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = l_Lean_inheritedTraceOptions;
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
-x_8 = lean_st_ref_get(x_6, x_7);
-x_9 = lean_ctor_get(x_8, 1);
-lean_inc(x_9);
-lean_dec(x_8);
-x_10 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1;
-x_11 = lean_st_ref_get(x_10, x_9);
-x_12 = !lean_is_exclusive(x_11);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; 
-x_13 = lean_ctor_get(x_11, 0);
-x_14 = lean_ctor_get(x_5, 2);
-x_15 = l___private_Lean_Util_Trace_0__Lean_checkTraceOption(x_13, x_14, x_1);
-lean_dec(x_13);
-x_16 = lean_box(x_15);
-lean_ctor_set(x_11, 0, x_16);
-return x_11;
-}
-else
-{
-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_17 = lean_ctor_get(x_11, 0);
-x_18 = lean_ctor_get(x_11, 1);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_dec(x_11);
-x_19 = lean_ctor_get(x_5, 2);
-x_20 = l___private_Lean_Util_Trace_0__Lean_checkTraceOption(x_17, x_19, x_1);
-lean_dec(x_17);
-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_18);
-return x_22;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 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; uint8_t x_26; 
-x_9 = lean_ctor_get(x_6, 5);
-x_10 = lean_st_ref_get(x_7, x_8);
-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_ctor_get(x_11, 0);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_st_ref_get(x_5, x_12);
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_ctor_get(x_15, 0);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = l_Lean_Compiler_LCNF_LCtx_toLocalContext(x_17);
-x_19 = lean_ctor_get(x_6, 2);
-x_20 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__6;
-lean_inc(x_19);
-x_21 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_21, 0, x_13);
-lean_ctor_set(x_21, 1, x_20);
-lean_ctor_set(x_21, 2, x_18);
-lean_ctor_set(x_21, 3, x_19);
-x_22 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_2);
-x_23 = lean_st_ref_take(x_7, x_16);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
-lean_inc(x_25);
-lean_dec(x_23);
-x_26 = !lean_is_exclusive(x_24);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
-x_27 = lean_ctor_get(x_24, 3);
-x_28 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
-x_29 = 0;
-x_30 = lean_alloc_ctor(12, 3, 1);
-lean_ctor_set(x_30, 0, x_1);
-lean_ctor_set(x_30, 1, x_22);
-lean_ctor_set(x_30, 2, x_28);
-lean_ctor_set_uint8(x_30, sizeof(void*)*3, x_29);
-lean_inc(x_9);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_9);
-lean_ctor_set(x_31, 1, x_30);
-x_32 = l_Std_PersistentArray_push___rarg(x_27, x_31);
-lean_ctor_set(x_24, 3, x_32);
-x_33 = lean_st_ref_set(x_7, x_24, x_25);
-x_34 = !lean_is_exclusive(x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_ctor_get(x_33, 0);
-lean_dec(x_35);
-x_36 = lean_box(0);
-lean_ctor_set(x_33, 0, x_36);
-return x_33;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_33, 1);
-lean_inc(x_37);
-lean_dec(x_33);
-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_37);
-return x_39;
-}
-}
-else
-{
-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_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_40 = lean_ctor_get(x_24, 0);
-x_41 = lean_ctor_get(x_24, 1);
-x_42 = lean_ctor_get(x_24, 2);
-x_43 = lean_ctor_get(x_24, 3);
-x_44 = lean_ctor_get(x_24, 4);
-x_45 = lean_ctor_get(x_24, 5);
-x_46 = lean_ctor_get(x_24, 6);
-lean_inc(x_46);
-lean_inc(x_45);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_inc(x_42);
-lean_inc(x_41);
-lean_inc(x_40);
-lean_dec(x_24);
-x_47 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
-x_48 = 0;
-x_49 = lean_alloc_ctor(12, 3, 1);
-lean_ctor_set(x_49, 0, x_1);
-lean_ctor_set(x_49, 1, x_22);
-lean_ctor_set(x_49, 2, x_47);
-lean_ctor_set_uint8(x_49, sizeof(void*)*3, x_48);
-lean_inc(x_9);
-x_50 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_50, 0, x_9);
-lean_ctor_set(x_50, 1, x_49);
-x_51 = l_Std_PersistentArray_push___rarg(x_43, x_50);
-x_52 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_52, 0, x_40);
-lean_ctor_set(x_52, 1, x_41);
-lean_ctor_set(x_52, 2, x_42);
-lean_ctor_set(x_52, 3, x_51);
-lean_ctor_set(x_52, 4, x_44);
-lean_ctor_set(x_52, 5, x_45);
-lean_ctor_set(x_52, 6, x_46);
-x_53 = lean_st_ref_set(x_7, x_52, x_25);
-x_54 = lean_ctor_get(x_53, 1);
-lean_inc(x_54);
-if (lean_is_exclusive(x_53)) {
- lean_ctor_release(x_53, 0);
- lean_ctor_release(x_53, 1);
- x_55 = x_53;
-} else {
- lean_dec_ref(x_53);
- x_55 = lean_box(0);
-}
-x_56 = lean_box(0);
-if (lean_is_scalar(x_55)) {
- x_57 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_57 = x_55;
-}
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_54);
-return x_57;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = l_Lean_Expr_fvar___override(x_3);
-x_10 = lean_array_push(x_2, x_9);
-lean_inc(x_8);
-x_11 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_11, 0, x_8);
-lean_ctor_set(x_11, 1, x_10);
-x_12 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_12, 0, x_11);
-lean_ctor_set(x_12, 1, x_7);
-return x_12;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(1u);
-x_2 = lean_mk_empty_array_with_capacity(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("_jp", 3);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_10 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1;
-x_11 = lean_array_push(x_10, x_1);
-x_12 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3;
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_13 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_11, x_3, x_12, x_6, x_7, x_8, x_9);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
-lean_inc(x_15);
-lean_dec(x_13);
-lean_inc(x_14);
-x_16 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1___boxed), 7, 2);
-lean_closure_set(x_16, 0, x_14);
-lean_closure_set(x_16, 1, x_10);
-x_17 = l_Lean_Compiler_LCNF_CompilerM_codeBind(x_2, x_16, x_6, x_7, x_8, x_15);
-if (lean_obj_tag(x_17) == 0)
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_17, 0);
-x_20 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_20, 0, x_14);
-lean_ctor_set(x_20, 1, x_19);
-x_21 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_21, 0, x_20);
-lean_ctor_set(x_17, 0, x_21);
-return x_17;
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_22 = lean_ctor_get(x_17, 0);
-x_23 = lean_ctor_get(x_17, 1);
-lean_inc(x_23);
-lean_inc(x_22);
-lean_dec(x_17);
-x_24 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_24, 0, x_14);
-lean_ctor_set(x_24, 1, x_22);
-x_25 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_25, 0, 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_23);
-return x_26;
-}
-}
-else
-{
-uint8_t x_27; 
-lean_dec(x_14);
-x_27 = !lean_is_exclusive(x_17);
-if (x_27 == 0)
-{
-return x_17;
-}
-else
-{
-lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_28 = lean_ctor_get(x_17, 0);
-x_29 = lean_ctor_get(x_17, 1);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_17);
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_28);
-lean_ctor_set(x_30, 1, x_29);
-return x_30;
-}
-}
-}
-else
-{
-uint8_t x_31; 
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_2);
-x_31 = !lean_is_exclusive(x_13);
-if (x_31 == 0)
-{
-return x_13;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_13, 0);
-x_33 = lean_ctor_get(x_13, 1);
-lean_inc(x_33);
-lean_inc(x_32);
-lean_dec(x_13);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("_x", 2);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___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_Simp_inlineApp_x3f___lambda__3___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-uint8_t x_11; 
-x_11 = lean_nat_dec_lt(x_1, x_2);
-if (x_11 == 0)
-{
-lean_object* x_12; 
-lean_dec(x_5);
-lean_dec(x_1);
-x_12 = l_Lean_Compiler_LCNF_replaceFVar(x_3, x_4, x_6, x_7, x_8, x_9, x_10);
-return x_12;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_13 = l_Lean_Expr_fvar___override(x_6);
-x_14 = lean_array_get_size(x_5);
-x_15 = l_Array_toSubarray___rarg(x_5, x_1, x_14);
-x_16 = l_Array_ofSubarray___rarg(x_15);
-x_17 = l_Lean_mkAppN(x_13, x_16);
-x_18 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_19 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_17, x_18, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_19) == 0)
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-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);
-x_23 = l_Lean_Compiler_LCNF_replaceFVar(x_3, x_4, x_22, x_7, x_8, x_9, x_21);
-if (lean_obj_tag(x_23) == 0)
-{
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
-{
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_23, 0);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_20);
-lean_ctor_set(x_26, 1, x_25);
-lean_ctor_set(x_23, 0, x_26);
-return x_23;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_ctor_get(x_23, 0);
-x_28 = lean_ctor_get(x_23, 1);
-lean_inc(x_28);
-lean_inc(x_27);
-lean_dec(x_23);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_20);
-lean_ctor_set(x_29, 1, x_27);
-x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_28);
-return x_30;
-}
-}
-else
-{
-uint8_t x_31; 
-lean_dec(x_20);
-x_31 = !lean_is_exclusive(x_23);
-if (x_31 == 0)
-{
-return x_23;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_23, 0);
-x_33 = lean_ctor_get(x_23, 1);
-lean_inc(x_33);
-lean_inc(x_32);
-lean_dec(x_23);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
-}
-}
-}
-else
-{
-uint8_t x_35; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_3);
-x_35 = !lean_is_exclusive(x_19);
-if (x_35 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_19, 0);
-x_37 = lean_ctor_get(x_19, 1);
-lean_inc(x_37);
-lean_inc(x_36);
-lean_dec(x_19);
-x_38 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-return x_38;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
-_start:
-{
-lean_object* x_13; lean_object* x_14; uint8_t x_15; 
-lean_dec(x_6);
-x_13 = lean_ctor_get(x_1, 0);
-lean_inc(x_13);
-lean_dec(x_1);
-x_14 = l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_arity(x_2);
-x_15 = lean_nat_dec_lt(x_3, x_14);
-if (x_15 == 0)
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; 
-x_16 = lean_ctor_get(x_2, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_2, 1);
-lean_inc(x_17);
-x_18 = lean_unsigned_to_nat(0u);
-lean_inc(x_14);
-lean_inc(x_4);
-x_19 = l_Array_toSubarray___rarg(x_4, x_18, x_14);
-x_20 = l_Array_ofSubarray___rarg(x_19);
-x_21 = 0;
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_20);
-x_22 = l_Lean_Compiler_LCNF_Simp_betaReduce(x_16, x_17, x_20, x_21, x_7, x_8, x_9, x_10, x_11, x_12);
-lean_dec(x_16);
-if (lean_obj_tag(x_22) == 0)
-{
-uint8_t x_23; 
-x_23 = !lean_is_exclusive(x_22);
-if (x_23 == 0)
-{
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_74; uint8_t x_89; 
-x_24 = lean_ctor_get(x_22, 0);
-x_25 = lean_ctor_get(x_22, 1);
-x_89 = l_Lean_Compiler_LCNF_Code_isReturnOf(x_5, x_13);
-if (x_89 == 0)
-{
-uint8_t x_90; 
-lean_free_object(x_22);
-x_90 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_24);
-if (x_90 == 0)
-{
-lean_object* x_91; 
-x_91 = lean_box(0);
-x_26 = x_91;
-goto block_73;
-}
-else
-{
-lean_object* x_92; 
-lean_dec(x_20);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_2);
-x_92 = lean_box(0);
-x_74 = x_92;
-goto block_88;
-}
-}
-else
-{
-uint8_t x_93; 
-x_93 = lean_nat_dec_eq(x_3, x_14);
-if (x_93 == 0)
-{
-uint8_t x_94; 
-lean_free_object(x_22);
-x_94 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_24);
-if (x_94 == 0)
-{
-lean_object* x_95; 
-x_95 = lean_box(0);
-x_26 = x_95;
-goto block_73;
-}
-else
-{
-lean_object* x_96; 
-lean_dec(x_20);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_2);
-x_96 = lean_box(0);
-x_74 = x_96;
-goto block_88;
-}
-}
-else
-{
-lean_object* x_97; 
-lean_dec(x_20);
-lean_dec(x_14);
-lean_dec(x_13);
-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);
-lean_dec(x_2);
-x_97 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_97, 0, x_24);
-lean_ctor_set(x_22, 0, x_97);
-return x_22;
-}
-}
-block_73:
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-lean_dec(x_26);
-x_27 = lean_ctor_get(x_2, 2);
-lean_inc(x_27);
-lean_dec(x_2);
-x_28 = l_Lean_mkAppN(x_27, x_20);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_29 = l_Lean_Compiler_LCNF_inferType(x_28, x_9, x_10, x_11, x_25);
-if (lean_obj_tag(x_29) == 0)
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = l_Lean_Compiler_LCNF_mkAuxParam(x_30, x_21, x_9, x_10, x_11, x_31);
-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_nat_dec_lt(x_14, x_3);
-lean_dec(x_3);
-if (x_35 == 0)
-{
-lean_object* x_36; lean_object* x_37; 
-lean_dec(x_14);
-lean_dec(x_4);
-x_36 = lean_ctor_get(x_33, 0);
-lean_inc(x_36);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_37 = l_Lean_Compiler_LCNF_replaceFVar(x_5, x_13, x_36, x_9, x_10, x_11, x_34);
-if (lean_obj_tag(x_37) == 0)
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
-lean_inc(x_39);
-lean_dec(x_37);
-x_40 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_33, x_24, x_38, x_7, x_8, x_9, x_10, x_11, x_39);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_40;
-}
-else
-{
-uint8_t x_41; 
-lean_dec(x_33);
-lean_dec(x_24);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_41 = !lean_is_exclusive(x_37);
-if (x_41 == 0)
-{
-return x_37;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_37, 0);
-x_43 = lean_ctor_get(x_37, 1);
-lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_37);
-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;
-}
-}
-}
-else
-{
-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_45 = lean_ctor_get(x_33, 0);
-lean_inc(x_45);
-x_46 = l_Lean_Expr_fvar___override(x_45);
-x_47 = lean_array_get_size(x_4);
-x_48 = l_Array_toSubarray___rarg(x_4, x_14, x_47);
-x_49 = l_Array_ofSubarray___rarg(x_48);
-x_50 = l_Lean_mkAppN(x_46, x_49);
-x_51 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_52 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_50, x_51, x_9, x_10, x_11, x_34);
-if (lean_obj_tag(x_52) == 0)
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_53 = lean_ctor_get(x_52, 0);
-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, 0);
-lean_inc(x_55);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_56 = l_Lean_Compiler_LCNF_replaceFVar(x_5, x_13, x_55, x_9, x_10, x_11, x_54);
-if (lean_obj_tag(x_56) == 0)
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_57 = lean_ctor_get(x_56, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_56, 1);
-lean_inc(x_58);
-lean_dec(x_56);
-x_59 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_59, 0, x_53);
-lean_ctor_set(x_59, 1, x_57);
-x_60 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_33, x_24, x_59, x_7, x_8, x_9, x_10, x_11, x_58);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_60;
-}
-else
-{
-uint8_t x_61; 
-lean_dec(x_53);
-lean_dec(x_33);
-lean_dec(x_24);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_61 = !lean_is_exclusive(x_56);
-if (x_61 == 0)
-{
-return x_56;
-}
-else
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_56, 0);
-x_63 = lean_ctor_get(x_56, 1);
-lean_inc(x_63);
-lean_inc(x_62);
-lean_dec(x_56);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
-}
-}
-}
-else
-{
-uint8_t x_65; 
-lean_dec(x_33);
-lean_dec(x_24);
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_5);
-x_65 = !lean_is_exclusive(x_52);
-if (x_65 == 0)
-{
-return x_52;
-}
-else
-{
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_52, 0);
-x_67 = lean_ctor_get(x_52, 1);
-lean_inc(x_67);
-lean_inc(x_66);
-lean_dec(x_52);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
-}
-}
-}
-}
-else
-{
-uint8_t x_69; 
-lean_dec(x_24);
-lean_dec(x_14);
-lean_dec(x_13);
-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_69 = !lean_is_exclusive(x_29);
-if (x_69 == 0)
-{
-return x_29;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_29, 0);
-x_71 = lean_ctor_get(x_29, 1);
-lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_29);
-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;
-}
-}
-}
-block_88:
-{
-lean_object* x_75; lean_object* x_76; 
-lean_dec(x_74);
-x_75 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___boxed), 10, 5);
-lean_closure_set(x_75, 0, x_14);
-lean_closure_set(x_75, 1, x_3);
-lean_closure_set(x_75, 2, x_5);
-lean_closure_set(x_75, 3, x_13);
-lean_closure_set(x_75, 4, x_4);
-x_76 = l_Lean_Compiler_LCNF_CompilerM_codeBind(x_24, x_75, x_9, x_10, x_11, x_25);
-if (lean_obj_tag(x_76) == 0)
-{
-uint8_t x_77; 
-x_77 = !lean_is_exclusive(x_76);
-if (x_77 == 0)
-{
-lean_object* x_78; lean_object* x_79; 
-x_78 = lean_ctor_get(x_76, 0);
-x_79 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_79, 0, x_78);
-lean_ctor_set(x_76, 0, x_79);
-return x_76;
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_80 = lean_ctor_get(x_76, 0);
-x_81 = lean_ctor_get(x_76, 1);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_76);
-x_82 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_82, 0, x_80);
-x_83 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_83, 0, x_82);
-lean_ctor_set(x_83, 1, x_81);
-return x_83;
-}
-}
-else
-{
-uint8_t x_84; 
-x_84 = !lean_is_exclusive(x_76);
-if (x_84 == 0)
-{
-return x_76;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_76, 0);
-x_86 = lean_ctor_get(x_76, 1);
-lean_inc(x_86);
-lean_inc(x_85);
-lean_dec(x_76);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
-}
-}
-}
-}
-else
-{
-lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_148; uint8_t x_161; 
-x_98 = lean_ctor_get(x_22, 0);
-x_99 = lean_ctor_get(x_22, 1);
-lean_inc(x_99);
-lean_inc(x_98);
-lean_dec(x_22);
-x_161 = l_Lean_Compiler_LCNF_Code_isReturnOf(x_5, x_13);
-if (x_161 == 0)
-{
-uint8_t x_162; 
-x_162 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_98);
-if (x_162 == 0)
-{
-lean_object* x_163; 
-x_163 = lean_box(0);
-x_100 = x_163;
-goto block_147;
-}
-else
-{
-lean_object* x_164; 
-lean_dec(x_20);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_2);
-x_164 = lean_box(0);
-x_148 = x_164;
-goto block_160;
-}
-}
-else
-{
-uint8_t x_165; 
-x_165 = lean_nat_dec_eq(x_3, x_14);
-if (x_165 == 0)
-{
-uint8_t x_166; 
-x_166 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_98);
-if (x_166 == 0)
-{
-lean_object* x_167; 
-x_167 = lean_box(0);
-x_100 = x_167;
-goto block_147;
-}
-else
-{
-lean_object* x_168; 
-lean_dec(x_20);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_2);
-x_168 = lean_box(0);
-x_148 = x_168;
-goto block_160;
-}
-}
-else
-{
-lean_object* x_169; lean_object* x_170; 
-lean_dec(x_20);
-lean_dec(x_14);
-lean_dec(x_13);
-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);
-lean_dec(x_2);
-x_169 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_169, 0, x_98);
-x_170 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_99);
-return x_170;
-}
-}
-block_147:
-{
-lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-lean_dec(x_100);
-x_101 = lean_ctor_get(x_2, 2);
-lean_inc(x_101);
-lean_dec(x_2);
-x_102 = l_Lean_mkAppN(x_101, x_20);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_103 = l_Lean_Compiler_LCNF_inferType(x_102, x_9, x_10, x_11, x_99);
-if (lean_obj_tag(x_103) == 0)
-{
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; 
-x_104 = lean_ctor_get(x_103, 0);
-lean_inc(x_104);
-x_105 = lean_ctor_get(x_103, 1);
-lean_inc(x_105);
-lean_dec(x_103);
-x_106 = l_Lean_Compiler_LCNF_mkAuxParam(x_104, x_21, x_9, x_10, x_11, x_105);
-x_107 = lean_ctor_get(x_106, 0);
-lean_inc(x_107);
-x_108 = lean_ctor_get(x_106, 1);
-lean_inc(x_108);
-lean_dec(x_106);
-x_109 = lean_nat_dec_lt(x_14, x_3);
-lean_dec(x_3);
-if (x_109 == 0)
-{
-lean_object* x_110; lean_object* x_111; 
-lean_dec(x_14);
-lean_dec(x_4);
-x_110 = lean_ctor_get(x_107, 0);
-lean_inc(x_110);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_111 = l_Lean_Compiler_LCNF_replaceFVar(x_5, x_13, x_110, x_9, x_10, x_11, x_108);
-if (lean_obj_tag(x_111) == 0)
-{
-lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_112 = lean_ctor_get(x_111, 0);
-lean_inc(x_112);
-x_113 = lean_ctor_get(x_111, 1);
-lean_inc(x_113);
-lean_dec(x_111);
-x_114 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_107, x_98, x_112, x_7, x_8, x_9, x_10, x_11, x_113);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_114;
-}
-else
-{
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-lean_dec(x_107);
-lean_dec(x_98);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_115 = lean_ctor_get(x_111, 0);
-lean_inc(x_115);
-x_116 = lean_ctor_get(x_111, 1);
-lean_inc(x_116);
-if (lean_is_exclusive(x_111)) {
- lean_ctor_release(x_111, 0);
- lean_ctor_release(x_111, 1);
- x_117 = x_111;
-} else {
- lean_dec_ref(x_111);
- x_117 = lean_box(0);
-}
-if (lean_is_scalar(x_117)) {
- x_118 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_118 = x_117;
-}
-lean_ctor_set(x_118, 0, x_115);
-lean_ctor_set(x_118, 1, x_116);
-return x_118;
-}
-}
-else
-{
-lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
-x_119 = lean_ctor_get(x_107, 0);
-lean_inc(x_119);
-x_120 = l_Lean_Expr_fvar___override(x_119);
-x_121 = lean_array_get_size(x_4);
-x_122 = l_Array_toSubarray___rarg(x_4, x_14, x_121);
-x_123 = l_Array_ofSubarray___rarg(x_122);
-x_124 = l_Lean_mkAppN(x_120, x_123);
-x_125 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_126 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_124, x_125, x_9, x_10, x_11, x_108);
-if (lean_obj_tag(x_126) == 0)
-{
-lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
-x_127 = lean_ctor_get(x_126, 0);
-lean_inc(x_127);
-x_128 = lean_ctor_get(x_126, 1);
-lean_inc(x_128);
-lean_dec(x_126);
-x_129 = lean_ctor_get(x_127, 0);
-lean_inc(x_129);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-x_130 = l_Lean_Compiler_LCNF_replaceFVar(x_5, x_13, x_129, x_9, x_10, x_11, x_128);
-if (lean_obj_tag(x_130) == 0)
-{
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
-x_131 = lean_ctor_get(x_130, 0);
-lean_inc(x_131);
-x_132 = lean_ctor_get(x_130, 1);
-lean_inc(x_132);
-lean_dec(x_130);
-x_133 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_133, 0, x_127);
-lean_ctor_set(x_133, 1, x_131);
-x_134 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_107, x_98, x_133, x_7, x_8, x_9, x_10, x_11, x_132);
-lean_dec(x_8);
-lean_dec(x_7);
-return x_134;
-}
-else
-{
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-lean_dec(x_127);
-lean_dec(x_107);
-lean_dec(x_98);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_135 = lean_ctor_get(x_130, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_130, 1);
-lean_inc(x_136);
-if (lean_is_exclusive(x_130)) {
- lean_ctor_release(x_130, 0);
- lean_ctor_release(x_130, 1);
- x_137 = x_130;
-} else {
- lean_dec_ref(x_130);
- x_137 = lean_box(0);
-}
-if (lean_is_scalar(x_137)) {
- x_138 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_138 = x_137;
-}
-lean_ctor_set(x_138, 0, x_135);
-lean_ctor_set(x_138, 1, x_136);
-return x_138;
-}
-}
-else
-{
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
-lean_dec(x_107);
-lean_dec(x_98);
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_5);
-x_139 = lean_ctor_get(x_126, 0);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_126, 1);
-lean_inc(x_140);
-if (lean_is_exclusive(x_126)) {
- lean_ctor_release(x_126, 0);
- lean_ctor_release(x_126, 1);
- x_141 = x_126;
-} else {
- lean_dec_ref(x_126);
- x_141 = lean_box(0);
-}
-if (lean_is_scalar(x_141)) {
- x_142 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_142 = x_141;
-}
-lean_ctor_set(x_142, 0, x_139);
-lean_ctor_set(x_142, 1, x_140);
-return x_142;
-}
-}
-}
-else
-{
-lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; 
-lean_dec(x_98);
-lean_dec(x_14);
-lean_dec(x_13);
-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_143 = lean_ctor_get(x_103, 0);
-lean_inc(x_143);
-x_144 = lean_ctor_get(x_103, 1);
-lean_inc(x_144);
-if (lean_is_exclusive(x_103)) {
- lean_ctor_release(x_103, 0);
- lean_ctor_release(x_103, 1);
- x_145 = x_103;
-} else {
- lean_dec_ref(x_103);
- x_145 = lean_box(0);
-}
-if (lean_is_scalar(x_145)) {
- x_146 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_146 = x_145;
-}
-lean_ctor_set(x_146, 0, x_143);
-lean_ctor_set(x_146, 1, x_144);
-return x_146;
-}
-}
-block_160:
-{
-lean_object* x_149; lean_object* x_150; 
-lean_dec(x_148);
-x_149 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___boxed), 10, 5);
-lean_closure_set(x_149, 0, x_14);
-lean_closure_set(x_149, 1, x_3);
-lean_closure_set(x_149, 2, x_5);
-lean_closure_set(x_149, 3, x_13);
-lean_closure_set(x_149, 4, x_4);
-x_150 = l_Lean_Compiler_LCNF_CompilerM_codeBind(x_98, x_149, x_9, x_10, x_11, x_99);
-if (lean_obj_tag(x_150) == 0)
-{
-lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
-x_151 = lean_ctor_get(x_150, 0);
-lean_inc(x_151);
-x_152 = lean_ctor_get(x_150, 1);
-lean_inc(x_152);
-if (lean_is_exclusive(x_150)) {
- lean_ctor_release(x_150, 0);
- lean_ctor_release(x_150, 1);
- x_153 = x_150;
-} else {
- lean_dec_ref(x_150);
- x_153 = lean_box(0);
-}
-x_154 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_154, 0, x_151);
-if (lean_is_scalar(x_153)) {
- x_155 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_155 = x_153;
-}
-lean_ctor_set(x_155, 0, x_154);
-lean_ctor_set(x_155, 1, x_152);
-return x_155;
-}
-else
-{
-lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; 
-x_156 = lean_ctor_get(x_150, 0);
-lean_inc(x_156);
-x_157 = lean_ctor_get(x_150, 1);
-lean_inc(x_157);
-if (lean_is_exclusive(x_150)) {
- lean_ctor_release(x_150, 0);
- lean_ctor_release(x_150, 1);
- x_158 = x_150;
-} else {
- lean_dec_ref(x_150);
- x_158 = lean_box(0);
-}
-if (lean_is_scalar(x_158)) {
- x_159 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_159 = x_158;
-}
-lean_ctor_set(x_159, 0, x_156);
-lean_ctor_set(x_159, 1, x_157);
-return x_159;
-}
-}
-}
-}
-else
-{
-uint8_t x_171; 
-lean_dec(x_20);
-lean_dec(x_14);
-lean_dec(x_13);
-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);
-lean_dec(x_2);
-x_171 = !lean_is_exclusive(x_22);
-if (x_171 == 0)
-{
-return x_22;
-}
-else
-{
-lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_172 = lean_ctor_get(x_22, 0);
-x_173 = lean_ctor_get(x_22, 1);
-lean_inc(x_173);
-lean_inc(x_172);
-lean_dec(x_22);
-x_174 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_174, 0, x_172);
-lean_ctor_set(x_174, 1, x_173);
-return x_174;
-}
-}
-}
-else
-{
-lean_object* x_175; 
-lean_dec(x_14);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_175 = l_Lean_Compiler_LCNF_Simp_specializePartialApp(x_2, x_7, x_8, x_9, x_10, x_11, x_12);
-if (lean_obj_tag(x_175) == 0)
-{
-lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; uint8_t x_181; 
-x_176 = lean_ctor_get(x_175, 0);
-lean_inc(x_176);
-x_177 = lean_ctor_get(x_175, 1);
-lean_inc(x_177);
-lean_dec(x_175);
-x_178 = lean_ctor_get(x_176, 0);
-lean_inc(x_178);
-x_179 = l_Lean_Expr_fvar___override(x_178);
-x_180 = l_Lean_Compiler_LCNF_Simp_addSubst(x_13, x_179, x_7, x_8, x_9, x_10, x_11, x_177);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_181 = !lean_is_exclusive(x_180);
-if (x_181 == 0)
-{
-lean_object* x_182; lean_object* x_183; lean_object* x_184; 
-x_182 = lean_ctor_get(x_180, 0);
-lean_dec(x_182);
-x_183 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_183, 0, x_176);
-lean_ctor_set(x_183, 1, x_5);
-x_184 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_184, 0, x_183);
-lean_ctor_set(x_180, 0, x_184);
-return x_180;
-}
-else
-{
-lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; 
-x_185 = lean_ctor_get(x_180, 1);
-lean_inc(x_185);
-lean_dec(x_180);
-x_186 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_186, 0, x_176);
-lean_ctor_set(x_186, 1, x_5);
-x_187 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_187, 0, x_186);
-x_188 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_188, 0, x_187);
-lean_ctor_set(x_188, 1, x_185);
-return x_188;
-}
-}
-else
-{
-uint8_t x_189; 
-lean_dec(x_13);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_5);
-x_189 = !lean_is_exclusive(x_175);
-if (x_189 == 0)
-{
-return x_175;
-}
-else
-{
-lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-x_190 = lean_ctor_get(x_175, 0);
-x_191 = lean_ctor_get(x_175, 1);
-lean_inc(x_191);
-lean_inc(x_190);
-lean_dec(x_175);
-x_192 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_192, 0, x_190);
-lean_ctor_set(x_192, 1, x_191);
-return x_192;
-}
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___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_inlineApp_x3f___lambda__5___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_Simp_inlineApp_x3f___lambda__5___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3() {
-_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_inlineApp_x3f___lambda__5___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__2;
-x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
-x_2 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("inlining ", 9);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__4___closed__3;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; lean_object* x_11; 
-lean_dec(x_3);
-x_10 = lean_ctor_get(x_1, 3);
-lean_inc(x_10);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_10);
-x_11 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f(x_10, x_4, x_5, x_6, x_7, x_8, x_9);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-if (lean_obj_tag(x_12) == 0)
-{
-uint8_t x_13; 
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_13 = !lean_is_exclusive(x_11);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_ctor_get(x_11, 0);
-lean_dec(x_14);
-x_15 = lean_box(0);
-lean_ctor_set(x_11, 0, x_15);
-return x_11;
-}
-else
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_11, 1);
-lean_inc(x_16);
-lean_dec(x_11);
-x_17 = lean_box(0);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-return x_18;
-}
-}
-else
-{
-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; uint8_t x_28; 
-x_19 = lean_ctor_get(x_11, 1);
-lean_inc(x_19);
-lean_dec(x_11);
-x_20 = lean_ctor_get(x_12, 0);
-lean_inc(x_20);
-lean_dec(x_12);
-x_21 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_5, x_6, x_7, x_8, x_19);
-x_22 = lean_ctor_get(x_21, 1);
-lean_inc(x_22);
-lean_dec(x_21);
-x_23 = lean_ctor_get(x_20, 3);
-lean_inc(x_23);
-x_24 = lean_array_get_size(x_23);
-x_25 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5;
-x_26 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(x_25, x_4, x_5, x_6, x_7, x_8, x_22);
-x_27 = lean_ctor_get(x_26, 0);
-lean_inc(x_27);
-x_28 = lean_unbox(x_27);
-lean_dec(x_27);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-lean_dec(x_10);
-x_29 = lean_ctor_get(x_26, 1);
-lean_inc(x_29);
-lean_dec(x_26);
-x_30 = lean_box(0);
-x_31 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(x_1, x_20, x_24, x_23, x_2, x_30, x_4, x_5, x_6, x_7, x_8, x_29);
-return x_31;
-}
-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; 
-x_32 = lean_ctor_get(x_26, 1);
-lean_inc(x_32);
-lean_dec(x_26);
-x_33 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_33, 0, x_10);
-x_34 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7;
-x_35 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_33);
-x_36 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8;
-x_37 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_37, 0, x_35);
-lean_ctor_set(x_37, 1, x_36);
-x_38 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(x_25, x_37, x_4, x_5, x_6, x_7, x_8, x_32);
-x_39 = lean_ctor_get(x_38, 0);
-lean_inc(x_39);
-x_40 = lean_ctor_get(x_38, 1);
-lean_inc(x_40);
-lean_dec(x_38);
-x_41 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(x_1, x_20, x_24, x_23, x_2, x_39, x_4, x_5, x_6, x_7, x_8, x_40);
-return x_41;
-}
-}
-}
-else
-{
-uint8_t x_42; 
-lean_dec(x_10);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_42 = !lean_is_exclusive(x_11);
-if (x_42 == 0)
-{
-return x_11;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_11, 0);
-x_44 = lean_ctor_get(x_11, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_11);
-x_45 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_45, 0, x_43);
-lean_ctor_set(x_45, 1, x_44);
-return x_45;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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:
-{
-if (lean_obj_tag(x_2) == 6)
-{
-lean_object* x_9; lean_object* x_10; 
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_9 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_9, 0, x_2);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_10, 1, x_8);
-return x_10;
-}
-else
-{
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_box(0);
-x_12 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5(x_1, x_2, x_11, x_3, x_4, x_5, x_6, x_7, x_8);
-return x_12;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; 
-x_8 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(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);
-lean_dec(x_4);
-lean_dec(x_3);
-return x_9;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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) {
-_start:
-{
-lean_object* x_8; 
-x_8 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-return x_8;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_10;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__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_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-lean_object* x_11; 
-x_11 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_2);
-return x_11;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineJp_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -12602,43 +10903,6 @@ lean_dec(x_1);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("Init.Util", 9);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("getElem!", 8);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("index out of bounds", 19);
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_1 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1;
-x_2 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2;
-x_3 = lean_unsigned_to_nat(77u);
-x_4 = lean_unsigned_to_nat(36u);
-x_5 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3;
-x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
-return x_6;
-}
-}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_attachCodeDecls_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) {
 _start:
 {
@@ -12671,7 +10935,7 @@ lean_dec(x_43);
 if (x_44 == 0)
 {
 lean_object* x_45; lean_object* x_46; 
-x_45 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_45 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_46 = l_panic___at_Lean_Compiler_LCNF_attachCodeDecls_go___spec__1(x_45);
 x_15 = x_46;
 goto block_42;
@@ -13033,7 +11297,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_Simp_inlineProjInst_x3f_visit___closed__1;
 x_2 = l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__2;
-x_3 = lean_unsigned_to_nat(650u);
+x_3 = lean_unsigned_to_nat(600u);
 x_4 = lean_unsigned_to_nat(32u);
 x_5 = l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13046,7 +11310,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_Simp_inlineProjInst_x3f_visit___closed__1;
 x_2 = l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__2;
-x_3 = lean_unsigned_to_nat(653u);
+x_3 = lean_unsigned_to_nat(603u);
 x_4 = lean_unsigned_to_nat(32u);
 x_5 = l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13452,7 +11716,7 @@ if (x_96 == 0)
 lean_object* x_106; lean_object* x_107; 
 lean_dec(x_94);
 lean_dec(x_90);
-x_106 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_106 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_107 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_106);
 x_98 = x_107;
 goto block_105;
@@ -13912,7 +12176,7 @@ if (x_192 == 0)
 lean_object* x_202; lean_object* x_203; 
 lean_dec(x_190);
 lean_dec(x_186);
-x_202 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_202 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_203 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_202);
 x_194 = x_203;
 goto block_201;
@@ -14372,7 +12636,7 @@ if (x_288 == 0)
 lean_object* x_298; lean_object* x_299; 
 lean_dec(x_286);
 lean_dec(x_282);
-x_298 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_298 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_299 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_298);
 x_290 = x_299;
 goto block_297;
@@ -14832,7 +13096,7 @@ if (x_384 == 0)
 lean_object* x_394; lean_object* x_395; 
 lean_dec(x_382);
 lean_dec(x_378);
-x_394 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_394 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_395 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_394);
 x_386 = x_395;
 goto block_393;
@@ -15292,7 +13556,7 @@ if (x_480 == 0)
 lean_object* x_490; lean_object* x_491; 
 lean_dec(x_478);
 lean_dec(x_474);
-x_490 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_490 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_491 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_490);
 x_482 = x_491;
 goto block_489;
@@ -15752,7 +14016,7 @@ if (x_576 == 0)
 lean_object* x_586; lean_object* x_587; 
 lean_dec(x_574);
 lean_dec(x_570);
-x_586 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_586 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_587 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_586);
 x_578 = x_587;
 goto block_585;
@@ -16212,7 +14476,7 @@ if (x_672 == 0)
 lean_object* x_682; lean_object* x_683; 
 lean_dec(x_670);
 lean_dec(x_666);
-x_682 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_682 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_683 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_682);
 x_674 = x_683;
 goto block_681;
@@ -16672,7 +14936,7 @@ if (x_768 == 0)
 lean_object* x_778; lean_object* x_779; 
 lean_dec(x_766);
 lean_dec(x_762);
-x_778 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_778 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_779 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_778);
 x_770 = x_779;
 goto block_777;
@@ -17132,7 +15396,7 @@ if (x_864 == 0)
 lean_object* x_874; lean_object* x_875; 
 lean_dec(x_862);
 lean_dec(x_858);
-x_874 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_874 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_875 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_874);
 x_866 = x_875;
 goto block_873;
@@ -17592,7 +15856,7 @@ if (x_960 == 0)
 lean_object* x_970; lean_object* x_971; 
 lean_dec(x_958);
 lean_dec(x_954);
-x_970 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_970 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_971 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_970);
 x_962 = x_971;
 goto block_969;
@@ -18052,7 +16316,7 @@ if (x_1056 == 0)
 lean_object* x_1066; lean_object* x_1067; 
 lean_dec(x_1054);
 lean_dec(x_1050);
-x_1066 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_1066 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_1067 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_1066);
 x_1058 = x_1067;
 goto block_1065;
@@ -18669,7 +16933,7 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t 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_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
 x_15 = lean_unsigned_to_nat(0u);
 x_16 = lean_array_fget(x_9, x_15);
 lean_dec(x_9);
@@ -18686,176 +16950,177 @@ lean_dec(x_19);
 x_22 = lean_ctor_get(x_20, 0);
 lean_inc(x_22);
 lean_dec(x_20);
-x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_22, x_16);
-x_24 = 1;
-x_25 = l_Lean_Compiler_LCNF_Simp_findExpr(x_23, x_24, x_4, x_5, x_6, x_21);
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
+x_23 = 0;
+x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_22, x_23, x_16);
+x_25 = 1;
+x_26 = l_Lean_Compiler_LCNF_Simp_findExpr(x_24, x_25, x_4, x_5, x_6, x_21);
+x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
-lean_dec(x_25);
-x_28 = lean_st_ref_get(x_6, x_27);
-x_29 = !lean_is_exclusive(x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_30 = lean_ctor_get(x_28, 0);
-x_31 = lean_ctor_get(x_28, 1);
-x_32 = lean_ctor_get(x_30, 0);
-lean_inc(x_32);
-lean_dec(x_30);
-x_33 = l_Lean_Expr_isConstructorApp(x_32, x_26);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
 lean_dec(x_26);
-if (x_33 == 0)
+x_29 = lean_st_ref_get(x_6, x_28);
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
 {
-lean_object* x_34; 
+lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_31 = lean_ctor_get(x_29, 0);
+x_32 = lean_ctor_get(x_29, 1);
+x_33 = lean_ctor_get(x_31, 0);
+lean_inc(x_33);
+lean_dec(x_31);
+x_34 = l_Lean_Expr_isConstructorApp(x_33, x_27);
+lean_dec(x_27);
+if (x_34 == 0)
+{
+lean_object* x_35; 
 lean_dec(x_8);
-x_34 = lean_box(0);
-lean_ctor_set(x_28, 0, x_34);
-return x_28;
+x_35 = lean_box(0);
+lean_ctor_set(x_29, 0, x_35);
+return x_29;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
-lean_free_object(x_28);
-x_35 = lean_st_ref_get(x_6, x_31);
-x_36 = lean_ctor_get(x_35, 1);
-lean_inc(x_36);
-lean_dec(x_35);
-x_37 = lean_st_ref_get(x_3, x_36);
-x_38 = !lean_is_exclusive(x_37);
-if (x_38 == 0)
+lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+lean_free_object(x_29);
+x_36 = lean_st_ref_get(x_6, x_32);
+x_37 = lean_ctor_get(x_36, 1);
+lean_inc(x_37);
+lean_dec(x_36);
+x_38 = lean_st_ref_get(x_3, x_37);
+x_39 = !lean_is_exclusive(x_38);
+if (x_39 == 0)
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_39 = lean_ctor_get(x_37, 0);
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-lean_dec(x_39);
-x_41 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_40, x_8);
-x_42 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_37, 0, x_42);
-return x_37;
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_40 = lean_ctor_get(x_38, 0);
+x_41 = lean_ctor_get(x_40, 0);
+lean_inc(x_41);
+lean_dec(x_40);
+x_42 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_41, x_8, x_23);
+x_43 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_38, 0, x_43);
+return x_38;
 }
 else
 {
-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_43 = lean_ctor_get(x_37, 0);
-x_44 = lean_ctor_get(x_37, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_37);
-x_45 = lean_ctor_get(x_43, 0);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_44 = lean_ctor_get(x_38, 0);
+x_45 = lean_ctor_get(x_38, 1);
 lean_inc(x_45);
-lean_dec(x_43);
-x_46 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_45, x_8);
-x_47 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_47, 0, x_46);
-x_48 = lean_alloc_ctor(0, 2, 0);
+lean_inc(x_44);
+lean_dec(x_38);
+x_46 = lean_ctor_get(x_44, 0);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_46, x_8, x_23);
+x_48 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_44);
-return x_48;
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_45);
+return x_49;
 }
 }
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
-x_49 = lean_ctor_get(x_28, 0);
-x_50 = lean_ctor_get(x_28, 1);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_28);
-x_51 = lean_ctor_get(x_49, 0);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
+x_50 = lean_ctor_get(x_29, 0);
+x_51 = lean_ctor_get(x_29, 1);
 lean_inc(x_51);
-lean_dec(x_49);
-x_52 = l_Lean_Expr_isConstructorApp(x_51, x_26);
-lean_dec(x_26);
-if (x_52 == 0)
+lean_inc(x_50);
+lean_dec(x_29);
+x_52 = lean_ctor_get(x_50, 0);
+lean_inc(x_52);
+lean_dec(x_50);
+x_53 = l_Lean_Expr_isConstructorApp(x_52, x_27);
+lean_dec(x_27);
+if (x_53 == 0)
 {
-lean_object* x_53; lean_object* x_54; 
+lean_object* x_54; lean_object* x_55; 
 lean_dec(x_8);
-x_53 = lean_box(0);
-x_54 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_54, 0, x_53);
-lean_ctor_set(x_54, 1, x_50);
-return x_54;
+x_54 = lean_box(0);
+x_55 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_55, 0, x_54);
+lean_ctor_set(x_55, 1, x_51);
+return x_55;
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_55 = lean_st_ref_get(x_6, x_50);
-x_56 = lean_ctor_get(x_55, 1);
-lean_inc(x_56);
-lean_dec(x_55);
-x_57 = lean_st_ref_get(x_3, x_56);
-x_58 = lean_ctor_get(x_57, 0);
-lean_inc(x_58);
-x_59 = lean_ctor_get(x_57, 1);
+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; 
+x_56 = lean_st_ref_get(x_6, x_51);
+x_57 = lean_ctor_get(x_56, 1);
+lean_inc(x_57);
+lean_dec(x_56);
+x_58 = lean_st_ref_get(x_3, x_57);
+x_59 = lean_ctor_get(x_58, 0);
 lean_inc(x_59);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_60 = x_57;
+x_60 = lean_ctor_get(x_58, 1);
+lean_inc(x_60);
+if (lean_is_exclusive(x_58)) {
+ lean_ctor_release(x_58, 0);
+ lean_ctor_release(x_58, 1);
+ x_61 = x_58;
 } else {
- lean_dec_ref(x_57);
- x_60 = lean_box(0);
-}
-x_61 = lean_ctor_get(x_58, 0);
-lean_inc(x_61);
-lean_dec(x_58);
-x_62 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_61, x_8);
-x_63 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_63, 0, x_62);
-if (lean_is_scalar(x_60)) {
- x_64 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_64 = x_60;
+ lean_dec_ref(x_58);
+ x_61 = lean_box(0);
 }
+x_62 = lean_ctor_get(x_59, 0);
+lean_inc(x_62);
+lean_dec(x_59);
+x_63 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_62, x_8, x_23);
+x_64 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_64, 0, x_63);
-lean_ctor_set(x_64, 1, x_59);
-return x_64;
+if (lean_is_scalar(x_61)) {
+ x_65 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_65 = x_61;
+}
+lean_ctor_set(x_65, 0, x_64);
+lean_ctor_set(x_65, 1, x_60);
+return x_65;
 }
 }
 }
 }
 case 4:
 {
-lean_object* x_65; lean_object* x_66; 
+lean_object* x_66; lean_object* x_67; 
 lean_dec(x_1);
-x_65 = lean_box(0);
-x_66 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_7);
-return x_66;
+x_66 = lean_box(0);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_7);
+return x_67;
 }
 case 5:
 {
-lean_object* x_67; lean_object* x_68; 
+lean_object* x_68; lean_object* x_69; 
 lean_dec(x_1);
-x_67 = lean_box(0);
-x_68 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_68, 0, x_67);
-lean_ctor_set(x_68, 1, x_7);
-return x_68;
+x_68 = lean_box(0);
+x_69 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_69, 0, x_68);
+lean_ctor_set(x_69, 1, x_7);
+return x_69;
 }
 case 6:
 {
-lean_object* x_69; lean_object* x_70; 
+lean_object* x_70; lean_object* x_71; 
 lean_dec(x_1);
-x_69 = lean_box(0);
-x_70 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_7);
-return x_70;
+x_70 = lean_box(0);
+x_71 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_7);
+return x_71;
 }
 default: 
 {
-lean_object* x_71; 
-x_71 = lean_ctor_get(x_1, 1);
-lean_inc(x_71);
+lean_object* x_72; 
+x_72 = lean_ctor_get(x_1, 1);
+lean_inc(x_72);
 lean_dec(x_1);
-x_1 = x_71;
+x_1 = x_72;
 goto _start;
 }
 }
@@ -18957,7 +17222,7 @@ lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean
 x_12 = lean_ctor_get(x_2, 1);
 x_13 = lean_ctor_get(x_12, 0);
 x_14 = lean_ctor_get(x_1, 4);
-x_15 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_15 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_16 = l_panic___at_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases___spec__1(x_15);
 x_17 = l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f_isJpCases_go(x_16, x_13, x_14, x_10);
 lean_dec(x_16);
@@ -19128,7 +17393,7 @@ lean_dec(x_65);
 if (x_67 == 0)
 {
 lean_object* x_68; lean_object* x_69; 
-x_68 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_68 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_69 = l_panic___at_Lean_Compiler_LCNF_CasesCore_extractAlt_x21___spec__2(x_68);
 x_9 = x_69;
 goto block_64;
@@ -19416,7 +17681,7 @@ x_14 = lean_nat_dec_lt(x_5, x_2);
 if (x_14 == 0)
 {
 lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_15 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_15 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_16 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_15);
 x_17 = l_Lean_Compiler_LCNF_AltCore_getCode(x_16);
 lean_dec(x_16);
@@ -19508,7 +17773,7 @@ if (x_4 == 0)
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 lean_dec(x_2);
-x_7 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_7 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_8 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_7);
 x_9 = l_Lean_Compiler_LCNF_AltCore_getCode(x_8);
 lean_dec(x_8);
@@ -19596,7 +17861,7 @@ x_20 = lean_nat_dec_lt(x_4, x_2);
 if (x_20 == 0)
 {
 lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_21 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_22 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_21);
 lean_ctor_set(x_7, 1, x_22);
 lean_ctor_set(x_7, 0, x_16);
@@ -19654,7 +17919,7 @@ x_35 = lean_nat_dec_lt(x_4, x_2);
 if (x_35 == 0)
 {
 lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_36 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_36 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_37 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_36);
 x_38 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_38, 0, x_30);
@@ -19742,7 +18007,7 @@ x_20 = lean_nat_dec_lt(x_4, x_2);
 if (x_20 == 0)
 {
 lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_21 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_22 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_21);
 lean_ctor_set(x_7, 1, x_22);
 lean_ctor_set(x_7, 0, x_16);
@@ -19800,7 +18065,7 @@ x_35 = lean_nat_dec_lt(x_4, x_2);
 if (x_35 == 0)
 {
 lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_36 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_36 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_37 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_36);
 x_38 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_38, 0, x_30);
@@ -19855,7 +18120,7 @@ x_5 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_getMaxOccs_
 if (x_4 == 0)
 {
 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; 
-x_6 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_6 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_7 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_6);
 x_8 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_8, 0, x_5);
@@ -19991,7 +18256,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_Simp_inlineProjInst_x3f_visit___closed__1;
 x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault___spec__2___closed__1;
-x_3 = lean_unsigned_to_nat(785u);
+x_3 = lean_unsigned_to_nat(735u);
 x_4 = lean_unsigned_to_nat(35u);
 x_5 = l_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -20667,7 +18932,7 @@ if (x_31 == 0)
 lean_object* x_32; lean_object* x_33; 
 lean_dec(x_29);
 lean_dec(x_24);
-x_32 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_32 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_33 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_32);
 lean_ctor_set(x_19, 0, x_33);
 lean_ctor_set(x_25, 0, x_19);
@@ -20704,7 +18969,7 @@ if (x_39 == 0)
 lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 lean_dec(x_37);
 lean_dec(x_24);
-x_40 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_40 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_41 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_40);
 lean_ctor_set(x_19, 0, x_41);
 x_42 = lean_alloc_ctor(0, 2, 0);
@@ -20762,7 +19027,7 @@ if (x_54 == 0)
 lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
 lean_dec(x_52);
 lean_dec(x_47);
-x_55 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_55 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_56 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_55);
 x_57 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_57, 0, x_56);
@@ -20860,7 +19125,7 @@ if (x_79 == 0)
 lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
 lean_dec(x_77);
 lean_dec(x_72);
-x_80 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
+x_80 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
 x_81 = l_panic___at_Lean_Expr_getRevArg_x21___spec__1(x_80);
 if (lean_is_scalar(x_70)) {
  x_82 = lean_alloc_ctor(1, 1, 0);
@@ -21839,6 +20104,24 @@ lean_dec(x_2);
 return x_8;
 }
 }
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("_x", 2);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___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_Simp_etaPolyApp_x3f___closed__1;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_etaPolyApp_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) {
 _start:
 {
@@ -21847,21 +20130,21 @@ x_8 = lean_ctor_get(x_2, 1);
 x_9 = lean_ctor_get_uint8(x_8, sizeof(void*)*1);
 if (x_9 == 0)
 {
-lean_object* x_269; 
-x_269 = lean_box(0);
-x_10 = x_269;
+lean_object* x_325; 
+x_325 = lean_box(0);
+x_10 = x_325;
 x_11 = x_7;
-goto block_268;
+goto block_324;
 }
 else
 {
-lean_object* x_270; 
-x_270 = l_Lean_Compiler_LCNF_Simp_simpAppApp_x3f___closed__1;
-x_10 = x_270;
+lean_object* x_326; 
+x_326 = l_Lean_Compiler_LCNF_Simp_simpAppApp_x3f___closed__1;
+x_10 = x_326;
 x_11 = x_7;
-goto block_268;
+goto block_324;
 }
-block_268:
+block_324:
 {
 if (lean_obj_tag(x_10) == 0)
 {
@@ -22046,7 +20329,7 @@ x_56 = 0;
 lean_inc(x_52);
 x_57 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_55, x_56, x_52);
 x_58 = l_Lean_mkAppN(x_14, x_57);
-x_59 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
+x_59 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
@@ -22073,7 +20356,7 @@ lean_inc(x_4);
 x_67 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_52, x_65, x_66, x_4, x_5, x_6, x_62);
 if (lean_obj_tag(x_67) == 0)
 {
-lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; 
+lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 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; uint8_t x_90; 
 x_68 = lean_ctor_get(x_67, 0);
 lean_inc(x_68);
 x_69 = lean_ctor_get(x_67, 1);
@@ -22083,519 +20366,618 @@ x_70 = lean_ctor_get(x_1, 0);
 lean_inc(x_70);
 x_71 = lean_ctor_get(x_68, 0);
 lean_inc(x_71);
-x_72 = l_Lean_Expr_fvar___override(x_71);
-x_73 = l_Lean_Compiler_LCNF_Simp_addSubst(x_70, x_72, x_2, x_3, x_4, x_5, x_6, x_69);
-x_74 = lean_ctor_get(x_73, 1);
-lean_inc(x_74);
-lean_dec(x_73);
-x_75 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_74);
+x_72 = lean_st_ref_get(x_6, x_69);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
+x_74 = lean_st_ref_take(x_3, x_73);
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+lean_dec(x_74);
+x_77 = lean_ctor_get(x_75, 0);
+lean_inc(x_77);
+x_78 = l_Lean_Expr_fvar___override(x_71);
+x_79 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_77, x_70, x_78);
+x_80 = lean_ctor_get(x_75, 1);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_75, 2);
+lean_inc(x_81);
+x_82 = lean_ctor_get_uint8(x_75, sizeof(void*)*6);
+x_83 = lean_ctor_get(x_75, 3);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_75, 4);
+lean_inc(x_84);
+x_85 = lean_ctor_get(x_75, 5);
+lean_inc(x_85);
+lean_dec(x_75);
+x_86 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_86, 0, x_79);
+lean_ctor_set(x_86, 1, x_80);
+lean_ctor_set(x_86, 2, x_81);
+lean_ctor_set(x_86, 3, x_83);
+lean_ctor_set(x_86, 4, x_84);
+lean_ctor_set(x_86, 5, x_85);
+lean_ctor_set_uint8(x_86, sizeof(void*)*6, x_82);
+x_87 = lean_st_ref_set(x_3, x_86, x_76);
+x_88 = lean_ctor_get(x_87, 1);
+lean_inc(x_88);
+lean_dec(x_87);
+x_89 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_88);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_76 = !lean_is_exclusive(x_75);
-if (x_76 == 0)
+x_90 = !lean_is_exclusive(x_89);
+if (x_90 == 0)
 {
-lean_object* x_77; 
-x_77 = lean_ctor_get(x_75, 0);
-lean_dec(x_77);
+lean_object* x_91; 
+x_91 = lean_ctor_get(x_89, 0);
+lean_dec(x_91);
 lean_ctor_set(x_33, 0, x_68);
-lean_ctor_set(x_75, 0, x_33);
-return x_75;
+lean_ctor_set(x_89, 0, x_33);
+return x_89;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; 
-x_78 = lean_ctor_get(x_75, 1);
-lean_inc(x_78);
-lean_dec(x_75);
+lean_object* x_92; lean_object* x_93; 
+x_92 = lean_ctor_get(x_89, 1);
+lean_inc(x_92);
+lean_dec(x_89);
 lean_ctor_set(x_33, 0, x_68);
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_33);
-lean_ctor_set(x_79, 1, x_78);
-return x_79;
+x_93 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_93, 0, x_33);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
 }
 }
 else
 {
-uint8_t x_80; 
+uint8_t x_94; 
 lean_free_object(x_33);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_80 = !lean_is_exclusive(x_67);
-if (x_80 == 0)
+x_94 = !lean_is_exclusive(x_67);
+if (x_94 == 0)
 {
 return x_67;
 }
 else
 {
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_67, 0);
-x_82 = lean_ctor_get(x_67, 1);
-lean_inc(x_82);
-lean_inc(x_81);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_67, 0);
+x_96 = lean_ctor_get(x_67, 1);
+lean_inc(x_96);
+lean_inc(x_95);
 lean_dec(x_67);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
 }
 }
 }
 else
 {
-uint8_t x_84; 
+uint8_t x_98; 
 lean_dec(x_52);
 lean_free_object(x_33);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_84 = !lean_is_exclusive(x_60);
-if (x_84 == 0)
+x_98 = !lean_is_exclusive(x_60);
+if (x_98 == 0)
 {
 return x_60;
 }
 else
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_60, 0);
-x_86 = lean_ctor_get(x_60, 1);
-lean_inc(x_86);
-lean_inc(x_85);
+lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+x_99 = lean_ctor_get(x_60, 0);
+x_100 = lean_ctor_get(x_60, 1);
+lean_inc(x_100);
+lean_inc(x_99);
 lean_dec(x_60);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
+x_101 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_101, 0, x_99);
+lean_ctor_set(x_101, 1, x_100);
+return x_101;
 }
 }
 }
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; 
-x_88 = lean_ctor_get(x_33, 0);
-lean_inc(x_88);
+lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; 
+x_102 = lean_ctor_get(x_33, 0);
+lean_inc(x_102);
 lean_dec(x_33);
-x_89 = lean_unsigned_to_nat(0u);
-x_90 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_89);
-x_91 = l_Lean_Compiler_LCNF_Decl_getArity(x_88);
-lean_dec(x_88);
-x_92 = lean_nat_dec_lt(x_90, x_91);
-lean_dec(x_91);
-lean_dec(x_90);
-if (x_92 == 0)
+x_103 = lean_unsigned_to_nat(0u);
+x_104 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_103);
+x_105 = l_Lean_Compiler_LCNF_Decl_getArity(x_102);
+lean_dec(x_102);
+x_106 = lean_nat_dec_lt(x_104, x_105);
+lean_dec(x_105);
+lean_dec(x_104);
+if (x_106 == 0)
 {
-lean_object* x_93; 
+lean_object* x_107; 
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_93 = lean_box(0);
-lean_ctor_set(x_32, 0, x_93);
+x_107 = lean_box(0);
+lean_ctor_set(x_32, 0, x_107);
 return x_32;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; size_t x_99; size_t x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; size_t x_113; size_t x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
 lean_free_object(x_32);
-x_94 = lean_ctor_get(x_1, 2);
-lean_inc(x_94);
-x_95 = l_Lean_Compiler_LCNF_mkNewParams(x_94, x_4, x_5, x_6, x_41);
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-lean_dec(x_95);
-x_98 = lean_array_get_size(x_96);
-x_99 = lean_usize_of_nat(x_98);
-lean_dec(x_98);
-x_100 = 0;
-lean_inc(x_96);
-x_101 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_99, x_100, x_96);
-x_102 = l_Lean_mkAppN(x_14, x_101);
-x_103 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
+x_108 = lean_ctor_get(x_1, 2);
+lean_inc(x_108);
+x_109 = l_Lean_Compiler_LCNF_mkNewParams(x_108, x_4, x_5, x_6, x_41);
+x_110 = lean_ctor_get(x_109, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_109, 1);
+lean_inc(x_111);
+lean_dec(x_109);
+x_112 = lean_array_get_size(x_110);
+x_113 = lean_usize_of_nat(x_112);
+lean_dec(x_112);
+x_114 = 0;
+lean_inc(x_110);
+x_115 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_113, x_114, x_110);
+x_116 = l_Lean_mkAppN(x_14, x_115);
+x_117 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_104 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_102, x_103, x_4, x_5, x_6, x_97);
-if (lean_obj_tag(x_104) == 0)
+x_118 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_116, x_117, x_4, x_5, x_6, x_111);
+if (lean_obj_tag(x_118) == 0)
 {
-lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_105 = lean_ctor_get(x_104, 0);
-lean_inc(x_105);
-x_106 = lean_ctor_get(x_104, 1);
-lean_inc(x_106);
-lean_dec(x_104);
-x_107 = lean_ctor_get(x_105, 0);
-lean_inc(x_107);
-x_108 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_108, 0, x_107);
-x_109 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_109, 0, x_105);
-lean_ctor_set(x_109, 1, x_108);
-x_110 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_111 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_96, x_109, x_110, x_4, x_5, x_6, x_106);
-if (lean_obj_tag(x_111) == 0)
-{
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_112 = lean_ctor_get(x_111, 0);
-lean_inc(x_112);
-x_113 = lean_ctor_get(x_111, 1);
-lean_inc(x_113);
-lean_dec(x_111);
-x_114 = lean_ctor_get(x_1, 0);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_112, 0);
-lean_inc(x_115);
-x_116 = l_Lean_Expr_fvar___override(x_115);
-x_117 = l_Lean_Compiler_LCNF_Simp_addSubst(x_114, x_116, x_2, x_3, x_4, x_5, x_6, x_113);
-x_118 = lean_ctor_get(x_117, 1);
-lean_inc(x_118);
-lean_dec(x_117);
-x_119 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_118);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_120 = lean_ctor_get(x_119, 1);
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_119 = lean_ctor_get(x_118, 0);
+lean_inc(x_119);
+x_120 = lean_ctor_get(x_118, 1);
 lean_inc(x_120);
-if (lean_is_exclusive(x_119)) {
- lean_ctor_release(x_119, 0);
- lean_ctor_release(x_119, 1);
- x_121 = x_119;
-} else {
- lean_dec_ref(x_119);
- x_121 = lean_box(0);
-}
-x_122 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_122, 0, x_112);
-if (lean_is_scalar(x_121)) {
- x_123 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_123 = x_121;
-}
-lean_ctor_set(x_123, 0, x_122);
-lean_ctor_set(x_123, 1, x_120);
-return x_123;
-}
-else
+lean_dec(x_118);
+x_121 = lean_ctor_get(x_119, 0);
+lean_inc(x_121);
+x_122 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_122, 0, x_121);
+x_123 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_123, 0, x_119);
+lean_ctor_set(x_123, 1, x_122);
+x_124 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_125 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_110, x_123, x_124, x_4, x_5, x_6, x_120);
+if (lean_obj_tag(x_125) == 0)
 {
-lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_124 = lean_ctor_get(x_111, 0);
-lean_inc(x_124);
-x_125 = lean_ctor_get(x_111, 1);
-lean_inc(x_125);
-if (lean_is_exclusive(x_111)) {
- lean_ctor_release(x_111, 0);
- lean_ctor_release(x_111, 1);
- x_126 = x_111;
-} else {
- lean_dec_ref(x_111);
- x_126 = lean_box(0);
-}
-if (lean_is_scalar(x_126)) {
- x_127 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_127 = x_126;
-}
-lean_ctor_set(x_127, 0, x_124);
-lean_ctor_set(x_127, 1, x_125);
-return x_127;
-}
-}
-else
-{
-lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; 
-lean_dec(x_96);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_128 = lean_ctor_get(x_104, 0);
+lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; uint8_t x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_126 = lean_ctor_get(x_125, 0);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_125, 1);
+lean_inc(x_127);
+lean_dec(x_125);
+x_128 = lean_ctor_get(x_1, 0);
 lean_inc(x_128);
-x_129 = lean_ctor_get(x_104, 1);
+x_129 = lean_ctor_get(x_126, 0);
 lean_inc(x_129);
-if (lean_is_exclusive(x_104)) {
- lean_ctor_release(x_104, 0);
- lean_ctor_release(x_104, 1);
- x_130 = x_104;
+x_130 = lean_st_ref_get(x_6, x_127);
+x_131 = lean_ctor_get(x_130, 1);
+lean_inc(x_131);
+lean_dec(x_130);
+x_132 = lean_st_ref_take(x_3, x_131);
+x_133 = lean_ctor_get(x_132, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_132, 1);
+lean_inc(x_134);
+lean_dec(x_132);
+x_135 = lean_ctor_get(x_133, 0);
+lean_inc(x_135);
+x_136 = l_Lean_Expr_fvar___override(x_129);
+x_137 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_135, x_128, x_136);
+x_138 = lean_ctor_get(x_133, 1);
+lean_inc(x_138);
+x_139 = lean_ctor_get(x_133, 2);
+lean_inc(x_139);
+x_140 = lean_ctor_get_uint8(x_133, sizeof(void*)*6);
+x_141 = lean_ctor_get(x_133, 3);
+lean_inc(x_141);
+x_142 = lean_ctor_get(x_133, 4);
+lean_inc(x_142);
+x_143 = lean_ctor_get(x_133, 5);
+lean_inc(x_143);
+lean_dec(x_133);
+x_144 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_144, 0, x_137);
+lean_ctor_set(x_144, 1, x_138);
+lean_ctor_set(x_144, 2, x_139);
+lean_ctor_set(x_144, 3, x_141);
+lean_ctor_set(x_144, 4, x_142);
+lean_ctor_set(x_144, 5, x_143);
+lean_ctor_set_uint8(x_144, sizeof(void*)*6, x_140);
+x_145 = lean_st_ref_set(x_3, x_144, x_134);
+x_146 = lean_ctor_get(x_145, 1);
+lean_inc(x_146);
+lean_dec(x_145);
+x_147 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_146);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_148 = lean_ctor_get(x_147, 1);
+lean_inc(x_148);
+if (lean_is_exclusive(x_147)) {
+ lean_ctor_release(x_147, 0);
+ lean_ctor_release(x_147, 1);
+ x_149 = x_147;
 } else {
- lean_dec_ref(x_104);
- x_130 = lean_box(0);
+ lean_dec_ref(x_147);
+ x_149 = lean_box(0);
 }
-if (lean_is_scalar(x_130)) {
- x_131 = lean_alloc_ctor(1, 2, 0);
+x_150 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_150, 0, x_126);
+if (lean_is_scalar(x_149)) {
+ x_151 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_131 = x_130;
+ x_151 = x_149;
 }
-lean_ctor_set(x_131, 0, x_128);
-lean_ctor_set(x_131, 1, x_129);
-return x_131;
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_148);
+return x_151;
+}
+else
+{
+lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_152 = lean_ctor_get(x_125, 0);
+lean_inc(x_152);
+x_153 = lean_ctor_get(x_125, 1);
+lean_inc(x_153);
+if (lean_is_exclusive(x_125)) {
+ lean_ctor_release(x_125, 0);
+ lean_ctor_release(x_125, 1);
+ x_154 = x_125;
+} else {
+ lean_dec_ref(x_125);
+ x_154 = lean_box(0);
+}
+if (lean_is_scalar(x_154)) {
+ x_155 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_155 = x_154;
+}
+lean_ctor_set(x_155, 0, x_152);
+lean_ctor_set(x_155, 1, x_153);
+return x_155;
+}
+}
+else
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+lean_dec(x_110);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_156 = lean_ctor_get(x_118, 0);
+lean_inc(x_156);
+x_157 = lean_ctor_get(x_118, 1);
+lean_inc(x_157);
+if (lean_is_exclusive(x_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_158 = x_118;
+} else {
+ lean_dec_ref(x_118);
+ x_158 = lean_box(0);
+}
+if (lean_is_scalar(x_158)) {
+ x_159 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_159 = x_158;
+}
+lean_ctor_set(x_159, 0, x_156);
+lean_ctor_set(x_159, 1, x_157);
+return x_159;
 }
 }
 }
 }
 else
 {
-lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; uint8_t x_138; 
-x_132 = lean_ctor_get(x_32, 1);
-lean_inc(x_132);
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; uint8_t x_166; 
+x_160 = lean_ctor_get(x_32, 1);
+lean_inc(x_160);
 lean_dec(x_32);
-x_133 = lean_ctor_get(x_33, 0);
-lean_inc(x_133);
+x_161 = lean_ctor_get(x_33, 0);
+lean_inc(x_161);
 if (lean_is_exclusive(x_33)) {
  lean_ctor_release(x_33, 0);
- x_134 = x_33;
+ x_162 = x_33;
 } else {
  lean_dec_ref(x_33);
- x_134 = lean_box(0);
+ x_162 = lean_box(0);
 }
-x_135 = lean_unsigned_to_nat(0u);
-x_136 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_135);
-x_137 = l_Lean_Compiler_LCNF_Decl_getArity(x_133);
-lean_dec(x_133);
-x_138 = lean_nat_dec_lt(x_136, x_137);
-lean_dec(x_137);
-lean_dec(x_136);
-if (x_138 == 0)
-{
-lean_object* x_139; lean_object* x_140; 
-lean_dec(x_134);
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_139 = lean_box(0);
-x_140 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_140, 0, x_139);
-lean_ctor_set(x_140, 1, x_132);
-return x_140;
-}
-else
-{
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; size_t x_146; size_t x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
-x_141 = lean_ctor_get(x_1, 2);
-lean_inc(x_141);
-x_142 = l_Lean_Compiler_LCNF_mkNewParams(x_141, x_4, x_5, x_6, x_132);
-x_143 = lean_ctor_get(x_142, 0);
-lean_inc(x_143);
-x_144 = lean_ctor_get(x_142, 1);
-lean_inc(x_144);
-lean_dec(x_142);
-x_145 = lean_array_get_size(x_143);
-x_146 = lean_usize_of_nat(x_145);
-lean_dec(x_145);
-x_147 = 0;
-lean_inc(x_143);
-x_148 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_146, x_147, x_143);
-x_149 = l_Lean_mkAppN(x_14, x_148);
-x_150 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_151 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_149, x_150, x_4, x_5, x_6, x_144);
-if (lean_obj_tag(x_151) == 0)
-{
-lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc(x_152);
-x_153 = lean_ctor_get(x_151, 1);
-lean_inc(x_153);
-lean_dec(x_151);
-x_154 = lean_ctor_get(x_152, 0);
-lean_inc(x_154);
-x_155 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_155, 0, x_154);
-x_156 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_156, 0, x_152);
-lean_ctor_set(x_156, 1, x_155);
-x_157 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_158 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_143, x_156, x_157, x_4, x_5, x_6, x_153);
-if (lean_obj_tag(x_158) == 0)
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-x_159 = lean_ctor_get(x_158, 0);
-lean_inc(x_159);
-x_160 = lean_ctor_get(x_158, 1);
-lean_inc(x_160);
-lean_dec(x_158);
-x_161 = lean_ctor_get(x_1, 0);
-lean_inc(x_161);
-x_162 = lean_ctor_get(x_159, 0);
-lean_inc(x_162);
-x_163 = l_Lean_Expr_fvar___override(x_162);
-x_164 = l_Lean_Compiler_LCNF_Simp_addSubst(x_161, x_163, x_2, x_3, x_4, x_5, x_6, x_160);
-x_165 = lean_ctor_get(x_164, 1);
-lean_inc(x_165);
+x_163 = lean_unsigned_to_nat(0u);
+x_164 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_163);
+x_165 = l_Lean_Compiler_LCNF_Decl_getArity(x_161);
+lean_dec(x_161);
+x_166 = lean_nat_dec_lt(x_164, x_165);
+lean_dec(x_165);
 lean_dec(x_164);
-x_166 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_165);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_167 = lean_ctor_get(x_166, 1);
-lean_inc(x_167);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_168 = x_166;
-} else {
- lean_dec_ref(x_166);
- x_168 = lean_box(0);
-}
-if (lean_is_scalar(x_134)) {
- x_169 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_169 = x_134;
-}
-lean_ctor_set(x_169, 0, x_159);
-if (lean_is_scalar(x_168)) {
- x_170 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_170 = x_168;
-}
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_167);
-return x_170;
-}
-else
+if (x_166 == 0)
 {
-lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-lean_dec(x_134);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_171 = lean_ctor_get(x_158, 0);
-lean_inc(x_171);
-x_172 = lean_ctor_get(x_158, 1);
-lean_inc(x_172);
-if (lean_is_exclusive(x_158)) {
- lean_ctor_release(x_158, 0);
- lean_ctor_release(x_158, 1);
- x_173 = x_158;
-} else {
- lean_dec_ref(x_158);
- x_173 = lean_box(0);
-}
-if (lean_is_scalar(x_173)) {
- x_174 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_174 = x_173;
-}
-lean_ctor_set(x_174, 0, x_171);
-lean_ctor_set(x_174, 1, x_172);
-return x_174;
-}
-}
-else
-{
-lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; 
-lean_dec(x_143);
-lean_dec(x_134);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_175 = lean_ctor_get(x_151, 0);
-lean_inc(x_175);
-x_176 = lean_ctor_get(x_151, 1);
-lean_inc(x_176);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- x_177 = x_151;
-} else {
- lean_dec_ref(x_151);
- x_177 = lean_box(0);
-}
-if (lean_is_scalar(x_177)) {
- x_178 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_178 = x_177;
-}
-lean_ctor_set(x_178, 0, x_175);
-lean_ctor_set(x_178, 1, x_176);
-return x_178;
-}
-}
-}
-}
-}
-else
-{
-uint8_t x_179; 
+lean_object* x_167; lean_object* x_168; 
+lean_dec(x_162);
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_179 = !lean_is_exclusive(x_32);
-if (x_179 == 0)
+x_167 = lean_box(0);
+x_168 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_168, 0, x_167);
+lean_ctor_set(x_168, 1, x_160);
+return x_168;
+}
+else
+{
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; size_t x_174; size_t x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
+x_169 = lean_ctor_get(x_1, 2);
+lean_inc(x_169);
+x_170 = l_Lean_Compiler_LCNF_mkNewParams(x_169, x_4, x_5, x_6, x_160);
+x_171 = lean_ctor_get(x_170, 0);
+lean_inc(x_171);
+x_172 = lean_ctor_get(x_170, 1);
+lean_inc(x_172);
+lean_dec(x_170);
+x_173 = lean_array_get_size(x_171);
+x_174 = lean_usize_of_nat(x_173);
+lean_dec(x_173);
+x_175 = 0;
+lean_inc(x_171);
+x_176 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_174, x_175, x_171);
+x_177 = l_Lean_mkAppN(x_14, x_176);
+x_178 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_179 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_177, x_178, x_4, x_5, x_6, x_172);
+if (lean_obj_tag(x_179) == 0)
+{
+lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_180 = lean_ctor_get(x_179, 0);
+lean_inc(x_180);
+x_181 = lean_ctor_get(x_179, 1);
+lean_inc(x_181);
+lean_dec(x_179);
+x_182 = lean_ctor_get(x_180, 0);
+lean_inc(x_182);
+x_183 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_183, 0, x_182);
+x_184 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_184, 0, x_180);
+lean_ctor_set(x_184, 1, x_183);
+x_185 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_186 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_171, x_184, x_185, x_4, x_5, x_6, x_181);
+if (lean_obj_tag(x_186) == 0)
+{
+lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; uint8_t x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; 
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+lean_dec(x_186);
+x_189 = lean_ctor_get(x_1, 0);
+lean_inc(x_189);
+x_190 = lean_ctor_get(x_187, 0);
+lean_inc(x_190);
+x_191 = lean_st_ref_get(x_6, x_188);
+x_192 = lean_ctor_get(x_191, 1);
+lean_inc(x_192);
+lean_dec(x_191);
+x_193 = lean_st_ref_take(x_3, x_192);
+x_194 = lean_ctor_get(x_193, 0);
+lean_inc(x_194);
+x_195 = lean_ctor_get(x_193, 1);
+lean_inc(x_195);
+lean_dec(x_193);
+x_196 = lean_ctor_get(x_194, 0);
+lean_inc(x_196);
+x_197 = l_Lean_Expr_fvar___override(x_190);
+x_198 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_196, x_189, x_197);
+x_199 = lean_ctor_get(x_194, 1);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_194, 2);
+lean_inc(x_200);
+x_201 = lean_ctor_get_uint8(x_194, sizeof(void*)*6);
+x_202 = lean_ctor_get(x_194, 3);
+lean_inc(x_202);
+x_203 = lean_ctor_get(x_194, 4);
+lean_inc(x_203);
+x_204 = lean_ctor_get(x_194, 5);
+lean_inc(x_204);
+lean_dec(x_194);
+x_205 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_205, 0, x_198);
+lean_ctor_set(x_205, 1, x_199);
+lean_ctor_set(x_205, 2, x_200);
+lean_ctor_set(x_205, 3, x_202);
+lean_ctor_set(x_205, 4, x_203);
+lean_ctor_set(x_205, 5, x_204);
+lean_ctor_set_uint8(x_205, sizeof(void*)*6, x_201);
+x_206 = lean_st_ref_set(x_3, x_205, x_195);
+x_207 = lean_ctor_get(x_206, 1);
+lean_inc(x_207);
+lean_dec(x_206);
+x_208 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_207);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_209 = lean_ctor_get(x_208, 1);
+lean_inc(x_209);
+if (lean_is_exclusive(x_208)) {
+ lean_ctor_release(x_208, 0);
+ lean_ctor_release(x_208, 1);
+ x_210 = x_208;
+} else {
+ lean_dec_ref(x_208);
+ x_210 = lean_box(0);
+}
+if (lean_is_scalar(x_162)) {
+ x_211 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_211 = x_162;
+}
+lean_ctor_set(x_211, 0, x_187);
+if (lean_is_scalar(x_210)) {
+ x_212 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_212 = x_210;
+}
+lean_ctor_set(x_212, 0, x_211);
+lean_ctor_set(x_212, 1, x_209);
+return x_212;
+}
+else
+{
+lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; 
+lean_dec(x_162);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_213 = lean_ctor_get(x_186, 0);
+lean_inc(x_213);
+x_214 = lean_ctor_get(x_186, 1);
+lean_inc(x_214);
+if (lean_is_exclusive(x_186)) {
+ lean_ctor_release(x_186, 0);
+ lean_ctor_release(x_186, 1);
+ x_215 = x_186;
+} else {
+ lean_dec_ref(x_186);
+ x_215 = lean_box(0);
+}
+if (lean_is_scalar(x_215)) {
+ x_216 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_216 = x_215;
+}
+lean_ctor_set(x_216, 0, x_213);
+lean_ctor_set(x_216, 1, x_214);
+return x_216;
+}
+}
+else
+{
+lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
+lean_dec(x_171);
+lean_dec(x_162);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_217 = lean_ctor_get(x_179, 0);
+lean_inc(x_217);
+x_218 = lean_ctor_get(x_179, 1);
+lean_inc(x_218);
+if (lean_is_exclusive(x_179)) {
+ lean_ctor_release(x_179, 0);
+ lean_ctor_release(x_179, 1);
+ x_219 = x_179;
+} else {
+ lean_dec_ref(x_179);
+ x_219 = lean_box(0);
+}
+if (lean_is_scalar(x_219)) {
+ x_220 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_220 = x_219;
+}
+lean_ctor_set(x_220, 0, x_217);
+lean_ctor_set(x_220, 1, x_218);
+return x_220;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_221; 
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_221 = !lean_is_exclusive(x_32);
+if (x_221 == 0)
 {
 return x_32;
 }
 else
 {
-lean_object* x_180; lean_object* x_181; lean_object* x_182; 
-x_180 = lean_ctor_get(x_32, 0);
-x_181 = lean_ctor_get(x_32, 1);
-lean_inc(x_181);
-lean_inc(x_180);
+lean_object* x_222; lean_object* x_223; lean_object* x_224; 
+x_222 = lean_ctor_get(x_32, 0);
+x_223 = lean_ctor_get(x_32, 1);
+lean_inc(x_223);
+lean_inc(x_222);
 lean_dec(x_32);
-x_182 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_182, 0, x_180);
-lean_ctor_set(x_182, 1, x_181);
-return x_182;
+x_224 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_224, 0, x_222);
+lean_ctor_set(x_224, 1, x_223);
+return x_224;
 }
 }
 }
 else
 {
-uint8_t x_183; 
+uint8_t x_225; 
 lean_dec(x_16);
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_183 = !lean_is_exclusive(x_28);
-if (x_183 == 0)
+x_225 = !lean_is_exclusive(x_28);
+if (x_225 == 0)
 {
-lean_object* x_184; lean_object* x_185; 
-x_184 = lean_ctor_get(x_28, 0);
-lean_dec(x_184);
-x_185 = lean_box(0);
-lean_ctor_set(x_28, 0, x_185);
+lean_object* x_226; lean_object* x_227; 
+x_226 = lean_ctor_get(x_28, 0);
+lean_dec(x_226);
+x_227 = lean_box(0);
+lean_ctor_set(x_28, 0, x_227);
 return x_28;
 }
 else
 {
-lean_object* x_186; lean_object* x_187; lean_object* x_188; 
-x_186 = lean_ctor_get(x_28, 1);
-lean_inc(x_186);
+lean_object* x_228; lean_object* x_229; lean_object* x_230; 
+x_228 = lean_ctor_get(x_28, 1);
+lean_inc(x_228);
 lean_dec(x_28);
-x_187 = lean_box(0);
-x_188 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_188, 0, x_187);
-lean_ctor_set(x_188, 1, x_186);
-return x_188;
+x_229 = lean_box(0);
+x_230 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_230, 0, x_229);
+lean_ctor_set(x_230, 1, x_228);
+return x_230;
 }
 }
 }
@@ -22603,368 +20985,401 @@ return x_188;
 }
 else
 {
-lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; 
-x_189 = lean_ctor_get(x_17, 0);
-x_190 = lean_ctor_get(x_17, 1);
-lean_inc(x_190);
-lean_inc(x_189);
-lean_dec(x_17);
-x_191 = lean_ctor_get(x_189, 0);
-lean_inc(x_191);
-lean_dec(x_189);
-lean_inc(x_16);
-x_192 = lean_environment_find(x_191, x_16);
-if (lean_obj_tag(x_192) == 0)
-{
-lean_object* x_193; lean_object* x_194; 
-lean_dec(x_16);
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_193 = lean_box(0);
-x_194 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_194, 0, x_193);
-lean_ctor_set(x_194, 1, x_190);
-return x_194;
-}
-else
-{
-lean_object* x_195; lean_object* x_196; uint8_t x_197; 
-x_195 = lean_ctor_get(x_192, 0);
-lean_inc(x_195);
-lean_dec(x_192);
-x_196 = l_Lean_ConstantInfo_type(x_195);
-lean_dec(x_195);
-x_197 = l_Lean_Compiler_LCNF_hasLocalInst(x_196);
-lean_dec(x_196);
-if (x_197 == 0)
-{
-lean_object* x_198; lean_object* x_199; 
-lean_dec(x_16);
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_198 = lean_box(0);
-x_199 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_199, 0, x_198);
-lean_ctor_set(x_199, 1, x_190);
-return x_199;
-}
-else
-{
-lean_object* x_200; lean_object* x_201; uint8_t x_202; 
-lean_inc(x_16);
-x_200 = l_Lean_Meta_isInstance(x_16, x_5, x_6, x_190);
-x_201 = lean_ctor_get(x_200, 0);
-lean_inc(x_201);
-x_202 = lean_unbox(x_201);
-lean_dec(x_201);
-if (x_202 == 0)
-{
-lean_object* x_203; lean_object* x_204; 
-x_203 = lean_ctor_get(x_200, 1);
-lean_inc(x_203);
-lean_dec(x_200);
-lean_inc(x_6);
-lean_inc(x_5);
-x_204 = l_Lean_Compiler_LCNF_getStage1Decl_x3f(x_16, x_5, x_6, x_203);
-if (lean_obj_tag(x_204) == 0)
-{
-lean_object* x_205; 
-x_205 = lean_ctor_get(x_204, 0);
-lean_inc(x_205);
-if (lean_obj_tag(x_205) == 0)
-{
-lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; 
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_206 = lean_ctor_get(x_204, 1);
-lean_inc(x_206);
-if (lean_is_exclusive(x_204)) {
- lean_ctor_release(x_204, 0);
- lean_ctor_release(x_204, 1);
- x_207 = x_204;
-} else {
- lean_dec_ref(x_204);
- x_207 = lean_box(0);
-}
-x_208 = lean_box(0);
-if (lean_is_scalar(x_207)) {
- x_209 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_209 = x_207;
-}
-lean_ctor_set(x_209, 0, x_208);
-lean_ctor_set(x_209, 1, x_206);
-return x_209;
-}
-else
-{
-lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; uint8_t x_217; 
-x_210 = lean_ctor_get(x_204, 1);
-lean_inc(x_210);
-if (lean_is_exclusive(x_204)) {
- lean_ctor_release(x_204, 0);
- lean_ctor_release(x_204, 1);
- x_211 = x_204;
-} else {
- lean_dec_ref(x_204);
- x_211 = lean_box(0);
-}
-x_212 = lean_ctor_get(x_205, 0);
-lean_inc(x_212);
-if (lean_is_exclusive(x_205)) {
- lean_ctor_release(x_205, 0);
- x_213 = x_205;
-} else {
- lean_dec_ref(x_205);
- x_213 = lean_box(0);
-}
-x_214 = lean_unsigned_to_nat(0u);
-x_215 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_214);
-x_216 = l_Lean_Compiler_LCNF_Decl_getArity(x_212);
-lean_dec(x_212);
-x_217 = lean_nat_dec_lt(x_215, x_216);
-lean_dec(x_216);
-lean_dec(x_215);
-if (x_217 == 0)
-{
-lean_object* x_218; lean_object* x_219; 
-lean_dec(x_213);
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_218 = lean_box(0);
-if (lean_is_scalar(x_211)) {
- x_219 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_219 = x_211;
-}
-lean_ctor_set(x_219, 0, x_218);
-lean_ctor_set(x_219, 1, x_210);
-return x_219;
-}
-else
-{
-lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; size_t x_225; size_t x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; 
-lean_dec(x_211);
-x_220 = lean_ctor_get(x_1, 2);
-lean_inc(x_220);
-x_221 = l_Lean_Compiler_LCNF_mkNewParams(x_220, x_4, x_5, x_6, x_210);
-x_222 = lean_ctor_get(x_221, 0);
-lean_inc(x_222);
-x_223 = lean_ctor_get(x_221, 1);
-lean_inc(x_223);
-lean_dec(x_221);
-x_224 = lean_array_get_size(x_222);
-x_225 = lean_usize_of_nat(x_224);
-lean_dec(x_224);
-x_226 = 0;
-lean_inc(x_222);
-x_227 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_225, x_226, x_222);
-x_228 = l_Lean_mkAppN(x_14, x_227);
-x_229 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_230 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_228, x_229, x_4, x_5, x_6, x_223);
-if (lean_obj_tag(x_230) == 0)
-{
-lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; 
-x_231 = lean_ctor_get(x_230, 0);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_230, 1);
+lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; 
+x_231 = lean_ctor_get(x_17, 0);
+x_232 = lean_ctor_get(x_17, 1);
 lean_inc(x_232);
-lean_dec(x_230);
+lean_inc(x_231);
+lean_dec(x_17);
 x_233 = lean_ctor_get(x_231, 0);
 lean_inc(x_233);
-x_234 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_234, 0, x_233);
-x_235 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_235, 0, x_231);
-lean_ctor_set(x_235, 1, x_234);
-x_236 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_237 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_222, x_235, x_236, x_4, x_5, x_6, x_232);
-if (lean_obj_tag(x_237) == 0)
+lean_dec(x_231);
+lean_inc(x_16);
+x_234 = lean_environment_find(x_233, x_16);
+if (lean_obj_tag(x_234) == 0)
 {
-lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
-x_238 = lean_ctor_get(x_237, 0);
-lean_inc(x_238);
-x_239 = lean_ctor_get(x_237, 1);
-lean_inc(x_239);
-lean_dec(x_237);
-x_240 = lean_ctor_get(x_1, 0);
-lean_inc(x_240);
-x_241 = lean_ctor_get(x_238, 0);
-lean_inc(x_241);
-x_242 = l_Lean_Expr_fvar___override(x_241);
-x_243 = l_Lean_Compiler_LCNF_Simp_addSubst(x_240, x_242, x_2, x_3, x_4, x_5, x_6, x_239);
-x_244 = lean_ctor_get(x_243, 1);
-lean_inc(x_244);
-lean_dec(x_243);
-x_245 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_244);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_246 = lean_ctor_get(x_245, 1);
-lean_inc(x_246);
-if (lean_is_exclusive(x_245)) {
- lean_ctor_release(x_245, 0);
- lean_ctor_release(x_245, 1);
- x_247 = x_245;
-} else {
- lean_dec_ref(x_245);
- x_247 = lean_box(0);
-}
-if (lean_is_scalar(x_213)) {
- x_248 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_248 = x_213;
-}
-lean_ctor_set(x_248, 0, x_238);
-if (lean_is_scalar(x_247)) {
- x_249 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_249 = x_247;
-}
-lean_ctor_set(x_249, 0, x_248);
-lean_ctor_set(x_249, 1, x_246);
-return x_249;
-}
-else
-{
-lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-lean_dec(x_213);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_250 = lean_ctor_get(x_237, 0);
-lean_inc(x_250);
-x_251 = lean_ctor_get(x_237, 1);
-lean_inc(x_251);
-if (lean_is_exclusive(x_237)) {
- lean_ctor_release(x_237, 0);
- lean_ctor_release(x_237, 1);
- x_252 = x_237;
-} else {
- lean_dec_ref(x_237);
- x_252 = lean_box(0);
-}
-if (lean_is_scalar(x_252)) {
- x_253 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_253 = x_252;
-}
-lean_ctor_set(x_253, 0, x_250);
-lean_ctor_set(x_253, 1, x_251);
-return x_253;
-}
-}
-else
-{
-lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; 
-lean_dec(x_222);
-lean_dec(x_213);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_254 = lean_ctor_get(x_230, 0);
-lean_inc(x_254);
-x_255 = lean_ctor_get(x_230, 1);
-lean_inc(x_255);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_256 = x_230;
-} else {
- lean_dec_ref(x_230);
- x_256 = lean_box(0);
-}
-if (lean_is_scalar(x_256)) {
- x_257 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_257 = x_256;
-}
-lean_ctor_set(x_257, 0, x_254);
-lean_ctor_set(x_257, 1, x_255);
-return x_257;
-}
-}
-}
-}
-else
-{
-lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; 
-lean_dec(x_14);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_258 = lean_ctor_get(x_204, 0);
-lean_inc(x_258);
-x_259 = lean_ctor_get(x_204, 1);
-lean_inc(x_259);
-if (lean_is_exclusive(x_204)) {
- lean_ctor_release(x_204, 0);
- lean_ctor_release(x_204, 1);
- x_260 = x_204;
-} else {
- lean_dec_ref(x_204);
- x_260 = lean_box(0);
-}
-if (lean_is_scalar(x_260)) {
- x_261 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_261 = x_260;
-}
-lean_ctor_set(x_261, 0, x_258);
-lean_ctor_set(x_261, 1, x_259);
-return x_261;
-}
-}
-else
-{
-lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; 
+lean_object* x_235; lean_object* x_236; 
 lean_dec(x_16);
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_262 = lean_ctor_get(x_200, 1);
+x_235 = lean_box(0);
+x_236 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_236, 0, x_235);
+lean_ctor_set(x_236, 1, x_232);
+return x_236;
+}
+else
+{
+lean_object* x_237; lean_object* x_238; uint8_t x_239; 
+x_237 = lean_ctor_get(x_234, 0);
+lean_inc(x_237);
+lean_dec(x_234);
+x_238 = l_Lean_ConstantInfo_type(x_237);
+lean_dec(x_237);
+x_239 = l_Lean_Compiler_LCNF_hasLocalInst(x_238);
+lean_dec(x_238);
+if (x_239 == 0)
+{
+lean_object* x_240; lean_object* x_241; 
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_240 = lean_box(0);
+x_241 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_241, 0, x_240);
+lean_ctor_set(x_241, 1, x_232);
+return x_241;
+}
+else
+{
+lean_object* x_242; lean_object* x_243; uint8_t x_244; 
+lean_inc(x_16);
+x_242 = l_Lean_Meta_isInstance(x_16, x_5, x_6, x_232);
+x_243 = lean_ctor_get(x_242, 0);
+lean_inc(x_243);
+x_244 = lean_unbox(x_243);
+lean_dec(x_243);
+if (x_244 == 0)
+{
+lean_object* x_245; lean_object* x_246; 
+x_245 = lean_ctor_get(x_242, 1);
+lean_inc(x_245);
+lean_dec(x_242);
+lean_inc(x_6);
+lean_inc(x_5);
+x_246 = l_Lean_Compiler_LCNF_getStage1Decl_x3f(x_16, x_5, x_6, x_245);
+if (lean_obj_tag(x_246) == 0)
+{
+lean_object* x_247; 
+x_247 = lean_ctor_get(x_246, 0);
+lean_inc(x_247);
+if (lean_obj_tag(x_247) == 0)
+{
+lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_248 = lean_ctor_get(x_246, 1);
+lean_inc(x_248);
+if (lean_is_exclusive(x_246)) {
+ lean_ctor_release(x_246, 0);
+ lean_ctor_release(x_246, 1);
+ x_249 = x_246;
+} else {
+ lean_dec_ref(x_246);
+ x_249 = lean_box(0);
+}
+x_250 = lean_box(0);
+if (lean_is_scalar(x_249)) {
+ x_251 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_251 = x_249;
+}
+lean_ctor_set(x_251, 0, x_250);
+lean_ctor_set(x_251, 1, x_248);
+return x_251;
+}
+else
+{
+lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; uint8_t x_259; 
+x_252 = lean_ctor_get(x_246, 1);
+lean_inc(x_252);
+if (lean_is_exclusive(x_246)) {
+ lean_ctor_release(x_246, 0);
+ lean_ctor_release(x_246, 1);
+ x_253 = x_246;
+} else {
+ lean_dec_ref(x_246);
+ x_253 = lean_box(0);
+}
+x_254 = lean_ctor_get(x_247, 0);
+lean_inc(x_254);
+if (lean_is_exclusive(x_247)) {
+ lean_ctor_release(x_247, 0);
+ x_255 = x_247;
+} else {
+ lean_dec_ref(x_247);
+ x_255 = lean_box(0);
+}
+x_256 = lean_unsigned_to_nat(0u);
+x_257 = l___private_Lean_Expr_0__Lean_Expr_getAppNumArgsAux(x_14, x_256);
+x_258 = l_Lean_Compiler_LCNF_Decl_getArity(x_254);
+lean_dec(x_254);
+x_259 = lean_nat_dec_lt(x_257, x_258);
+lean_dec(x_258);
+lean_dec(x_257);
+if (x_259 == 0)
+{
+lean_object* x_260; lean_object* x_261; 
+lean_dec(x_255);
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_260 = lean_box(0);
+if (lean_is_scalar(x_253)) {
+ x_261 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_261 = x_253;
+}
+lean_ctor_set(x_261, 0, x_260);
+lean_ctor_set(x_261, 1, x_252);
+return x_261;
+}
+else
+{
+lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; size_t x_267; size_t x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; 
+lean_dec(x_253);
+x_262 = lean_ctor_get(x_1, 2);
 lean_inc(x_262);
-if (lean_is_exclusive(x_200)) {
- lean_ctor_release(x_200, 0);
- lean_ctor_release(x_200, 1);
- x_263 = x_200;
+x_263 = l_Lean_Compiler_LCNF_mkNewParams(x_262, x_4, x_5, x_6, x_252);
+x_264 = lean_ctor_get(x_263, 0);
+lean_inc(x_264);
+x_265 = lean_ctor_get(x_263, 1);
+lean_inc(x_265);
+lean_dec(x_263);
+x_266 = lean_array_get_size(x_264);
+x_267 = lean_usize_of_nat(x_266);
+lean_dec(x_266);
+x_268 = 0;
+lean_inc(x_264);
+x_269 = l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_InferType_mkForallParams___spec__1(x_267, x_268, x_264);
+x_270 = l_Lean_mkAppN(x_14, x_269);
+x_271 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_272 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_270, x_271, x_4, x_5, x_6, x_265);
+if (lean_obj_tag(x_272) == 0)
+{
+lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; 
+x_273 = lean_ctor_get(x_272, 0);
+lean_inc(x_273);
+x_274 = lean_ctor_get(x_272, 1);
+lean_inc(x_274);
+lean_dec(x_272);
+x_275 = lean_ctor_get(x_273, 0);
+lean_inc(x_275);
+x_276 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_276, 0, x_275);
+x_277 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_277, 0, x_273);
+lean_ctor_set(x_277, 1, x_276);
+x_278 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_279 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_264, x_277, x_278, x_4, x_5, x_6, x_274);
+if (lean_obj_tag(x_279) == 0)
+{
+lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 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; lean_object* x_292; lean_object* x_293; uint8_t x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; 
+x_280 = lean_ctor_get(x_279, 0);
+lean_inc(x_280);
+x_281 = lean_ctor_get(x_279, 1);
+lean_inc(x_281);
+lean_dec(x_279);
+x_282 = lean_ctor_get(x_1, 0);
+lean_inc(x_282);
+x_283 = lean_ctor_get(x_280, 0);
+lean_inc(x_283);
+x_284 = lean_st_ref_get(x_6, x_281);
+x_285 = lean_ctor_get(x_284, 1);
+lean_inc(x_285);
+lean_dec(x_284);
+x_286 = lean_st_ref_take(x_3, x_285);
+x_287 = lean_ctor_get(x_286, 0);
+lean_inc(x_287);
+x_288 = lean_ctor_get(x_286, 1);
+lean_inc(x_288);
+lean_dec(x_286);
+x_289 = lean_ctor_get(x_287, 0);
+lean_inc(x_289);
+x_290 = l_Lean_Expr_fvar___override(x_283);
+x_291 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_289, x_282, x_290);
+x_292 = lean_ctor_get(x_287, 1);
+lean_inc(x_292);
+x_293 = lean_ctor_get(x_287, 2);
+lean_inc(x_293);
+x_294 = lean_ctor_get_uint8(x_287, sizeof(void*)*6);
+x_295 = lean_ctor_get(x_287, 3);
+lean_inc(x_295);
+x_296 = lean_ctor_get(x_287, 4);
+lean_inc(x_296);
+x_297 = lean_ctor_get(x_287, 5);
+lean_inc(x_297);
+lean_dec(x_287);
+x_298 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_298, 0, x_291);
+lean_ctor_set(x_298, 1, x_292);
+lean_ctor_set(x_298, 2, x_293);
+lean_ctor_set(x_298, 3, x_295);
+lean_ctor_set(x_298, 4, x_296);
+lean_ctor_set(x_298, 5, x_297);
+lean_ctor_set_uint8(x_298, sizeof(void*)*6, x_294);
+x_299 = lean_st_ref_set(x_3, x_298, x_288);
+x_300 = lean_ctor_get(x_299, 1);
+lean_inc(x_300);
+lean_dec(x_299);
+x_301 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_1, x_2, x_3, x_4, x_5, x_6, x_300);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_302 = lean_ctor_get(x_301, 1);
+lean_inc(x_302);
+if (lean_is_exclusive(x_301)) {
+ lean_ctor_release(x_301, 0);
+ lean_ctor_release(x_301, 1);
+ x_303 = x_301;
 } else {
- lean_dec_ref(x_200);
- x_263 = lean_box(0);
+ lean_dec_ref(x_301);
+ x_303 = lean_box(0);
 }
-x_264 = lean_box(0);
-if (lean_is_scalar(x_263)) {
- x_265 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_255)) {
+ x_304 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_265 = x_263;
+ x_304 = x_255;
 }
-lean_ctor_set(x_265, 0, x_264);
-lean_ctor_set(x_265, 1, x_262);
-return x_265;
+lean_ctor_set(x_304, 0, x_280);
+if (lean_is_scalar(x_303)) {
+ x_305 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_305 = x_303;
+}
+lean_ctor_set(x_305, 0, x_304);
+lean_ctor_set(x_305, 1, x_302);
+return x_305;
+}
+else
+{
+lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; 
+lean_dec(x_255);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_306 = lean_ctor_get(x_279, 0);
+lean_inc(x_306);
+x_307 = lean_ctor_get(x_279, 1);
+lean_inc(x_307);
+if (lean_is_exclusive(x_279)) {
+ lean_ctor_release(x_279, 0);
+ lean_ctor_release(x_279, 1);
+ x_308 = x_279;
+} else {
+ lean_dec_ref(x_279);
+ x_308 = lean_box(0);
+}
+if (lean_is_scalar(x_308)) {
+ x_309 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_309 = x_308;
+}
+lean_ctor_set(x_309, 0, x_306);
+lean_ctor_set(x_309, 1, x_307);
+return x_309;
+}
+}
+else
+{
+lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; 
+lean_dec(x_264);
+lean_dec(x_255);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_310 = lean_ctor_get(x_272, 0);
+lean_inc(x_310);
+x_311 = lean_ctor_get(x_272, 1);
+lean_inc(x_311);
+if (lean_is_exclusive(x_272)) {
+ lean_ctor_release(x_272, 0);
+ lean_ctor_release(x_272, 1);
+ x_312 = x_272;
+} else {
+ lean_dec_ref(x_272);
+ x_312 = lean_box(0);
+}
+if (lean_is_scalar(x_312)) {
+ x_313 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_313 = x_312;
+}
+lean_ctor_set(x_313, 0, x_310);
+lean_ctor_set(x_313, 1, x_311);
+return x_313;
+}
+}
+}
+}
+else
+{
+lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; 
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_314 = lean_ctor_get(x_246, 0);
+lean_inc(x_314);
+x_315 = lean_ctor_get(x_246, 1);
+lean_inc(x_315);
+if (lean_is_exclusive(x_246)) {
+ lean_ctor_release(x_246, 0);
+ lean_ctor_release(x_246, 1);
+ x_316 = x_246;
+} else {
+ lean_dec_ref(x_246);
+ x_316 = lean_box(0);
+}
+if (lean_is_scalar(x_316)) {
+ x_317 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_317 = x_316;
+}
+lean_ctor_set(x_317, 0, x_314);
+lean_ctor_set(x_317, 1, x_315);
+return x_317;
+}
+}
+else
+{
+lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+lean_dec(x_16);
+lean_dec(x_14);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_318 = lean_ctor_get(x_242, 1);
+lean_inc(x_318);
+if (lean_is_exclusive(x_242)) {
+ lean_ctor_release(x_242, 0);
+ lean_ctor_release(x_242, 1);
+ x_319 = x_242;
+} else {
+ lean_dec_ref(x_242);
+ x_319 = lean_box(0);
+}
+x_320 = lean_box(0);
+if (lean_is_scalar(x_319)) {
+ x_321 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_321 = x_319;
+}
+lean_ctor_set(x_321, 0, x_320);
+lean_ctor_set(x_321, 1, x_318);
+return x_321;
 }
 }
 }
@@ -22972,18 +21387,18 @@ return x_265;
 }
 else
 {
-lean_object* x_266; lean_object* x_267; 
+lean_object* x_322; lean_object* x_323; 
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_266 = lean_box(0);
-x_267 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_267, 0, x_266);
-lean_ctor_set(x_267, 1, x_11);
-return x_267;
+x_322 = lean_box(0);
+x_323 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_323, 0, x_322);
+lean_ctor_set(x_323, 1, x_11);
+return x_323;
 }
 }
 }
@@ -22999,125 +21414,398 @@ lean_dec(x_2);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isReturnOf(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_8; 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; 
-x_8 = lean_ctor_get(x_1, 2);
-lean_inc(x_8);
-x_9 = lean_st_ref_get(x_6, x_7);
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_11 = lean_st_ref_get(x_3, x_10);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_12, 0);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_8);
-x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_1, x_15, x_4, x_5, x_6, x_13);
-return x_16;
-}
-}
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
+if (lean_obj_tag(x_1) == 5)
 {
-lean_object* x_10; uint8_t x_11; 
-x_10 = lean_array_get_size(x_3);
-x_11 = lean_nat_dec_lt(x_2, x_10);
-lean_dec(x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; 
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_9 = lean_ctor_get(x_1, 0);
+lean_inc(x_9);
 lean_dec(x_1);
-x_12 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_12, 0, x_3);
-lean_ctor_set(x_12, 1, x_9);
+x_10 = lean_st_ref_get(x_7, x_8);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_st_ref_get(x_4, x_11);
+x_13 = !lean_is_exclusive(x_12);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; uint8_t x_18; lean_object* x_19; 
+x_14 = lean_ctor_get(x_12, 0);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+lean_dec(x_14);
+x_16 = 0;
+x_17 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_15, x_9, x_16);
+x_18 = lean_name_eq(x_17, x_2);
+lean_dec(x_17);
+x_19 = lean_box(x_18);
+lean_ctor_set(x_12, 0, x_19);
 return x_12;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_array_fget(x_3, x_2);
-lean_inc(x_1);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_13);
-x_14 = lean_apply_7(x_1, x_13, x_4, x_5, x_6, x_7, x_8, x_9);
-if (lean_obj_tag(x_14) == 0)
-{
-lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_ptr_addr(x_13);
-lean_dec(x_13);
-x_18 = lean_ptr_addr(x_15);
-x_19 = lean_usize_dec_eq(x_17, x_18);
-if (x_19 == 0)
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_unsigned_to_nat(1u);
-x_21 = lean_nat_add(x_2, x_20);
-x_22 = lean_array_fset(x_3, x_2, x_15);
-lean_dec(x_2);
-x_2 = x_21;
-x_3 = x_22;
-x_9 = x_16;
-goto _start;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; 
-lean_dec(x_15);
-x_24 = lean_unsigned_to_nat(1u);
-x_25 = lean_nat_add(x_2, x_24);
-lean_dec(x_2);
-x_2 = x_25;
-x_9 = x_16;
-goto _start;
+lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; 
+x_20 = lean_ctor_get(x_12, 0);
+x_21 = lean_ctor_get(x_12, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_12);
+x_22 = lean_ctor_get(x_20, 0);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = 0;
+x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_22, x_9, x_23);
+x_25 = lean_name_eq(x_24, x_2);
+lean_dec(x_24);
+x_26 = lean_box(x_25);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_21);
+return x_27;
 }
 }
 else
 {
-uint8_t x_27; 
-lean_dec(x_13);
-lean_dec(x_8);
+uint8_t x_28; lean_object* x_29; lean_object* x_30; 
+lean_dec(x_1);
+x_28 = 0;
+x_29 = lean_box(x_28);
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_8);
+return x_30;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_isReturnOf___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_Compiler_LCNF_Simp_isReturnOf(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);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_1);
-x_27 = !lean_is_exclusive(x_14);
+return x_9;
+}
+}
+static lean_object* _init_l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_inheritedTraceOptions;
+return x_1;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_8 = lean_st_ref_get(x_6, x_7);
+x_9 = lean_ctor_get(x_8, 1);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1;
+x_11 = lean_st_ref_get(x_10, x_9);
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; 
+x_13 = lean_ctor_get(x_11, 0);
+x_14 = lean_ctor_get(x_5, 2);
+x_15 = l___private_Lean_Util_Trace_0__Lean_checkTraceOption(x_13, x_14, x_1);
+lean_dec(x_13);
+x_16 = lean_box(x_15);
+lean_ctor_set(x_11, 0, x_16);
+return x_11;
+}
+else
+{
+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_17 = lean_ctor_get(x_11, 0);
+x_18 = lean_ctor_get(x_11, 1);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_dec(x_11);
+x_19 = lean_ctor_get(x_5, 2);
+x_20 = l___private_Lean_Util_Trace_0__Lean_checkTraceOption(x_17, x_19, x_1);
+lean_dec(x_17);
+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_18);
+return x_22;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 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; uint8_t x_26; 
+x_9 = lean_ctor_get(x_6, 5);
+x_10 = lean_st_ref_get(x_7, x_8);
+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_ctor_get(x_11, 0);
+lean_inc(x_13);
+lean_dec(x_11);
+x_14 = lean_st_ref_get(x_5, x_12);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+lean_dec(x_15);
+x_18 = l_Lean_Compiler_LCNF_LCtx_toLocalContext(x_17);
+x_19 = lean_ctor_get(x_6, 2);
+x_20 = l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__6;
+lean_inc(x_19);
+x_21 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_21, 0, x_13);
+lean_ctor_set(x_21, 1, x_20);
+lean_ctor_set(x_21, 2, x_18);
+lean_ctor_set(x_21, 3, x_19);
+x_22 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_2);
+x_23 = lean_st_ref_take(x_7, x_16);
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = !lean_is_exclusive(x_24);
+if (x_26 == 0)
+{
+lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
+x_27 = lean_ctor_get(x_24, 3);
+x_28 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
+x_29 = 0;
+x_30 = lean_alloc_ctor(12, 3, 1);
+lean_ctor_set(x_30, 0, x_1);
+lean_ctor_set(x_30, 1, x_22);
+lean_ctor_set(x_30, 2, x_28);
+lean_ctor_set_uint8(x_30, sizeof(void*)*3, x_29);
+lean_inc(x_9);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_9);
+lean_ctor_set(x_31, 1, x_30);
+x_32 = l_Std_PersistentArray_push___rarg(x_27, x_31);
+lean_ctor_set(x_24, 3, x_32);
+x_33 = lean_st_ref_set(x_7, x_24, x_25);
+x_34 = !lean_is_exclusive(x_33);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; 
+x_35 = lean_ctor_get(x_33, 0);
+lean_dec(x_35);
+x_36 = lean_box(0);
+lean_ctor_set(x_33, 0, x_36);
+return x_33;
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_33, 1);
+lean_inc(x_37);
+lean_dec(x_33);
+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_37);
+return x_39;
+}
+}
+else
+{
+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_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_40 = lean_ctor_get(x_24, 0);
+x_41 = lean_ctor_get(x_24, 1);
+x_42 = lean_ctor_get(x_24, 2);
+x_43 = lean_ctor_get(x_24, 3);
+x_44 = lean_ctor_get(x_24, 4);
+x_45 = lean_ctor_get(x_24, 5);
+x_46 = lean_ctor_get(x_24, 6);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_24);
+x_47 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
+x_48 = 0;
+x_49 = lean_alloc_ctor(12, 3, 1);
+lean_ctor_set(x_49, 0, x_1);
+lean_ctor_set(x_49, 1, x_22);
+lean_ctor_set(x_49, 2, x_47);
+lean_ctor_set_uint8(x_49, sizeof(void*)*3, x_48);
+lean_inc(x_9);
+x_50 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_50, 0, x_9);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = l_Std_PersistentArray_push___rarg(x_43, x_50);
+x_52 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_52, 0, x_40);
+lean_ctor_set(x_52, 1, x_41);
+lean_ctor_set(x_52, 2, x_42);
+lean_ctor_set(x_52, 3, x_51);
+lean_ctor_set(x_52, 4, x_44);
+lean_ctor_set(x_52, 5, x_45);
+lean_ctor_set(x_52, 6, x_46);
+x_53 = lean_st_ref_set(x_7, x_52, x_25);
+x_54 = lean_ctor_get(x_53, 1);
+lean_inc(x_54);
+if (lean_is_exclusive(x_53)) {
+ lean_ctor_release(x_53, 0);
+ lean_ctor_release(x_53, 1);
+ x_55 = x_53;
+} else {
+ lean_dec_ref(x_53);
+ x_55 = lean_box(0);
+}
+x_56 = lean_box(0);
+if (lean_is_scalar(x_55)) {
+ x_57 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_57 = x_55;
+}
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_54);
+return x_57;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_8 = lean_ctor_get(x_1, 0);
+x_9 = l_Lean_Expr_fvar___override(x_3);
+x_10 = lean_array_push(x_2, x_9);
+lean_inc(x_8);
+x_11 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_11, 0, x_8);
+lean_ctor_set(x_11, 1, x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_7);
+return x_12;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(1u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("_jp", 3);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1;
+x_11 = lean_array_push(x_10, x_1);
+x_12 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+x_13 = l_Lean_Compiler_LCNF_mkAuxFunDecl(x_11, x_3, x_12, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_13) == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+lean_inc(x_14);
+x_16 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1___boxed), 7, 2);
+lean_closure_set(x_16, 0, x_14);
+lean_closure_set(x_16, 1, x_10);
+x_17 = l_Lean_Compiler_LCNF_CompilerM_codeBind(x_2, x_16, x_6, x_7, x_8, x_15);
+if (lean_obj_tag(x_17) == 0)
+{
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_17, 0);
+x_20 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_20, 0, x_14);
+lean_ctor_set(x_20, 1, x_19);
+x_21 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_17, 0, x_21);
+return x_17;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_22 = lean_ctor_get(x_17, 0);
+x_23 = lean_ctor_get(x_17, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_17);
+x_24 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_24, 0, x_14);
+lean_ctor_set(x_24, 1, x_22);
+x_25 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_25, 0, 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_23);
+return x_26;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_14);
+x_27 = !lean_is_exclusive(x_17);
 if (x_27 == 0)
 {
-return x_14;
+return x_17;
 }
 else
 {
 lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_28 = lean_ctor_get(x_14, 0);
-x_29 = lean_ctor_get(x_14, 1);
+x_28 = lean_ctor_get(x_17, 0);
+x_29 = lean_ctor_get(x_17, 1);
 lean_inc(x_29);
 lean_inc(x_28);
-lean_dec(x_14);
+lean_dec(x_17);
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_28);
 lean_ctor_set(x_30, 1, x_29);
@@ -23125,227 +21813,1479 @@ return x_30;
 }
 }
 }
+else
+{
+uint8_t x_31; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_2);
+x_31 = !lean_is_exclusive(x_13);
+if (x_31 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_13, 0);
+x_33 = lean_ctor_get(x_13, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_13);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
 }
 }
-LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; 
-x_9 = lean_unsigned_to_nat(0u);
-x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__4(x_2, x_9, x_1, x_3, x_4, x_5, x_6, x_7, x_8);
-return x_10;
+lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+lean_inc(x_8);
+x_13 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_8, x_1, x_2, x_9, x_10, x_11, x_12);
+x_14 = lean_ctor_get(x_13, 1);
+lean_inc(x_14);
+lean_dec(x_13);
+x_15 = lean_nat_dec_lt(x_3, x_4);
+lean_dec(x_4);
+if (x_15 == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+lean_dec(x_7);
+lean_dec(x_3);
+x_16 = lean_st_ref_get(x_11, x_14);
+x_17 = lean_ctor_get(x_16, 1);
+lean_inc(x_17);
+lean_dec(x_16);
+x_18 = lean_st_ref_take(x_2, x_17);
+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_is_exclusive(x_19);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_22 = lean_ctor_get(x_19, 0);
+x_23 = l_Lean_Expr_fvar___override(x_8);
+x_24 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_22, x_5, x_23);
+lean_ctor_set(x_19, 0, x_24);
+x_25 = lean_st_ref_set(x_2, x_19, x_20);
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
+x_27 = l_Lean_Compiler_LCNF_Simp_simp(x_6, x_1, x_2, x_9, x_10, x_11, x_26);
+return x_27;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_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; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_28 = lean_ctor_get(x_19, 0);
+x_29 = lean_ctor_get(x_19, 1);
+x_30 = lean_ctor_get(x_19, 2);
+x_31 = lean_ctor_get_uint8(x_19, sizeof(void*)*6);
+x_32 = lean_ctor_get(x_19, 3);
+x_33 = lean_ctor_get(x_19, 4);
+x_34 = lean_ctor_get(x_19, 5);
+lean_inc(x_34);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_19);
+x_35 = l_Lean_Expr_fvar___override(x_8);
+x_36 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_28, x_5, x_35);
+x_37 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_29);
+lean_ctor_set(x_37, 2, x_30);
+lean_ctor_set(x_37, 3, x_32);
+lean_ctor_set(x_37, 4, x_33);
+lean_ctor_set(x_37, 5, x_34);
+lean_ctor_set_uint8(x_37, sizeof(void*)*6, x_31);
+x_38 = lean_st_ref_set(x_2, x_37, x_20);
+x_39 = lean_ctor_get(x_38, 1);
+lean_inc(x_39);
+lean_dec(x_38);
+x_40 = l_Lean_Compiler_LCNF_Simp_simp(x_6, x_1, x_2, x_9, x_10, x_11, x_39);
+return x_40;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1() {
+else
+{
+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; 
+x_41 = l_Lean_Expr_fvar___override(x_8);
+x_42 = lean_array_get_size(x_7);
+x_43 = l_Array_toSubarray___rarg(x_7, x_3, x_42);
+x_44 = l_Array_ofSubarray___rarg(x_43);
+x_45 = l_Lean_mkAppN(x_41, x_44);
+x_46 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+x_47 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_45, x_46, x_9, x_10, x_11, x_14);
+if (lean_obj_tag(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; uint8_t x_56; 
+x_48 = lean_ctor_get(x_47, 0);
+lean_inc(x_48);
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+lean_dec(x_47);
+x_50 = lean_ctor_get(x_48, 0);
+lean_inc(x_50);
+x_51 = lean_st_ref_get(x_11, x_49);
+x_52 = lean_ctor_get(x_51, 1);
+lean_inc(x_52);
+lean_dec(x_51);
+x_53 = lean_st_ref_take(x_2, x_52);
+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 = !lean_is_exclusive(x_54);
+if (x_56 == 0)
+{
+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; 
+x_57 = lean_ctor_get(x_54, 0);
+x_58 = l_Lean_Expr_fvar___override(x_50);
+x_59 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_57, x_5, x_58);
+lean_ctor_set(x_54, 0, x_59);
+x_60 = lean_st_ref_set(x_2, x_54, x_55);
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+lean_dec(x_60);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_48);
+lean_ctor_set(x_62, 1, x_6);
+x_63 = l_Lean_Compiler_LCNF_Simp_simp(x_62, x_1, x_2, x_9, x_10, x_11, x_61);
+return x_63;
+}
+else
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_64 = lean_ctor_get(x_54, 0);
+x_65 = lean_ctor_get(x_54, 1);
+x_66 = lean_ctor_get(x_54, 2);
+x_67 = lean_ctor_get_uint8(x_54, sizeof(void*)*6);
+x_68 = lean_ctor_get(x_54, 3);
+x_69 = lean_ctor_get(x_54, 4);
+x_70 = lean_ctor_get(x_54, 5);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_inc(x_64);
+lean_dec(x_54);
+x_71 = l_Lean_Expr_fvar___override(x_50);
+x_72 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_64, x_5, x_71);
+x_73 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_65);
+lean_ctor_set(x_73, 2, x_66);
+lean_ctor_set(x_73, 3, x_68);
+lean_ctor_set(x_73, 4, x_69);
+lean_ctor_set(x_73, 5, x_70);
+lean_ctor_set_uint8(x_73, sizeof(void*)*6, x_67);
+x_74 = lean_st_ref_set(x_2, x_73, x_55);
+x_75 = lean_ctor_get(x_74, 1);
+lean_inc(x_75);
+lean_dec(x_74);
+x_76 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_76, 0, x_48);
+lean_ctor_set(x_76, 1, x_6);
+x_77 = l_Lean_Compiler_LCNF_Simp_simp(x_76, x_1, x_2, x_9, x_10, x_11, x_75);
+return x_77;
+}
+}
+else
+{
+uint8_t x_78; 
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+x_78 = !lean_is_exclusive(x_47);
+if (x_78 == 0)
+{
+return x_47;
+}
+else
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_47, 0);
+x_80 = lean_ctor_get(x_47, 1);
+lean_inc(x_80);
+lean_inc(x_79);
+lean_dec(x_47);
+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;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+_start:
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+lean_dec(x_6);
+x_13 = lean_ctor_get(x_1, 0);
+lean_inc(x_13);
+lean_dec(x_1);
+x_14 = l_Lean_Compiler_LCNF_Simp_InlineCandidateInfo_arity(x_2);
+x_15 = lean_nat_dec_lt(x_3, x_14);
+if (x_15 == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; lean_object* x_22; 
+x_16 = lean_ctor_get(x_2, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_2, 1);
+lean_inc(x_17);
+x_18 = lean_unsigned_to_nat(0u);
+lean_inc(x_14);
+lean_inc(x_4);
+x_19 = l_Array_toSubarray___rarg(x_4, x_18, x_14);
+x_20 = l_Array_ofSubarray___rarg(x_19);
+x_21 = 0;
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_20);
+x_22 = l_Lean_Compiler_LCNF_Simp_betaReduce(x_16, x_17, x_20, x_21, x_7, x_8, x_9, x_10, x_11, x_12);
+lean_dec(x_16);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_161; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_161 = l_Lean_Compiler_LCNF_Code_isReturnOf(x_5, x_13);
+if (x_161 == 0)
+{
+lean_object* x_162; 
+x_162 = lean_box(0);
+x_25 = x_162;
+goto block_160;
+}
+else
+{
+uint8_t x_163; 
+x_163 = lean_nat_dec_eq(x_3, x_14);
+if (x_163 == 0)
+{
+lean_object* x_164; 
+x_164 = lean_box(0);
+x_25 = x_164;
+goto block_160;
+}
+else
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+lean_dec(x_20);
+lean_dec(x_14);
+lean_dec(x_13);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_165 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_8, x_9, x_10, x_11, x_24);
+x_166 = lean_ctor_get(x_165, 1);
+lean_inc(x_166);
+lean_dec(x_165);
+x_167 = l_Lean_Compiler_LCNF_Simp_simp(x_23, x_7, x_8, x_9, x_10, x_11, x_166);
+if (lean_obj_tag(x_167) == 0)
+{
+uint8_t x_168; 
+x_168 = !lean_is_exclusive(x_167);
+if (x_168 == 0)
+{
+lean_object* x_169; lean_object* x_170; 
+x_169 = lean_ctor_get(x_167, 0);
+x_170 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_170, 0, x_169);
+lean_ctor_set(x_167, 0, x_170);
+return x_167;
+}
+else
+{
+lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_171 = lean_ctor_get(x_167, 0);
+x_172 = lean_ctor_get(x_167, 1);
+lean_inc(x_172);
+lean_inc(x_171);
+lean_dec(x_167);
+x_173 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_173, 0, x_171);
+x_174 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_174, 0, x_173);
+lean_ctor_set(x_174, 1, x_172);
+return x_174;
+}
+}
+else
+{
+uint8_t x_175; 
+x_175 = !lean_is_exclusive(x_167);
+if (x_175 == 0)
+{
+return x_167;
+}
+else
+{
+lean_object* x_176; lean_object* x_177; lean_object* x_178; 
+x_176 = lean_ctor_get(x_167, 0);
+x_177 = lean_ctor_get(x_167, 1);
+lean_inc(x_177);
+lean_inc(x_176);
+lean_dec(x_167);
+x_178 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_178, 0, x_176);
+lean_ctor_set(x_178, 1, x_177);
+return x_178;
+}
+}
+}
+}
+block_160:
+{
+lean_object* x_26; 
+lean_dec(x_25);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_26 = l_Lean_Compiler_LCNF_Simp_simp(x_23, x_7, x_8, x_9, x_10, x_11, x_24);
+if (lean_obj_tag(x_26) == 0)
+{
+lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+lean_inc(x_27);
+x_29 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go(x_27);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_30 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_8, x_9, x_10, x_11, x_28);
+x_31 = lean_ctor_get(x_30, 1);
+lean_inc(x_31);
+lean_dec(x_30);
+x_32 = lean_ctor_get(x_2, 2);
+lean_inc(x_32);
+lean_dec(x_2);
+x_33 = l_Lean_mkAppN(x_32, x_20);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+x_34 = l_Lean_Compiler_LCNF_inferType(x_33, x_9, x_10, x_11, x_31);
+if (lean_obj_tag(x_34) == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
+x_35 = lean_ctor_get(x_34, 0);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_34, 1);
+lean_inc(x_36);
+lean_dec(x_34);
+x_37 = l_Lean_Compiler_LCNF_mkAuxParam(x_35, x_21, x_9, x_10, x_11, x_36);
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_37, 1);
+lean_inc(x_39);
+lean_dec(x_37);
+x_40 = lean_nat_dec_lt(x_14, x_3);
+lean_dec(x_3);
+if (x_40 == 0)
+{
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; uint8_t x_47; 
+lean_dec(x_14);
+lean_dec(x_4);
+x_41 = lean_ctor_get(x_38, 0);
+lean_inc(x_41);
+x_42 = lean_st_ref_get(x_11, x_39);
+x_43 = lean_ctor_get(x_42, 1);
+lean_inc(x_43);
+lean_dec(x_42);
+x_44 = lean_st_ref_take(x_8, x_43);
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = !lean_is_exclusive(x_45);
+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; 
+x_48 = lean_ctor_get(x_45, 0);
+x_49 = l_Lean_Expr_fvar___override(x_41);
+x_50 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_48, x_13, x_49);
+lean_ctor_set(x_45, 0, x_50);
+x_51 = lean_st_ref_set(x_8, x_45, x_46);
+x_52 = lean_ctor_get(x_51, 1);
+lean_inc(x_52);
+lean_dec(x_51);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_53 = l_Lean_Compiler_LCNF_Simp_simp(x_5, x_7, x_8, x_9, x_10, x_11, x_52);
+if (lean_obj_tag(x_53) == 0)
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+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_Simp_inlineApp_x3f___lambda__2(x_38, x_27, x_54, x_7, x_8, x_9, x_10, x_11, x_55);
+lean_dec(x_8);
+lean_dec(x_7);
+return x_56;
+}
+else
+{
+uint8_t x_57; 
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_57 = !lean_is_exclusive(x_53);
+if (x_57 == 0)
+{
+return x_53;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_53, 0);
+x_59 = lean_ctor_get(x_53, 1);
+lean_inc(x_59);
+lean_inc(x_58);
+lean_dec(x_53);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_59);
+return x_60;
+}
+}
+}
+else
+{
+lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t 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; 
+x_61 = lean_ctor_get(x_45, 0);
+x_62 = lean_ctor_get(x_45, 1);
+x_63 = lean_ctor_get(x_45, 2);
+x_64 = lean_ctor_get_uint8(x_45, sizeof(void*)*6);
+x_65 = lean_ctor_get(x_45, 3);
+x_66 = lean_ctor_get(x_45, 4);
+x_67 = lean_ctor_get(x_45, 5);
+lean_inc(x_67);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_dec(x_45);
+x_68 = l_Lean_Expr_fvar___override(x_41);
+x_69 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_61, x_13, x_68);
+x_70 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_70, 0, x_69);
+lean_ctor_set(x_70, 1, x_62);
+lean_ctor_set(x_70, 2, x_63);
+lean_ctor_set(x_70, 3, x_65);
+lean_ctor_set(x_70, 4, x_66);
+lean_ctor_set(x_70, 5, x_67);
+lean_ctor_set_uint8(x_70, sizeof(void*)*6, x_64);
+x_71 = lean_st_ref_set(x_8, x_70, x_46);
+x_72 = lean_ctor_get(x_71, 1);
+lean_inc(x_72);
+lean_dec(x_71);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_73 = l_Lean_Compiler_LCNF_Simp_simp(x_5, x_7, x_8, x_9, x_10, x_11, x_72);
+if (lean_obj_tag(x_73) == 0)
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_73, 1);
+lean_inc(x_75);
+lean_dec(x_73);
+x_76 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_38, x_27, x_74, x_7, x_8, x_9, x_10, x_11, x_75);
+lean_dec(x_8);
+lean_dec(x_7);
+return x_76;
+}
+else
+{
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_77 = lean_ctor_get(x_73, 0);
+lean_inc(x_77);
+x_78 = lean_ctor_get(x_73, 1);
+lean_inc(x_78);
+if (lean_is_exclusive(x_73)) {
+ lean_ctor_release(x_73, 0);
+ lean_ctor_release(x_73, 1);
+ x_79 = x_73;
+} else {
+ lean_dec_ref(x_73);
+ x_79 = lean_box(0);
+}
+if (lean_is_scalar(x_79)) {
+ x_80 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_80 = x_79;
+}
+lean_ctor_set(x_80, 0, x_77);
+lean_ctor_set(x_80, 1, x_78);
+return x_80;
+}
+}
+}
+else
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_81 = lean_ctor_get(x_38, 0);
+lean_inc(x_81);
+x_82 = l_Lean_Expr_fvar___override(x_81);
+x_83 = lean_array_get_size(x_4);
+x_84 = l_Array_toSubarray___rarg(x_4, x_14, x_83);
+x_85 = l_Array_ofSubarray___rarg(x_84);
+x_86 = l_Lean_mkAppN(x_82, x_85);
+x_87 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+x_88 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_86, x_87, x_9, x_10, x_11, x_39);
+if (lean_obj_tag(x_88) == 0)
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; uint8_t x_97; 
+x_89 = lean_ctor_get(x_88, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_88, 1);
+lean_inc(x_90);
+lean_dec(x_88);
+x_91 = lean_ctor_get(x_89, 0);
+lean_inc(x_91);
+x_92 = lean_st_ref_get(x_11, x_90);
+x_93 = lean_ctor_get(x_92, 1);
+lean_inc(x_93);
+lean_dec(x_92);
+x_94 = lean_st_ref_take(x_8, x_93);
+x_95 = lean_ctor_get(x_94, 0);
+lean_inc(x_95);
+x_96 = lean_ctor_get(x_94, 1);
+lean_inc(x_96);
+lean_dec(x_94);
+x_97 = !lean_is_exclusive(x_95);
+if (x_97 == 0)
+{
+lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_98 = lean_ctor_get(x_95, 0);
+x_99 = l_Lean_Expr_fvar___override(x_91);
+x_100 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_98, x_13, x_99);
+lean_ctor_set(x_95, 0, x_100);
+x_101 = lean_st_ref_set(x_8, x_95, x_96);
+x_102 = lean_ctor_get(x_101, 1);
+lean_inc(x_102);
+lean_dec(x_101);
+x_103 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_103, 0, x_89);
+lean_ctor_set(x_103, 1, x_5);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_104 = l_Lean_Compiler_LCNF_Simp_simp(x_103, x_7, x_8, x_9, x_10, x_11, x_102);
+if (lean_obj_tag(x_104) == 0)
+{
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_104, 1);
+lean_inc(x_106);
+lean_dec(x_104);
+x_107 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_38, x_27, x_105, x_7, x_8, x_9, x_10, x_11, x_106);
+lean_dec(x_8);
+lean_dec(x_7);
+return x_107;
+}
+else
+{
+uint8_t x_108; 
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_108 = !lean_is_exclusive(x_104);
+if (x_108 == 0)
+{
+return x_104;
+}
+else
+{
+lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+x_109 = lean_ctor_get(x_104, 0);
+x_110 = lean_ctor_get(x_104, 1);
+lean_inc(x_110);
+lean_inc(x_109);
+lean_dec(x_104);
+x_111 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_111, 0, x_109);
+lean_ctor_set(x_111, 1, x_110);
+return x_111;
+}
+}
+}
+else
+{
+lean_object* x_112; lean_object* x_113; lean_object* x_114; uint8_t x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_112 = lean_ctor_get(x_95, 0);
+x_113 = lean_ctor_get(x_95, 1);
+x_114 = lean_ctor_get(x_95, 2);
+x_115 = lean_ctor_get_uint8(x_95, sizeof(void*)*6);
+x_116 = lean_ctor_get(x_95, 3);
+x_117 = lean_ctor_get(x_95, 4);
+x_118 = lean_ctor_get(x_95, 5);
+lean_inc(x_118);
+lean_inc(x_117);
+lean_inc(x_116);
+lean_inc(x_114);
+lean_inc(x_113);
+lean_inc(x_112);
+lean_dec(x_95);
+x_119 = l_Lean_Expr_fvar___override(x_91);
+x_120 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_112, x_13, x_119);
+x_121 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_121, 0, x_120);
+lean_ctor_set(x_121, 1, x_113);
+lean_ctor_set(x_121, 2, x_114);
+lean_ctor_set(x_121, 3, x_116);
+lean_ctor_set(x_121, 4, x_117);
+lean_ctor_set(x_121, 5, x_118);
+lean_ctor_set_uint8(x_121, sizeof(void*)*6, x_115);
+x_122 = lean_st_ref_set(x_8, x_121, x_96);
+x_123 = lean_ctor_get(x_122, 1);
+lean_inc(x_123);
+lean_dec(x_122);
+x_124 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_124, 0, x_89);
+lean_ctor_set(x_124, 1, x_5);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_125 = l_Lean_Compiler_LCNF_Simp_simp(x_124, x_7, x_8, x_9, x_10, x_11, x_123);
+if (lean_obj_tag(x_125) == 0)
+{
+lean_object* x_126; lean_object* x_127; lean_object* x_128; 
+x_126 = lean_ctor_get(x_125, 0);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_125, 1);
+lean_inc(x_127);
+lean_dec(x_125);
+x_128 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_38, x_27, x_126, x_7, x_8, x_9, x_10, x_11, x_127);
+lean_dec(x_8);
+lean_dec(x_7);
+return x_128;
+}
+else
+{
+lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_129 = lean_ctor_get(x_125, 0);
+lean_inc(x_129);
+x_130 = lean_ctor_get(x_125, 1);
+lean_inc(x_130);
+if (lean_is_exclusive(x_125)) {
+ lean_ctor_release(x_125, 0);
+ lean_ctor_release(x_125, 1);
+ x_131 = x_125;
+} else {
+ lean_dec_ref(x_125);
+ x_131 = lean_box(0);
+}
+if (lean_is_scalar(x_131)) {
+ x_132 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_132 = x_131;
+}
+lean_ctor_set(x_132, 0, x_129);
+lean_ctor_set(x_132, 1, x_130);
+return x_132;
+}
+}
+}
+else
+{
+uint8_t x_133; 
+lean_dec(x_38);
+lean_dec(x_27);
+lean_dec(x_13);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+x_133 = !lean_is_exclusive(x_88);
+if (x_133 == 0)
+{
+return x_88;
+}
+else
+{
+lean_object* x_134; lean_object* x_135; lean_object* x_136; 
+x_134 = lean_ctor_get(x_88, 0);
+x_135 = lean_ctor_get(x_88, 1);
+lean_inc(x_135);
+lean_inc(x_134);
+lean_dec(x_88);
+x_136 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_136, 0, x_134);
+lean_ctor_set(x_136, 1, x_135);
+return x_136;
+}
+}
+}
+}
+else
+{
+uint8_t x_137; 
+lean_dec(x_27);
+lean_dec(x_14);
+lean_dec(x_13);
+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_137 = !lean_is_exclusive(x_34);
+if (x_137 == 0)
+{
+return x_34;
+}
+else
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; 
+x_138 = lean_ctor_get(x_34, 0);
+x_139 = lean_ctor_get(x_34, 1);
+lean_inc(x_139);
+lean_inc(x_138);
+lean_dec(x_34);
+x_140 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_140, 0, x_138);
+lean_ctor_set(x_140, 1, x_139);
+return x_140;
+}
+}
+}
+else
+{
+lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+lean_dec(x_20);
+lean_dec(x_2);
+x_141 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_8, x_9, x_10, x_11, x_28);
+x_142 = lean_ctor_get(x_141, 1);
+lean_inc(x_142);
+lean_dec(x_141);
+x_143 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3), 12, 7);
+lean_closure_set(x_143, 0, x_7);
+lean_closure_set(x_143, 1, x_8);
+lean_closure_set(x_143, 2, x_14);
+lean_closure_set(x_143, 3, x_3);
+lean_closure_set(x_143, 4, x_13);
+lean_closure_set(x_143, 5, x_5);
+lean_closure_set(x_143, 6, x_4);
+x_144 = l_Lean_Compiler_LCNF_CompilerM_codeBind(x_27, x_143, x_9, x_10, x_11, x_142);
+if (lean_obj_tag(x_144) == 0)
+{
+uint8_t x_145; 
+x_145 = !lean_is_exclusive(x_144);
+if (x_145 == 0)
+{
+lean_object* x_146; lean_object* x_147; 
+x_146 = lean_ctor_get(x_144, 0);
+x_147 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_147, 0, x_146);
+lean_ctor_set(x_144, 0, x_147);
+return x_144;
+}
+else
+{
+lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_148 = lean_ctor_get(x_144, 0);
+x_149 = lean_ctor_get(x_144, 1);
+lean_inc(x_149);
+lean_inc(x_148);
+lean_dec(x_144);
+x_150 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_150, 0, x_148);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_149);
+return x_151;
+}
+}
+else
+{
+uint8_t x_152; 
+x_152 = !lean_is_exclusive(x_144);
+if (x_152 == 0)
+{
+return x_144;
+}
+else
+{
+lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_153 = lean_ctor_get(x_144, 0);
+x_154 = lean_ctor_get(x_144, 1);
+lean_inc(x_154);
+lean_inc(x_153);
+lean_dec(x_144);
+x_155 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_155, 0, x_153);
+lean_ctor_set(x_155, 1, x_154);
+return x_155;
+}
+}
+}
+}
+else
+{
+uint8_t x_156; 
+lean_dec(x_20);
+lean_dec(x_14);
+lean_dec(x_13);
+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);
+lean_dec(x_2);
+x_156 = !lean_is_exclusive(x_26);
+if (x_156 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+x_157 = lean_ctor_get(x_26, 0);
+x_158 = lean_ctor_get(x_26, 1);
+lean_inc(x_158);
+lean_inc(x_157);
+lean_dec(x_26);
+x_159 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_159, 0, x_157);
+lean_ctor_set(x_159, 1, x_158);
+return x_159;
+}
+}
+}
+}
+else
+{
+uint8_t x_179; 
+lean_dec(x_20);
+lean_dec(x_14);
+lean_dec(x_13);
+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);
+lean_dec(x_2);
+x_179 = !lean_is_exclusive(x_22);
+if (x_179 == 0)
+{
+return x_22;
+}
+else
+{
+lean_object* x_180; lean_object* x_181; lean_object* x_182; 
+x_180 = lean_ctor_get(x_22, 0);
+x_181 = lean_ctor_get(x_22, 1);
+lean_inc(x_181);
+lean_inc(x_180);
+lean_dec(x_22);
+x_182 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_182, 0, x_180);
+lean_ctor_set(x_182, 1, x_181);
+return x_182;
+}
+}
+}
+else
+{
+lean_object* x_183; 
+lean_dec(x_14);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_183 = l_Lean_Compiler_LCNF_Simp_specializePartialApp(x_2, x_7, x_8, x_9, x_10, x_11, x_12);
+if (lean_obj_tag(x_183) == 0)
+{
+lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; uint8_t x_192; 
+x_184 = lean_ctor_get(x_183, 0);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_183, 1);
+lean_inc(x_185);
+lean_dec(x_183);
+x_186 = lean_ctor_get(x_184, 0);
+lean_inc(x_186);
+x_187 = lean_st_ref_get(x_11, x_185);
+x_188 = lean_ctor_get(x_187, 1);
+lean_inc(x_188);
+lean_dec(x_187);
+x_189 = lean_st_ref_take(x_8, x_188);
+x_190 = lean_ctor_get(x_189, 0);
+lean_inc(x_190);
+x_191 = lean_ctor_get(x_189, 1);
+lean_inc(x_191);
+lean_dec(x_189);
+x_192 = !lean_is_exclusive(x_190);
+if (x_192 == 0)
+{
+lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
+x_193 = lean_ctor_get(x_190, 0);
+x_194 = l_Lean_Expr_fvar___override(x_186);
+x_195 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_193, x_13, x_194);
+lean_ctor_set(x_190, 0, x_195);
+x_196 = lean_st_ref_set(x_8, x_190, x_191);
+x_197 = lean_ctor_get(x_196, 1);
+lean_inc(x_197);
+lean_dec(x_196);
+x_198 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_8, x_9, x_10, x_11, x_197);
+x_199 = lean_ctor_get(x_198, 1);
+lean_inc(x_199);
+lean_dec(x_198);
+x_200 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_200, 0, x_184);
+lean_ctor_set(x_200, 1, x_5);
+x_201 = l_Lean_Compiler_LCNF_Simp_simp(x_200, x_7, x_8, x_9, x_10, x_11, x_199);
+if (lean_obj_tag(x_201) == 0)
+{
+uint8_t x_202; 
+x_202 = !lean_is_exclusive(x_201);
+if (x_202 == 0)
+{
+lean_object* x_203; lean_object* x_204; 
+x_203 = lean_ctor_get(x_201, 0);
+x_204 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_204, 0, x_203);
+lean_ctor_set(x_201, 0, x_204);
+return x_201;
+}
+else
+{
+lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; 
+x_205 = lean_ctor_get(x_201, 0);
+x_206 = lean_ctor_get(x_201, 1);
+lean_inc(x_206);
+lean_inc(x_205);
+lean_dec(x_201);
+x_207 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_207, 0, x_205);
+x_208 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_208, 0, x_207);
+lean_ctor_set(x_208, 1, x_206);
+return x_208;
+}
+}
+else
+{
+uint8_t x_209; 
+x_209 = !lean_is_exclusive(x_201);
+if (x_209 == 0)
+{
+return x_201;
+}
+else
+{
+lean_object* x_210; lean_object* x_211; lean_object* x_212; 
+x_210 = lean_ctor_get(x_201, 0);
+x_211 = lean_ctor_get(x_201, 1);
+lean_inc(x_211);
+lean_inc(x_210);
+lean_dec(x_201);
+x_212 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_212, 0, x_210);
+lean_ctor_set(x_212, 1, x_211);
+return x_212;
+}
+}
+}
+else
+{
+lean_object* x_213; lean_object* x_214; lean_object* x_215; uint8_t x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; 
+x_213 = lean_ctor_get(x_190, 0);
+x_214 = lean_ctor_get(x_190, 1);
+x_215 = lean_ctor_get(x_190, 2);
+x_216 = lean_ctor_get_uint8(x_190, sizeof(void*)*6);
+x_217 = lean_ctor_get(x_190, 3);
+x_218 = lean_ctor_get(x_190, 4);
+x_219 = lean_ctor_get(x_190, 5);
+lean_inc(x_219);
+lean_inc(x_218);
+lean_inc(x_217);
+lean_inc(x_215);
+lean_inc(x_214);
+lean_inc(x_213);
+lean_dec(x_190);
+x_220 = l_Lean_Expr_fvar___override(x_186);
+x_221 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_213, x_13, x_220);
+x_222 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_222, 0, x_221);
+lean_ctor_set(x_222, 1, x_214);
+lean_ctor_set(x_222, 2, x_215);
+lean_ctor_set(x_222, 3, x_217);
+lean_ctor_set(x_222, 4, x_218);
+lean_ctor_set(x_222, 5, x_219);
+lean_ctor_set_uint8(x_222, sizeof(void*)*6, x_216);
+x_223 = lean_st_ref_set(x_8, x_222, x_191);
+x_224 = lean_ctor_get(x_223, 1);
+lean_inc(x_224);
+lean_dec(x_223);
+x_225 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_8, x_9, x_10, x_11, x_224);
+x_226 = lean_ctor_get(x_225, 1);
+lean_inc(x_226);
+lean_dec(x_225);
+x_227 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_227, 0, x_184);
+lean_ctor_set(x_227, 1, x_5);
+x_228 = l_Lean_Compiler_LCNF_Simp_simp(x_227, x_7, x_8, x_9, x_10, x_11, x_226);
+if (lean_obj_tag(x_228) == 0)
+{
+lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 
+x_229 = lean_ctor_get(x_228, 0);
+lean_inc(x_229);
+x_230 = lean_ctor_get(x_228, 1);
+lean_inc(x_230);
+if (lean_is_exclusive(x_228)) {
+ lean_ctor_release(x_228, 0);
+ lean_ctor_release(x_228, 1);
+ x_231 = x_228;
+} else {
+ lean_dec_ref(x_228);
+ x_231 = lean_box(0);
+}
+x_232 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_232, 0, x_229);
+if (lean_is_scalar(x_231)) {
+ x_233 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_233 = x_231;
+}
+lean_ctor_set(x_233, 0, x_232);
+lean_ctor_set(x_233, 1, x_230);
+return x_233;
+}
+else
+{
+lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; 
+x_234 = lean_ctor_get(x_228, 0);
+lean_inc(x_234);
+x_235 = lean_ctor_get(x_228, 1);
+lean_inc(x_235);
+if (lean_is_exclusive(x_228)) {
+ lean_ctor_release(x_228, 0);
+ lean_ctor_release(x_228, 1);
+ x_236 = x_228;
+} else {
+ lean_dec_ref(x_228);
+ x_236 = lean_box(0);
+}
+if (lean_is_scalar(x_236)) {
+ x_237 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_237 = x_236;
+}
+lean_ctor_set(x_237, 0, x_234);
+lean_ctor_set(x_237, 1, x_235);
+return x_237;
+}
+}
+}
+else
+{
+uint8_t x_238; 
+lean_dec(x_13);
+lean_dec(x_11);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_5);
+x_238 = !lean_is_exclusive(x_183);
+if (x_238 == 0)
+{
+return x_183;
+}
+else
+{
+lean_object* x_239; lean_object* x_240; lean_object* x_241; 
+x_239 = lean_ctor_get(x_183, 0);
+x_240 = lean_ctor_get(x_183, 1);
+lean_inc(x_240);
+lean_inc(x_239);
+lean_dec(x_183);
+x_241 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_241, 0, x_239);
+lean_ctor_set(x_241, 1, x_240);
+return x_241;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed), 7, 0);
+x_1 = lean_mk_string_from_bytes("Compiler", 8);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2() {
 _start:
 {
-lean_object* x_8; lean_object* x_9; 
-x_8 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1;
-x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__3(x_1, x_8, x_2, x_3, x_4, x_5, x_6, x_7);
-return x_9;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simpFunDecl(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) {
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3() {
 _start:
 {
-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_object* x_17; 
-x_8 = lean_ctor_get(x_1, 3);
-lean_inc(x_8);
-x_9 = lean_st_ref_get(x_6, x_7);
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_11 = lean_st_ref_get(x_3, x_10);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_12, 0);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_8);
-x_16 = lean_ctor_get(x_1, 2);
-lean_inc(x_16);
+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_inlineApp_x3f___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2;
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f___closed__2;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("inlining ", 9);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_List_forIn_loop___at_Lean_Compiler_LCNF_Simp_FunDeclInfoMap_format___spec__4___closed__3;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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; 
+x_9 = lean_ctor_get(x_1, 3);
+lean_inc(x_9);
+lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_2);
-x_17 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(x_16, x_2, x_3, x_4, x_5, x_6, x_13);
-if (lean_obj_tag(x_17) == 0)
+lean_inc(x_9);
+x_10 = l_Lean_Compiler_LCNF_Simp_inlineCandidate_x3f(x_9, x_3, x_4, x_5, x_6, x_7, x_8);
+if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
-lean_inc(x_19);
-lean_dec(x_17);
-x_20 = lean_ctor_get(x_1, 4);
-lean_inc(x_20);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_21 = l_Lean_Compiler_LCNF_Simp_simp(x_20, x_2, x_3, x_4, x_5, x_6, x_19);
-if (lean_obj_tag(x_21) == 0)
+lean_object* x_11; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+if (lean_obj_tag(x_11) == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_1, x_15, x_18, x_22, x_4, x_5, x_6, x_23);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_24;
-}
-else
-{
-uint8_t x_25; 
-lean_dec(x_18);
-lean_dec(x_15);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_25 = !lean_is_exclusive(x_21);
-if (x_25 == 0)
-{
-return x_21;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_21, 0);
-x_27 = lean_ctor_get(x_21, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_21);
-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;
-}
-}
-}
-else
-{
-uint8_t x_29; 
-lean_dec(x_15);
+uint8_t x_12; 
+lean_dec(x_9);
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_29 = !lean_is_exclusive(x_17);
-if (x_29 == 0)
+x_12 = !lean_is_exclusive(x_10);
+if (x_12 == 0)
 {
-return x_17;
-}
-else
-{
-lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_30 = lean_ctor_get(x_17, 0);
-x_31 = lean_ctor_get(x_17, 1);
-lean_inc(x_31);
-lean_inc(x_30);
-lean_dec(x_17);
-x_32 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_32, 0, x_30);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-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_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_8 = lean_ctor_get(x_1, 2);
-lean_inc(x_8);
-x_9 = lean_st_ref_get(x_6, x_7);
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_11 = lean_st_ref_get(x_3, x_10);
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
-lean_inc(x_13);
-lean_dec(x_11);
-x_14 = lean_ctor_get(x_12, 0);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_8);
-x_16 = lean_ctor_get(x_1, 3);
-lean_inc(x_16);
-x_17 = lean_st_ref_get(x_6, x_13);
-x_18 = lean_ctor_get(x_17, 1);
-lean_inc(x_18);
-lean_dec(x_17);
-x_19 = lean_st_ref_get(x_3, x_18);
-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_dec(x_20);
-x_23 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_22, x_16);
-x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_1, x_15, x_23, x_4, x_5, x_6, x_21);
-return x_24;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = lean_st_ref_get(x_6, x_7);
-x_9 = lean_ctor_get(x_8, 1);
-lean_inc(x_9);
-lean_dec(x_8);
-x_10 = lean_st_ref_get(x_3, x_9);
-x_11 = !lean_is_exclusive(x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_ctor_get(x_10, 0);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-lean_dec(x_12);
-x_14 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_13, x_1);
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_10, 0);
+lean_dec(x_13);
+x_14 = lean_box(0);
 lean_ctor_set(x_10, 0, x_14);
 return x_10;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_15 = lean_ctor_get(x_10, 0);
-x_16 = lean_ctor_get(x_10, 1);
-lean_inc(x_16);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_10, 1);
 lean_inc(x_15);
 lean_dec(x_10);
-x_17 = lean_ctor_get(x_15, 0);
+x_16 = lean_box(0);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_15);
+return x_17;
+}
+}
+else
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_18 = lean_ctor_get(x_10, 1);
+lean_inc(x_18);
+lean_dec(x_10);
+x_19 = lean_ctor_get(x_11, 0);
+lean_inc(x_19);
+lean_dec(x_11);
+x_20 = lean_ctor_get(x_19, 3);
+lean_inc(x_20);
+x_21 = lean_array_get_size(x_20);
+x_22 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5;
+x_23 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(x_22, x_3, x_4, x_5, x_6, x_7, x_18);
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_unbox(x_24);
+lean_dec(x_24);
+if (x_25 == 0)
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_dec(x_9);
+x_26 = lean_ctor_get(x_23, 1);
+lean_inc(x_26);
+lean_dec(x_23);
+x_27 = lean_box(0);
+x_28 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(x_1, x_19, x_21, x_20, x_2, x_27, x_3, x_4, x_5, x_6, x_7, x_26);
+return x_28;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_29 = lean_ctor_get(x_23, 1);
+lean_inc(x_29);
+lean_dec(x_23);
+x_30 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_30, 0, x_9);
+x_31 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7;
+x_32 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+x_33 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8;
+x_34 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+x_35 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(x_22, x_34, x_3, x_4, x_5, x_6, x_7, x_29);
+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 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__4(x_1, x_19, x_21, x_20, x_2, x_36, x_3, x_4, x_5, x_6, x_7, x_37);
+return x_38;
+}
+}
+}
+else
+{
+uint8_t x_39; 
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_39 = !lean_is_exclusive(x_10);
+if (x_39 == 0)
+{
+return x_10;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_10, 0);
+x_41 = lean_ctor_get(x_10, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_10);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, 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; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_9 = lean_ctor_get(x_2, 2);
+lean_inc(x_9);
+x_10 = lean_st_ref_get(x_7, x_8);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_st_ref_get(x_4, x_11);
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = lean_ctor_get(x_13, 0);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_15, x_1, x_9);
+x_17 = lean_ctor_get(x_2, 3);
 lean_inc(x_17);
-lean_dec(x_15);
-x_18 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_17, x_1);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_16);
-return x_19;
+x_18 = lean_st_ref_get(x_7, x_14);
+x_19 = lean_ctor_get(x_18, 1);
+lean_inc(x_19);
+lean_dec(x_18);
+x_20 = lean_st_ref_get(x_4, x_19);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = lean_ctor_get(x_21, 0);
+lean_inc(x_23);
+lean_dec(x_21);
+x_24 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_23, x_1, x_17);
+x_25 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateLetDeclImp(x_2, x_16, x_24, x_5, x_6, x_7, x_22);
+return x_25;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_9 = lean_st_ref_get(x_7, x_8);
+x_10 = lean_ctor_get(x_9, 1);
+lean_inc(x_10);
+lean_dec(x_9);
+x_11 = lean_st_ref_get(x_4, x_10);
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_ctor_get(x_11, 0);
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+lean_dec(x_13);
+x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_1, x_2);
+lean_ctor_set(x_11, 0, x_15);
+return x_11;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_16 = lean_ctor_get(x_11, 0);
+x_17 = lean_ctor_get(x_11, 1);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_dec(x_11);
+x_18 = lean_ctor_get(x_16, 0);
+lean_inc(x_18);
+lean_dec(x_16);
+x_19 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_18, x_1, x_2);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_17);
+return x_20;
 }
 }
 }
@@ -23462,21 +23402,15 @@ x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler
 return x_10;
 }
 }
-static lean_object* _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1() {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3___boxed), 7, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1;
-x_9 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__4(x_1, x_8, x_2, x_3, x_4, x_5, x_6, x_7);
-return x_9;
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = lean_box(x_1);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3___boxed), 8, 1);
+lean_closure_set(x_10, 0, x_9);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__4(x_2, x_10, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_11;
 }
 }
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simp___spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
@@ -23899,7 +23833,7 @@ return x_63;
 }
 else
 {
-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_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; uint8_t x_74; 
 lean_dec(x_3);
 lean_dec(x_2);
 x_64 = lean_ctor_get(x_21, 0);
@@ -23915,67 +23849,170 @@ lean_inc(x_67);
 lean_dec(x_64);
 x_68 = lean_ctor_get(x_4, 0);
 lean_inc(x_68);
-x_69 = l_Lean_Expr_fvar___override(x_67);
-x_70 = l_Lean_Compiler_LCNF_Simp_addSubst(x_68, x_69, x_6, x_7, x_8, x_9, x_10, x_65);
-x_71 = lean_ctor_get(x_70, 1);
-lean_inc(x_71);
-lean_dec(x_70);
-x_72 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_71);
-lean_dec(x_4);
-x_73 = lean_ctor_get(x_72, 1);
+x_69 = lean_st_ref_get(x_10, x_65);
+x_70 = lean_ctor_get(x_69, 1);
+lean_inc(x_70);
+lean_dec(x_69);
+x_71 = lean_st_ref_take(x_7, x_70);
+x_72 = lean_ctor_get(x_71, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_71, 1);
 lean_inc(x_73);
-lean_dec(x_72);
+lean_dec(x_71);
+x_74 = !lean_is_exclusive(x_72);
+if (x_74 == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_75 = lean_ctor_get(x_72, 0);
+x_76 = l_Lean_Expr_fvar___override(x_67);
+x_77 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_75, x_68, x_76);
+lean_ctor_set(x_72, 0, x_77);
+x_78 = lean_st_ref_set(x_7, x_72, x_73);
+x_79 = lean_ctor_get(x_78, 1);
+lean_inc(x_79);
+lean_dec(x_78);
+x_80 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_79);
+lean_dec(x_4);
+x_81 = lean_ctor_get(x_80, 1);
+lean_inc(x_81);
+lean_dec(x_80);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-x_74 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_73);
-if (lean_obj_tag(x_74) == 0)
+x_82 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_81);
+if (lean_obj_tag(x_82) == 0)
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_74, 0);
-lean_inc(x_75);
-x_76 = lean_ctor_get(x_74, 1);
-lean_inc(x_76);
-lean_dec(x_74);
-x_77 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_66, x_75, x_6, x_7, x_8, x_9, x_10, x_76);
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+lean_dec(x_82);
+x_85 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_66, x_83, x_6, x_7, x_8, x_9, x_10, x_84);
 lean_dec(x_66);
-return x_77;
+return x_85;
 }
 else
 {
-uint8_t x_78; 
+uint8_t x_86; 
 lean_dec(x_66);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-x_78 = !lean_is_exclusive(x_74);
-if (x_78 == 0)
+x_86 = !lean_is_exclusive(x_82);
+if (x_86 == 0)
 {
-return x_74;
+return x_82;
 }
 else
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_ctor_get(x_74, 0);
-x_80 = lean_ctor_get(x_74, 1);
-lean_inc(x_80);
-lean_inc(x_79);
-lean_dec(x_74);
-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;
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_82, 0);
+x_88 = lean_ctor_get(x_82, 1);
+lean_inc(x_88);
+lean_inc(x_87);
+lean_dec(x_82);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_87);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
+}
+}
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_90 = lean_ctor_get(x_72, 0);
+x_91 = lean_ctor_get(x_72, 1);
+x_92 = lean_ctor_get(x_72, 2);
+x_93 = lean_ctor_get_uint8(x_72, sizeof(void*)*6);
+x_94 = lean_ctor_get(x_72, 3);
+x_95 = lean_ctor_get(x_72, 4);
+x_96 = lean_ctor_get(x_72, 5);
+lean_inc(x_96);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_72);
+x_97 = l_Lean_Expr_fvar___override(x_67);
+x_98 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_90, x_68, x_97);
+x_99 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_99, 0, x_98);
+lean_ctor_set(x_99, 1, x_91);
+lean_ctor_set(x_99, 2, x_92);
+lean_ctor_set(x_99, 3, x_94);
+lean_ctor_set(x_99, 4, x_95);
+lean_ctor_set(x_99, 5, x_96);
+lean_ctor_set_uint8(x_99, sizeof(void*)*6, x_93);
+x_100 = lean_st_ref_set(x_7, x_99, x_73);
+x_101 = lean_ctor_get(x_100, 1);
+lean_inc(x_101);
+lean_dec(x_100);
+x_102 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_101);
+lean_dec(x_4);
+x_103 = lean_ctor_get(x_102, 1);
+lean_inc(x_103);
+lean_dec(x_102);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+x_104 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_103);
+if (lean_obj_tag(x_104) == 0)
+{
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_104, 1);
+lean_inc(x_106);
+lean_dec(x_104);
+x_107 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_66, x_105, x_6, x_7, x_8, x_9, x_10, x_106);
+lean_dec(x_66);
+return x_107;
+}
+else
+{
+lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+lean_dec(x_66);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+x_108 = lean_ctor_get(x_104, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_104, 1);
+lean_inc(x_109);
+if (lean_is_exclusive(x_104)) {
+ lean_ctor_release(x_104, 0);
+ lean_ctor_release(x_104, 1);
+ x_110 = x_104;
+} else {
+ lean_dec_ref(x_104);
+ x_110 = lean_box(0);
+}
+if (lean_is_scalar(x_110)) {
+ x_111 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_111 = x_110;
+}
+lean_ctor_set(x_111, 0, x_108);
+lean_ctor_set(x_111, 1, x_109);
+return x_111;
 }
 }
 }
 }
 else
 {
-uint8_t x_82; 
+uint8_t x_112; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -23985,51 +24022,71 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_82 = !lean_is_exclusive(x_20);
-if (x_82 == 0)
+x_112 = !lean_is_exclusive(x_20);
+if (x_112 == 0)
 {
 return x_20;
 }
 else
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_83 = lean_ctor_get(x_20, 0);
-x_84 = lean_ctor_get(x_20, 1);
-lean_inc(x_84);
-lean_inc(x_83);
+lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_113 = lean_ctor_get(x_20, 0);
+x_114 = lean_ctor_get(x_20, 1);
+lean_inc(x_114);
+lean_inc(x_113);
 lean_dec(x_20);
-x_85 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_85, 0, x_83);
-lean_ctor_set(x_85, 1, x_84);
-return x_85;
+x_115 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_115, 0, x_113);
+lean_ctor_set(x_115, 1, x_114);
+return x_115;
 }
 }
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+lean_object* x_116; lean_object* x_117; lean_object* x_118; uint8_t x_119; 
 lean_dec(x_15);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_86 = lean_ctor_get(x_17, 1);
-lean_inc(x_86);
+x_116 = lean_ctor_get(x_17, 1);
+lean_inc(x_116);
 lean_dec(x_17);
-x_87 = lean_ctor_get(x_18, 0);
-lean_inc(x_87);
+x_117 = lean_ctor_get(x_18, 0);
+lean_inc(x_117);
 lean_dec(x_18);
-x_88 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_86);
+x_118 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_116);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
 lean_dec(x_4);
-x_89 = lean_ctor_get(x_88, 1);
-lean_inc(x_89);
-lean_dec(x_88);
-x_90 = l_Lean_Compiler_LCNF_Simp_simp(x_87, x_6, x_7, x_8, x_9, x_10, x_89);
-return x_90;
+x_119 = !lean_is_exclusive(x_118);
+if (x_119 == 0)
+{
+lean_object* x_120; 
+x_120 = lean_ctor_get(x_118, 0);
+lean_dec(x_120);
+lean_ctor_set(x_118, 0, x_117);
+return x_118;
+}
+else
+{
+lean_object* x_121; lean_object* x_122; 
+x_121 = lean_ctor_get(x_118, 1);
+lean_inc(x_121);
+lean_dec(x_118);
+x_122 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_122, 0, x_117);
+lean_ctor_set(x_122, 1, x_121);
+return x_122;
+}
 }
 }
 else
 {
-uint8_t x_91; 
+uint8_t x_123; 
 lean_dec(x_15);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -24040,68 +24097,127 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_91 = !lean_is_exclusive(x_17);
-if (x_91 == 0)
+x_123 = !lean_is_exclusive(x_17);
+if (x_123 == 0)
 {
 return x_17;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_17, 0);
-x_93 = lean_ctor_get(x_17, 1);
-lean_inc(x_93);
-lean_inc(x_92);
+lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+x_124 = lean_ctor_get(x_17, 0);
+x_125 = lean_ctor_get(x_17, 1);
+lean_inc(x_125);
+lean_inc(x_124);
 lean_dec(x_17);
-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_126 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_126, 0, x_124);
+lean_ctor_set(x_126, 1, x_125);
+return x_126;
 }
 }
 }
 else
 {
-lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; uint8_t x_134; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_95 = lean_ctor_get(x_4, 0);
-lean_inc(x_95);
-x_96 = l_Lean_Compiler_LCNF_Simp_addSubst(x_95, x_15, x_6, x_7, x_8, x_9, x_10, x_14);
-x_97 = lean_ctor_get(x_96, 1);
-lean_inc(x_97);
-lean_dec(x_96);
-x_98 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_97);
+x_127 = lean_ctor_get(x_4, 0);
+lean_inc(x_127);
+x_128 = l_Lean_Expr_fvarId_x21(x_15);
+x_129 = lean_st_ref_get(x_10, x_14);
+x_130 = lean_ctor_get(x_129, 1);
+lean_inc(x_130);
+lean_dec(x_129);
+x_131 = lean_st_ref_take(x_7, x_130);
+x_132 = lean_ctor_get(x_131, 0);
+lean_inc(x_132);
+x_133 = lean_ctor_get(x_131, 1);
+lean_inc(x_133);
+lean_dec(x_131);
+x_134 = !lean_is_exclusive(x_132);
+if (x_134 == 0)
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_135 = lean_ctor_get(x_132, 0);
+x_136 = l_Lean_Expr_fvar___override(x_128);
+x_137 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_135, x_127, x_136);
+lean_ctor_set(x_132, 0, x_137);
+x_138 = lean_st_ref_set(x_7, x_132, x_133);
+x_139 = lean_ctor_get(x_138, 1);
+lean_inc(x_139);
+lean_dec(x_138);
+x_140 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_139);
 lean_dec(x_4);
-x_99 = lean_ctor_get(x_98, 1);
-lean_inc(x_99);
-lean_dec(x_98);
-x_100 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_99);
-return x_100;
+x_141 = lean_ctor_get(x_140, 1);
+lean_inc(x_141);
+lean_dec(x_140);
+x_142 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_141);
+return x_142;
+}
+else
+{
+lean_object* x_143; lean_object* x_144; lean_object* x_145; uint8_t x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
+x_143 = lean_ctor_get(x_132, 0);
+x_144 = lean_ctor_get(x_132, 1);
+x_145 = lean_ctor_get(x_132, 2);
+x_146 = lean_ctor_get_uint8(x_132, sizeof(void*)*6);
+x_147 = lean_ctor_get(x_132, 3);
+x_148 = lean_ctor_get(x_132, 4);
+x_149 = lean_ctor_get(x_132, 5);
+lean_inc(x_149);
+lean_inc(x_148);
+lean_inc(x_147);
+lean_inc(x_145);
+lean_inc(x_144);
+lean_inc(x_143);
+lean_dec(x_132);
+x_150 = l_Lean_Expr_fvar___override(x_128);
+x_151 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_143, x_127, x_150);
+x_152 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_152, 0, x_151);
+lean_ctor_set(x_152, 1, x_144);
+lean_ctor_set(x_152, 2, x_145);
+lean_ctor_set(x_152, 3, x_147);
+lean_ctor_set(x_152, 4, x_148);
+lean_ctor_set(x_152, 5, x_149);
+lean_ctor_set_uint8(x_152, sizeof(void*)*6, x_146);
+x_153 = lean_st_ref_set(x_7, x_152, x_133);
+x_154 = lean_ctor_get(x_153, 1);
+lean_inc(x_154);
+lean_dec(x_153);
+x_155 = l_Lean_Compiler_LCNF_Simp_eraseLetDecl(x_4, x_6, x_7, x_8, x_9, x_10, x_154);
+lean_dec(x_4);
+x_156 = lean_ctor_get(x_155, 1);
+lean_inc(x_156);
+lean_dec(x_155);
+x_157 = l_Lean_Compiler_LCNF_Simp_simp(x_1, x_6, x_7, x_8, x_9, x_10, x_156);
+return x_157;
+}
 }
 }
 else
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_101 = lean_ctor_get(x_12, 1);
-lean_inc(x_101);
+x_158 = lean_ctor_get(x_12, 1);
+lean_inc(x_158);
 lean_dec(x_12);
-x_102 = lean_ctor_get(x_13, 0);
-lean_inc(x_102);
+x_159 = lean_ctor_get(x_13, 0);
+lean_inc(x_159);
 lean_dec(x_13);
-x_103 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_103, 0, x_102);
-lean_ctor_set(x_103, 1, x_1);
-x_104 = l_Lean_Compiler_LCNF_Simp_simp(x_103, x_6, x_7, x_8, x_9, x_10, x_101);
-return x_104;
+x_160 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_160, 0, x_159);
+lean_ctor_set(x_160, 1, x_1);
+x_161 = l_Lean_Compiler_LCNF_Simp_simp(x_160, x_6, x_7, x_8, x_9, x_10, x_158);
+return x_161;
 }
 }
 else
 {
-uint8_t x_105; 
+uint8_t x_162; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -24111,23 +24227,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_105 = !lean_is_exclusive(x_12);
-if (x_105 == 0)
+x_162 = !lean_is_exclusive(x_12);
+if (x_162 == 0)
 {
 return x_12;
 }
 else
 {
-lean_object* x_106; lean_object* x_107; lean_object* x_108; 
-x_106 = lean_ctor_get(x_12, 0);
-x_107 = lean_ctor_get(x_12, 1);
-lean_inc(x_107);
-lean_inc(x_106);
+lean_object* x_163; lean_object* x_164; lean_object* x_165; 
+x_163 = lean_ctor_get(x_12, 0);
+x_164 = lean_ctor_get(x_12, 1);
+lean_inc(x_164);
+lean_inc(x_163);
 lean_dec(x_12);
-x_108 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_108, 0, x_106);
-lean_ctor_set(x_108, 1, x_107);
-return x_108;
+x_165 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_165, 0, x_163);
+lean_ctor_set(x_165, 1, x_164);
+return x_165;
 }
 }
 }
@@ -24581,12 +24697,13 @@ return x_37;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; 
-x_9 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_2, x_1);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_10, 1, x_8);
-return x_10;
+uint8_t x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = 0;
+x_10 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_2, x_1, x_9);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_8);
+return x_11;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__8(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) {
@@ -24616,7 +24733,7 @@ x_12 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp), 7, 1);
 lean_closure_set(x_12, 0, x_11);
 x_13 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__8___boxed), 8, 1);
 lean_closure_set(x_13, 0, x_2);
-x_14 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
+x_14 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
 lean_closure_set(x_14, 0, x_12);
 lean_closure_set(x_14, 1, x_13);
 x_15 = l_Lean_Compiler_LCNF_Simp_withDiscrCtor___rarg(x_1, x_9, x_10, x_14, x_3, x_4, x_5, x_6, x_7, x_8);
@@ -24686,7 +24803,7 @@ return x_28;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simp___lambda__10(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+lean_object* x_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; 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; 
 x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
 x_12 = lean_st_ref_get(x_9, x_10);
@@ -24702,320 +24819,321 @@ lean_dec(x_14);
 x_17 = lean_ctor_get(x_15, 0);
 lean_inc(x_17);
 lean_dec(x_15);
+x_18 = 0;
 lean_inc(x_11);
-x_18 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_17, x_11);
+x_19 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_17, x_18, x_11);
 lean_inc(x_4);
-x_19 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_4, x_5, x_6, x_7, x_8, x_9, x_16);
-x_20 = lean_ctor_get(x_19, 1);
-lean_inc(x_20);
-lean_dec(x_19);
-x_21 = lean_ctor_get(x_1, 3);
+x_20 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_4, x_5, x_6, x_7, x_8, x_9, x_16);
+x_21 = lean_ctor_get(x_20, 1);
 lean_inc(x_21);
+lean_dec(x_20);
+x_22 = lean_ctor_get(x_1, 3);
+lean_inc(x_22);
 lean_inc(x_4);
-x_22 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
-lean_closure_set(x_22, 0, x_4);
+x_23 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
+lean_closure_set(x_23, 0, x_4);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-lean_inc(x_21);
-x_23 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_21, x_22, x_5, x_6, x_7, x_8, x_9, x_20);
-if (lean_obj_tag(x_23) == 0)
+lean_inc(x_22);
+x_24 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_22, x_23, x_5, x_6, x_7, x_8, x_9, x_21);
+if (lean_obj_tag(x_24) == 0)
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
-if (lean_is_exclusive(x_23)) {
- lean_ctor_release(x_23, 0);
- lean_ctor_release(x_23, 1);
- x_26 = x_23;
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
+if (lean_is_exclusive(x_24)) {
+ lean_ctor_release(x_24, 0);
+ lean_ctor_release(x_24, 1);
+ x_27 = x_24;
 } else {
- lean_dec_ref(x_23);
- x_26 = lean_box(0);
+ lean_dec_ref(x_24);
+ x_27 = lean_box(0);
 }
-x_27 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_24, x_5, x_6, x_7, x_8, x_9, x_25);
-if (lean_obj_tag(x_27) == 0)
+x_28 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_25, x_5, x_6, x_7, x_8, x_9, x_26);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_53; lean_object* x_54; lean_object* x_65; uint8_t x_66; 
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_27, 1);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_54; lean_object* x_55; lean_object* x_66; uint8_t x_67; 
+x_29 = lean_ctor_get(x_28, 0);
 lean_inc(x_29);
-if (lean_is_exclusive(x_27)) {
- lean_ctor_release(x_27, 0);
- lean_ctor_release(x_27, 1);
- x_30 = x_27;
+x_30 = lean_ctor_get(x_28, 1);
+lean_inc(x_30);
+if (lean_is_exclusive(x_28)) {
+ lean_ctor_release(x_28, 0);
+ lean_ctor_release(x_28, 1);
+ x_31 = x_28;
 } else {
- lean_dec_ref(x_27);
- x_30 = lean_box(0);
+ lean_dec_ref(x_28);
+ x_31 = lean_box(0);
 }
-x_53 = lean_array_get_size(x_28);
-x_65 = lean_unsigned_to_nat(1u);
-x_66 = lean_nat_dec_eq(x_53, x_65);
-if (x_66 == 0)
+x_54 = lean_array_get_size(x_29);
+x_66 = lean_unsigned_to_nat(1u);
+x_67 = lean_nat_dec_eq(x_54, x_66);
+if (x_67 == 0)
 {
-lean_object* x_67; 
-lean_dec(x_53);
-lean_dec(x_26);
-x_67 = lean_box(0);
-x_31 = x_67;
-goto block_52;
+lean_object* x_68; 
+lean_dec(x_54);
+lean_dec(x_27);
+x_68 = lean_box(0);
+x_32 = x_68;
+goto block_53;
 }
 else
 {
-lean_object* x_68; uint8_t x_69; 
-x_68 = lean_unsigned_to_nat(0u);
-x_69 = lean_nat_dec_lt(x_68, x_53);
-if (x_69 == 0)
+lean_object* x_69; uint8_t x_70; 
+x_69 = lean_unsigned_to_nat(0u);
+x_70 = lean_nat_dec_lt(x_69, x_54);
+if (x_70 == 0)
 {
-lean_object* x_70; lean_object* x_71; 
-x_70 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_71 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_70);
-if (lean_obj_tag(x_71) == 0)
-{
-lean_object* x_72; 
-lean_dec(x_71);
-lean_dec(x_53);
-lean_dec(x_26);
-x_72 = lean_box(0);
-x_31 = x_72;
-goto block_52;
-}
-else
+lean_object* x_71; lean_object* x_72; 
+x_71 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_72 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_71);
+if (lean_obj_tag(x_72) == 0)
 {
 lean_object* x_73; 
-lean_dec(x_71);
-lean_dec(x_30);
-lean_dec(x_21);
-lean_dec(x_18);
-lean_dec(x_11);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
+lean_dec(x_72);
+lean_dec(x_54);
+lean_dec(x_27);
 x_73 = lean_box(0);
-x_54 = x_73;
-goto block_64;
-}
+x_32 = x_73;
+goto block_53;
 }
 else
 {
 lean_object* x_74; 
-x_74 = lean_array_fget(x_28, x_68);
-if (lean_obj_tag(x_74) == 0)
+lean_dec(x_72);
+lean_dec(x_31);
+lean_dec(x_22);
+lean_dec(x_19);
+lean_dec(x_11);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_74 = lean_box(0);
+x_55 = x_74;
+goto block_65;
+}
+}
+else
 {
 lean_object* x_75; 
-lean_dec(x_74);
-lean_dec(x_53);
-lean_dec(x_26);
-x_75 = lean_box(0);
-x_31 = x_75;
-goto block_52;
-}
-else
+x_75 = lean_array_fget(x_29, x_69);
+if (lean_obj_tag(x_75) == 0)
 {
 lean_object* x_76; 
-lean_dec(x_74);
-lean_dec(x_30);
-lean_dec(x_21);
-lean_dec(x_18);
-lean_dec(x_11);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
+lean_dec(x_75);
+lean_dec(x_54);
+lean_dec(x_27);
 x_76 = lean_box(0);
-x_54 = x_76;
-goto block_64;
+x_32 = x_76;
+goto block_53;
 }
-}
-}
-block_52:
+else
 {
-size_t x_32; size_t x_33; uint8_t x_34; 
+lean_object* x_77; 
+lean_dec(x_75);
 lean_dec(x_31);
-x_32 = lean_ptr_addr(x_21);
-lean_dec(x_21);
-x_33 = lean_ptr_addr(x_28);
-x_34 = lean_usize_dec_eq(x_32, x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+lean_dec(x_22);
+lean_dec(x_19);
 lean_dec(x_11);
-lean_dec(x_3);
-x_35 = lean_ctor_get(x_1, 0);
-lean_inc(x_35);
-lean_dec(x_1);
-x_36 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_18);
-lean_ctor_set(x_36, 2, x_4);
-lean_ctor_set(x_36, 3, x_28);
-x_37 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_37, 0, x_36);
-if (lean_is_scalar(x_30)) {
- x_38 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_38 = x_30;
-}
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_29);
-return x_38;
-}
-else
-{
-size_t x_39; size_t x_40; uint8_t x_41; 
-x_39 = lean_ptr_addr(x_11);
-lean_dec(x_11);
-x_40 = lean_ptr_addr(x_18);
-x_41 = lean_usize_dec_eq(x_39, x_40);
-if (x_41 == 0)
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-lean_dec(x_3);
-x_42 = lean_ctor_get(x_1, 0);
-lean_inc(x_42);
-lean_dec(x_1);
-x_43 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_18);
-lean_ctor_set(x_43, 2, x_4);
-lean_ctor_set(x_43, 3, x_28);
-x_44 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-if (lean_is_scalar(x_30)) {
- x_45 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_45 = x_30;
-}
-lean_ctor_set(x_45, 0, x_44);
-lean_ctor_set(x_45, 1, x_29);
-return x_45;
-}
-else
-{
-uint8_t x_46; 
-x_46 = lean_name_eq(x_2, x_4);
-if (x_46 == 0)
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-lean_dec(x_3);
-x_47 = lean_ctor_get(x_1, 0);
-lean_inc(x_47);
-lean_dec(x_1);
-x_48 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_18);
-lean_ctor_set(x_48, 2, x_4);
-lean_ctor_set(x_48, 3, x_28);
-x_49 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-if (lean_is_scalar(x_30)) {
- x_50 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_50 = x_30;
-}
-lean_ctor_set(x_50, 0, x_49);
-lean_ctor_set(x_50, 1, x_29);
-return x_50;
-}
-else
-{
-lean_object* x_51; 
-lean_dec(x_28);
-lean_dec(x_18);
 lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_1);
-if (lean_is_scalar(x_30)) {
+x_77 = lean_box(0);
+x_55 = x_77;
+goto block_65;
+}
+}
+}
+block_53:
+{
+size_t x_33; size_t x_34; uint8_t x_35; 
+lean_dec(x_32);
+x_33 = lean_ptr_addr(x_22);
+lean_dec(x_22);
+x_34 = lean_ptr_addr(x_29);
+x_35 = lean_usize_dec_eq(x_33, x_34);
+if (x_35 == 0)
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+lean_dec(x_11);
+lean_dec(x_3);
+x_36 = lean_ctor_get(x_1, 0);
+lean_inc(x_36);
+lean_dec(x_1);
+x_37 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_19);
+lean_ctor_set(x_37, 2, x_4);
+lean_ctor_set(x_37, 3, x_29);
+x_38 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_38, 0, x_37);
+if (lean_is_scalar(x_31)) {
+ x_39 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_39 = x_31;
+}
+lean_ctor_set(x_39, 0, x_38);
+lean_ctor_set(x_39, 1, x_30);
+return x_39;
+}
+else
+{
+size_t x_40; size_t x_41; uint8_t x_42; 
+x_40 = lean_ptr_addr(x_11);
+lean_dec(x_11);
+x_41 = lean_ptr_addr(x_19);
+x_42 = lean_usize_dec_eq(x_40, x_41);
+if (x_42 == 0)
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+lean_dec(x_3);
+x_43 = lean_ctor_get(x_1, 0);
+lean_inc(x_43);
+lean_dec(x_1);
+x_44 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_44, 0, x_43);
+lean_ctor_set(x_44, 1, x_19);
+lean_ctor_set(x_44, 2, x_4);
+lean_ctor_set(x_44, 3, x_29);
+x_45 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_45, 0, x_44);
+if (lean_is_scalar(x_31)) {
+ x_46 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_46 = x_31;
+}
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_30);
+return x_46;
+}
+else
+{
+uint8_t x_47; 
+x_47 = lean_name_eq(x_2, x_4);
+if (x_47 == 0)
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_dec(x_3);
+x_48 = lean_ctor_get(x_1, 0);
+lean_inc(x_48);
+lean_dec(x_1);
+x_49 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_19);
+lean_ctor_set(x_49, 2, x_4);
+lean_ctor_set(x_49, 3, x_29);
+x_50 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_50, 0, x_49);
+if (lean_is_scalar(x_31)) {
  x_51 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_51 = x_30;
+ x_51 = x_31;
 }
-lean_ctor_set(x_51, 0, x_3);
-lean_ctor_set(x_51, 1, x_29);
+lean_ctor_set(x_51, 0, x_50);
+lean_ctor_set(x_51, 1, x_30);
 return x_51;
 }
-}
-}
-}
-block_64:
+else
 {
-lean_object* x_55; uint8_t x_56; 
+lean_object* x_52; 
+lean_dec(x_29);
+lean_dec(x_19);
+lean_dec(x_4);
+lean_dec(x_1);
+if (lean_is_scalar(x_31)) {
+ x_52 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_52 = x_31;
+}
+lean_ctor_set(x_52, 0, x_3);
+lean_ctor_set(x_52, 1, x_30);
+return x_52;
+}
+}
+}
+}
+block_65:
+{
+lean_object* x_56; uint8_t x_57; 
+lean_dec(x_55);
+x_56 = lean_unsigned_to_nat(0u);
+x_57 = lean_nat_dec_lt(x_56, x_54);
 lean_dec(x_54);
-x_55 = lean_unsigned_to_nat(0u);
-x_56 = lean_nat_dec_lt(x_55, x_53);
-lean_dec(x_53);
-if (x_56 == 0)
+if (x_57 == 0)
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-lean_dec(x_28);
-x_57 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_58 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_57);
-x_59 = l_Lean_Compiler_LCNF_AltCore_getCode(x_58);
-lean_dec(x_58);
-if (lean_is_scalar(x_26)) {
- x_60 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+lean_dec(x_29);
+x_58 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_59 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_58);
+x_60 = l_Lean_Compiler_LCNF_AltCore_getCode(x_59);
+lean_dec(x_59);
+if (lean_is_scalar(x_27)) {
+ x_61 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_60 = x_26;
+ x_61 = x_27;
 }
-lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_29);
-return x_60;
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_30);
+return x_61;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_array_fget(x_28, x_55);
-lean_dec(x_28);
-x_62 = l_Lean_Compiler_LCNF_AltCore_getCode(x_61);
-lean_dec(x_61);
-if (lean_is_scalar(x_26)) {
- x_63 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_array_fget(x_29, x_56);
+lean_dec(x_29);
+x_63 = l_Lean_Compiler_LCNF_AltCore_getCode(x_62);
+lean_dec(x_62);
+if (lean_is_scalar(x_27)) {
+ x_64 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_63 = x_26;
+ x_64 = x_27;
 }
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_29);
-return x_63;
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_30);
+return x_64;
 }
 }
 }
 else
 {
-uint8_t x_77; 
-lean_dec(x_26);
-lean_dec(x_21);
-lean_dec(x_18);
+uint8_t x_78; 
+lean_dec(x_27);
+lean_dec(x_22);
+lean_dec(x_19);
 lean_dec(x_11);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_77 = !lean_is_exclusive(x_27);
-if (x_77 == 0)
+x_78 = !lean_is_exclusive(x_28);
+if (x_78 == 0)
 {
-return x_27;
+return x_28;
 }
 else
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_27, 0);
-x_79 = lean_ctor_get(x_27, 1);
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_28, 0);
+x_80 = lean_ctor_get(x_28, 1);
+lean_inc(x_80);
 lean_inc(x_79);
-lean_inc(x_78);
-lean_dec(x_27);
-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_28);
+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
 {
-uint8_t x_81; 
-lean_dec(x_21);
-lean_dec(x_18);
+uint8_t x_82; 
+lean_dec(x_22);
+lean_dec(x_19);
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -25025,23 +25143,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_81 = !lean_is_exclusive(x_23);
-if (x_81 == 0)
+x_82 = !lean_is_exclusive(x_24);
+if (x_82 == 0)
 {
-return x_23;
+return x_24;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_23, 0);
-x_83 = lean_ctor_get(x_23, 1);
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_24, 0);
+x_84 = lean_ctor_get(x_24, 1);
+lean_inc(x_84);
 lean_inc(x_83);
-lean_inc(x_82);
-lean_dec(x_23);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
+lean_dec(x_24);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_83);
+lean_ctor_set(x_85, 1, x_84);
+return x_85;
 }
 }
 }
@@ -25050,9 +25168,9 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Simp_simp___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1;
-x_2 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2;
-x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
+x_1 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1;
+x_2 = l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2;
+x_3 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
 lean_closure_set(x_3, 0, x_1);
 lean_closure_set(x_3, 1, x_2);
 return x_3;
@@ -25122,7 +25240,7 @@ x_34 = l_Lean_Compiler_LCNF_Simp_incVisited___rarg(x_3, x_4, x_5, x_6, x_7);
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t 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; 
 x_35 = lean_ctor_get(x_34, 1);
 lean_inc(x_35);
 lean_dec(x_34);
@@ -25130,438 +25248,413 @@ x_36 = lean_ctor_get(x_1, 0);
 lean_inc(x_36);
 x_37 = lean_ctor_get(x_1, 1);
 lean_inc(x_37);
+x_38 = 0;
 lean_inc(x_36);
-x_38 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_36, x_2, x_3, x_4, x_5, x_6, x_35);
-x_39 = lean_ctor_get(x_38, 0);
-lean_inc(x_39);
-x_40 = lean_ctor_get(x_38, 1);
+x_39 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_38, x_36, x_2, x_3, x_4, x_5, x_6, x_35);
+x_40 = lean_ctor_get(x_39, 0);
 lean_inc(x_40);
-lean_dec(x_38);
-x_41 = lean_ctor_get(x_39, 3);
+x_41 = lean_ctor_get(x_39, 1);
 lean_inc(x_41);
-x_42 = l_Lean_Compiler_LCNF_Simp_simpValue_x3f(x_41, x_2, x_3, x_4, x_5, x_6, x_40);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-if (lean_obj_tag(x_43) == 0)
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_42, 1);
+lean_dec(x_39);
+x_42 = lean_ctor_get(x_40, 3);
+lean_inc(x_42);
+x_43 = l_Lean_Compiler_LCNF_Simp_simpValue_x3f(x_42, x_2, x_3, x_4, x_5, x_6, x_41);
+x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
-lean_dec(x_42);
-x_45 = lean_box(0);
-x_46 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_37, x_36, x_1, x_39, x_45, x_2, x_3, x_4, x_5, x_6, x_44);
-return x_46;
+if (lean_obj_tag(x_44) == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
+x_46 = lean_box(0);
+x_47 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_37, x_36, x_1, x_40, x_46, x_2, x_3, x_4, x_5, x_6, x_45);
+return x_47;
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_47 = lean_ctor_get(x_42, 1);
-lean_inc(x_47);
-lean_dec(x_42);
-x_48 = lean_ctor_get(x_43, 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; 
+x_48 = lean_ctor_get(x_43, 1);
 lean_inc(x_48);
 lean_dec(x_43);
-x_49 = l_Lean_Compiler_LCNF_LetDecl_updateValue(x_39, x_48, x_4, x_5, x_6, x_47);
-x_50 = lean_ctor_get(x_49, 0);
-lean_inc(x_50);
-x_51 = lean_ctor_get(x_49, 1);
+x_49 = lean_ctor_get(x_44, 0);
+lean_inc(x_49);
+lean_dec(x_44);
+x_50 = l_Lean_Compiler_LCNF_LetDecl_updateValue(x_40, x_49, x_4, x_5, x_6, x_48);
+x_51 = lean_ctor_get(x_50, 0);
 lean_inc(x_51);
-lean_dec(x_49);
-x_52 = lean_box(0);
-x_53 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_37, x_36, x_1, x_50, x_52, x_2, x_3, x_4, x_5, x_6, x_51);
-return x_53;
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+lean_dec(x_50);
+x_53 = lean_box(0);
+x_54 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_37, x_36, x_1, x_51, x_53, x_2, x_3, x_4, x_5, x_6, x_52);
+return x_54;
 }
 }
 case 1:
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; 
-x_54 = lean_ctor_get(x_34, 1);
-lean_inc(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; uint8_t x_61; 
+x_55 = lean_ctor_get(x_34, 1);
+lean_inc(x_55);
 lean_dec(x_34);
-x_55 = lean_ctor_get(x_1, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_1, 1);
+x_56 = lean_ctor_get(x_1, 0);
 lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 0);
+x_57 = lean_ctor_get(x_1, 1);
 lean_inc(x_57);
-x_58 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_57, x_2, x_3, x_4, x_5, x_6, x_54);
-x_59 = lean_ctor_get(x_58, 0);
-lean_inc(x_59);
-x_60 = lean_unbox(x_59);
-if (x_60 == 0)
+x_58 = lean_ctor_get(x_56, 0);
+lean_inc(x_58);
+x_59 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_58, x_2, x_3, x_4, x_5, x_6, x_55);
+x_60 = lean_ctor_get(x_59, 0);
+lean_inc(x_60);
+x_61 = lean_unbox(x_60);
+if (x_61 == 0)
 {
-lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-x_61 = lean_ctor_get(x_58, 1);
-lean_inc(x_61);
-lean_dec(x_58);
+lean_object* x_62; lean_object* x_63; uint8_t x_64; 
+x_62 = lean_ctor_get(x_59, 1);
+lean_inc(x_62);
+lean_dec(x_59);
 lean_inc(x_1);
-lean_inc(x_55);
-x_62 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__3___boxed), 12, 4);
-lean_closure_set(x_62, 0, x_56);
-lean_closure_set(x_62, 1, x_55);
-lean_closure_set(x_62, 2, x_1);
-lean_closure_set(x_62, 3, x_59);
-x_63 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
+lean_inc(x_56);
+x_63 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__3___boxed), 12, 4);
+lean_closure_set(x_63, 0, x_57);
+lean_closure_set(x_63, 1, x_56);
+lean_closure_set(x_63, 2, x_1);
+lean_closure_set(x_63, 3, x_60);
+x_64 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
 lean_dec(x_1);
-if (x_63 == 0)
+if (x_64 == 0)
 {
-lean_object* x_64; lean_object* x_65; 
-x_64 = lean_box(0);
-x_65 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_62, x_55, x_64, x_2, x_3, x_4, x_5, x_6, x_61);
-return x_65;
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_box(0);
+x_66 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_63, x_56, x_65, x_2, x_3, x_4, x_5, x_6, x_62);
+return x_66;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; uint8_t x_68; 
-x_66 = lean_ctor_get(x_55, 3);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_55, 2);
+lean_object* x_67; lean_object* x_68; uint8_t x_69; 
+x_67 = lean_ctor_get(x_56, 3);
 lean_inc(x_67);
-x_68 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_66, x_67);
-lean_dec(x_67);
-if (x_68 == 0)
+x_68 = lean_ctor_get(x_56, 2);
+lean_inc(x_68);
+x_69 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_67, x_68);
+lean_dec(x_68);
+if (x_69 == 0)
 {
-lean_object* x_69; lean_object* x_70; 
-x_69 = lean_box(0);
-x_70 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_62, x_55, x_69, x_2, x_3, x_4, x_5, x_6, x_61);
-return x_70;
+lean_object* x_70; lean_object* x_71; 
+x_70 = lean_box(0);
+x_71 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_63, x_56, x_70, x_2, x_3, x_4, x_5, x_6, x_62);
+return x_71;
 }
 else
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_71 = lean_st_ref_get(x_6, x_61);
-x_72 = lean_ctor_get(x_71, 1);
-lean_inc(x_72);
-lean_dec(x_71);
-x_73 = lean_st_ref_get(x_3, x_72);
-x_74 = lean_ctor_get(x_73, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
+lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; lean_object* x_79; 
+x_72 = lean_st_ref_get(x_6, x_62);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
+x_74 = lean_st_ref_get(x_3, x_73);
+x_75 = lean_ctor_get(x_74, 0);
 lean_inc(x_75);
-lean_dec(x_73);
-x_76 = lean_ctor_get(x_74, 0);
+x_76 = lean_ctor_get(x_74, 1);
 lean_inc(x_76);
 lean_dec(x_74);
+x_77 = lean_ctor_get(x_75, 0);
+lean_inc(x_77);
+lean_dec(x_75);
+x_78 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_77 = l_Lean_Compiler_LCNF_normFunDeclImp(x_55, x_76, x_4, x_5, x_6, x_75);
-if (lean_obj_tag(x_77) == 0)
+x_79 = l_Lean_Compiler_LCNF_normFunDeclImp(x_78, x_56, x_77, x_4, x_5, x_6, x_76);
+if (lean_obj_tag(x_79) == 0)
 {
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_77, 0);
-lean_inc(x_78);
-x_79 = lean_ctor_get(x_77, 1);
-lean_inc(x_79);
-lean_dec(x_77);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_80 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_78, x_4, x_5, x_6, x_79);
-if (lean_obj_tag(x_80) == 0)
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_81 = lean_ctor_get(x_80, 0);
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
 lean_inc(x_81);
-x_82 = lean_ctor_get(x_80, 1);
-lean_inc(x_82);
-lean_dec(x_80);
-x_83 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_82);
-x_84 = lean_ctor_get(x_83, 0);
-lean_inc(x_84);
-x_85 = lean_ctor_get(x_83, 1);
-lean_inc(x_85);
-lean_dec(x_83);
-x_86 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_62, x_81, x_84, x_2, x_3, x_4, x_5, x_6, x_85);
-lean_dec(x_84);
-return x_86;
-}
-else
-{
-uint8_t x_87; 
-lean_dec(x_62);
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_87 = !lean_is_exclusive(x_80);
-if (x_87 == 0)
-{
-return x_80;
-}
-else
-{
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_88 = lean_ctor_get(x_80, 0);
-x_89 = lean_ctor_get(x_80, 1);
-lean_inc(x_89);
-lean_inc(x_88);
-lean_dec(x_80);
-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;
-}
-}
-}
-else
-{
-uint8_t x_91; 
-lean_dec(x_62);
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_91 = !lean_is_exclusive(x_77);
-if (x_91 == 0)
-{
-return x_77;
-}
-else
-{
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_77, 0);
-x_93 = lean_ctor_get(x_77, 1);
-lean_inc(x_93);
-lean_inc(x_92);
-lean_dec(x_77);
-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;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
-x_95 = lean_ctor_get(x_58, 1);
-lean_inc(x_95);
-lean_dec(x_58);
-x_96 = lean_st_ref_get(x_6, x_95);
-x_97 = lean_ctor_get(x_96, 1);
-lean_inc(x_97);
-lean_dec(x_96);
-x_98 = lean_st_ref_get(x_3, x_97);
-x_99 = lean_ctor_get(x_98, 0);
-lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
-lean_inc(x_100);
-lean_dec(x_98);
-x_101 = lean_ctor_get(x_99, 0);
-lean_inc(x_101);
-lean_dec(x_99);
+lean_dec(x_79);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-lean_inc(x_55);
-x_102 = l_Lean_Compiler_LCNF_normFunDeclImp(x_55, x_101, x_4, x_5, x_6, x_100);
-if (lean_obj_tag(x_102) == 0)
+x_82 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_80, x_4, x_5, x_6, x_81);
+if (lean_obj_tag(x_82) == 0)
 {
-lean_object* x_103; lean_object* x_104; lean_object* x_105; uint8_t x_106; lean_object* x_107; 
-x_103 = lean_ctor_get(x_102, 0);
-lean_inc(x_103);
-x_104 = lean_ctor_get(x_102, 1);
-lean_inc(x_104);
-lean_dec(x_102);
-x_105 = lean_box(0);
-x_106 = lean_unbox(x_59);
-lean_dec(x_59);
-x_107 = l_Lean_Compiler_LCNF_Simp_simp___lambda__3(x_56, x_55, x_1, x_106, x_103, x_105, x_2, x_3, x_4, x_5, x_6, x_104);
-return x_107;
+lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+lean_dec(x_82);
+x_85 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_84);
+x_86 = lean_ctor_get(x_85, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_85, 1);
+lean_inc(x_87);
+lean_dec(x_85);
+x_88 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_63, x_83, x_86, x_2, x_3, x_4, x_5, x_6, x_87);
+lean_dec(x_86);
+return x_88;
 }
 else
 {
-uint8_t x_108; 
+uint8_t x_89; 
+lean_dec(x_63);
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_89 = !lean_is_exclusive(x_82);
+if (x_89 == 0)
+{
+return x_82;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_82, 0);
+x_91 = lean_ctor_get(x_82, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_82);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
+}
+}
+}
+else
+{
+uint8_t x_93; 
+lean_dec(x_63);
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_93 = !lean_is_exclusive(x_79);
+if (x_93 == 0)
+{
+return x_79;
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_79, 0);
+x_95 = lean_ctor_get(x_79, 1);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_dec(x_79);
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+return x_96;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; uint8_t x_104; lean_object* x_105; 
+x_97 = lean_ctor_get(x_59, 1);
+lean_inc(x_97);
 lean_dec(x_59);
+x_98 = lean_st_ref_get(x_6, x_97);
+x_99 = lean_ctor_get(x_98, 1);
+lean_inc(x_99);
+lean_dec(x_98);
+x_100 = lean_st_ref_get(x_3, x_99);
+x_101 = lean_ctor_get(x_100, 0);
+lean_inc(x_101);
+x_102 = lean_ctor_get(x_100, 1);
+lean_inc(x_102);
+lean_dec(x_100);
+x_103 = lean_ctor_get(x_101, 0);
+lean_inc(x_103);
+lean_dec(x_101);
+x_104 = 0;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_56);
+x_105 = l_Lean_Compiler_LCNF_normFunDeclImp(x_104, x_56, x_103, x_4, x_5, x_6, x_102);
+if (lean_obj_tag(x_105) == 0)
+{
+lean_object* x_106; lean_object* x_107; lean_object* x_108; uint8_t x_109; lean_object* x_110; 
+x_106 = lean_ctor_get(x_105, 0);
+lean_inc(x_106);
+x_107 = lean_ctor_get(x_105, 1);
+lean_inc(x_107);
+lean_dec(x_105);
+x_108 = lean_box(0);
+x_109 = lean_unbox(x_60);
+lean_dec(x_60);
+x_110 = l_Lean_Compiler_LCNF_Simp_simp___lambda__3(x_57, x_56, x_1, x_109, x_106, x_108, x_2, x_3, x_4, x_5, x_6, x_107);
+return x_110;
+}
+else
+{
+uint8_t x_111; 
+lean_dec(x_60);
+lean_dec(x_57);
 lean_dec(x_56);
-lean_dec(x_55);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_108 = !lean_is_exclusive(x_102);
-if (x_108 == 0)
+x_111 = !lean_is_exclusive(x_105);
+if (x_111 == 0)
 {
-return x_102;
+return x_105;
 }
 else
 {
-lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_109 = lean_ctor_get(x_102, 0);
-x_110 = lean_ctor_get(x_102, 1);
-lean_inc(x_110);
-lean_inc(x_109);
-lean_dec(x_102);
-x_111 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_111, 0, x_109);
-lean_ctor_set(x_111, 1, x_110);
-return x_111;
+lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+x_112 = lean_ctor_get(x_105, 0);
+x_113 = lean_ctor_get(x_105, 1);
+lean_inc(x_113);
+lean_inc(x_112);
+lean_dec(x_105);
+x_114 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_114, 0, x_112);
+lean_ctor_set(x_114, 1, x_113);
+return x_114;
 }
 }
 }
 }
 case 2:
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; uint8_t x_118; 
-x_112 = lean_ctor_get(x_34, 1);
-lean_inc(x_112);
-lean_dec(x_34);
-x_113 = lean_ctor_get(x_1, 0);
-lean_inc(x_113);
-x_114 = lean_ctor_get(x_1, 1);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_113, 0);
+lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; uint8_t x_121; 
+x_115 = lean_ctor_get(x_34, 1);
 lean_inc(x_115);
-x_116 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_115, x_2, x_3, x_4, x_5, x_6, x_112);
-x_117 = lean_ctor_get(x_116, 0);
+lean_dec(x_34);
+x_116 = lean_ctor_get(x_1, 0);
+lean_inc(x_116);
+x_117 = lean_ctor_get(x_1, 1);
 lean_inc(x_117);
-x_118 = lean_unbox(x_117);
-if (x_118 == 0)
-{
-lean_object* x_119; lean_object* x_120; uint8_t x_121; 
-x_119 = lean_ctor_get(x_116, 1);
-lean_inc(x_119);
-lean_dec(x_116);
-lean_inc(x_1);
-lean_inc(x_113);
-x_120 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__6___boxed), 12, 4);
-lean_closure_set(x_120, 0, x_114);
-lean_closure_set(x_120, 1, x_113);
-lean_closure_set(x_120, 2, x_1);
-lean_closure_set(x_120, 3, x_117);
-x_121 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
-lean_dec(x_1);
+x_118 = lean_ctor_get(x_116, 0);
+lean_inc(x_118);
+x_119 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_118, x_2, x_3, x_4, x_5, x_6, x_115);
+x_120 = lean_ctor_get(x_119, 0);
+lean_inc(x_120);
+x_121 = lean_unbox(x_120);
 if (x_121 == 0)
 {
-lean_object* x_122; lean_object* x_123; 
-x_122 = lean_box(0);
-x_123 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_120, x_113, x_122, x_2, x_3, x_4, x_5, x_6, x_119);
-return x_123;
+lean_object* x_122; lean_object* x_123; uint8_t x_124; 
+x_122 = lean_ctor_get(x_119, 1);
+lean_inc(x_122);
+lean_dec(x_119);
+lean_inc(x_1);
+lean_inc(x_116);
+x_123 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__6___boxed), 12, 4);
+lean_closure_set(x_123, 0, x_117);
+lean_closure_set(x_123, 1, x_116);
+lean_closure_set(x_123, 2, x_1);
+lean_closure_set(x_123, 3, x_120);
+x_124 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
+lean_dec(x_1);
+if (x_124 == 0)
+{
+lean_object* x_125; lean_object* x_126; 
+x_125 = lean_box(0);
+x_126 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_123, x_116, x_125, x_2, x_3, x_4, x_5, x_6, x_122);
+return x_126;
 }
 else
 {
-lean_object* x_124; lean_object* x_125; uint8_t x_126; 
-x_124 = lean_ctor_get(x_113, 3);
-lean_inc(x_124);
-x_125 = lean_ctor_get(x_113, 2);
-lean_inc(x_125);
-x_126 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_124, x_125);
-lean_dec(x_125);
-if (x_126 == 0)
+lean_object* x_127; lean_object* x_128; uint8_t x_129; 
+x_127 = lean_ctor_get(x_116, 3);
+lean_inc(x_127);
+x_128 = lean_ctor_get(x_116, 2);
+lean_inc(x_128);
+x_129 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_127, x_128);
+lean_dec(x_128);
+if (x_129 == 0)
 {
-lean_object* x_127; lean_object* x_128; 
-x_127 = lean_box(0);
-x_128 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_120, x_113, x_127, x_2, x_3, x_4, x_5, x_6, x_119);
-return x_128;
+lean_object* x_130; lean_object* x_131; 
+x_130 = lean_box(0);
+x_131 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_123, x_116, x_130, x_2, x_3, x_4, x_5, x_6, x_122);
+return x_131;
 }
 else
 {
-lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
-x_129 = lean_st_ref_get(x_6, x_119);
-x_130 = lean_ctor_get(x_129, 1);
-lean_inc(x_130);
-lean_dec(x_129);
-x_131 = lean_st_ref_get(x_3, x_130);
-x_132 = lean_ctor_get(x_131, 0);
-lean_inc(x_132);
-x_133 = lean_ctor_get(x_131, 1);
+lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; uint8_t x_138; lean_object* x_139; 
+x_132 = lean_st_ref_get(x_6, x_122);
+x_133 = lean_ctor_get(x_132, 1);
 lean_inc(x_133);
-lean_dec(x_131);
-x_134 = lean_ctor_get(x_132, 0);
-lean_inc(x_134);
 lean_dec(x_132);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-x_135 = l_Lean_Compiler_LCNF_normFunDeclImp(x_113, x_134, x_4, x_5, x_6, x_133);
-if (lean_obj_tag(x_135) == 0)
-{
-lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-x_136 = lean_ctor_get(x_135, 0);
+x_134 = lean_st_ref_get(x_3, x_133);
+x_135 = lean_ctor_get(x_134, 0);
+lean_inc(x_135);
+x_136 = lean_ctor_get(x_134, 1);
 lean_inc(x_136);
-x_137 = lean_ctor_get(x_135, 1);
+lean_dec(x_134);
+x_137 = lean_ctor_get(x_135, 0);
 lean_inc(x_137);
 lean_dec(x_135);
+x_138 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_138 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_136, x_4, x_5, x_6, x_137);
-if (lean_obj_tag(x_138) == 0)
+x_139 = l_Lean_Compiler_LCNF_normFunDeclImp(x_138, x_116, x_137, x_4, x_5, x_6, x_136);
+if (lean_obj_tag(x_139) == 0)
 {
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_139 = lean_ctor_get(x_138, 0);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_138, 1);
+lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_140 = lean_ctor_get(x_139, 0);
 lean_inc(x_140);
-lean_dec(x_138);
-x_141 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_140);
-x_142 = lean_ctor_get(x_141, 0);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_141, 1);
+x_141 = lean_ctor_get(x_139, 1);
+lean_inc(x_141);
+lean_dec(x_139);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_142 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_140, x_4, x_5, x_6, x_141);
+if (lean_obj_tag(x_142) == 0)
+{
+lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
+x_143 = lean_ctor_get(x_142, 0);
 lean_inc(x_143);
-lean_dec(x_141);
-x_144 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_120, x_139, x_142, x_2, x_3, x_4, x_5, x_6, x_143);
+x_144 = lean_ctor_get(x_142, 1);
+lean_inc(x_144);
 lean_dec(x_142);
-return x_144;
-}
-else
-{
-uint8_t x_145; 
-lean_dec(x_120);
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_145 = !lean_is_exclusive(x_138);
-if (x_145 == 0)
-{
-return x_138;
-}
-else
-{
-lean_object* x_146; lean_object* x_147; lean_object* x_148; 
-x_146 = lean_ctor_get(x_138, 0);
-x_147 = lean_ctor_get(x_138, 1);
-lean_inc(x_147);
+x_145 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_144);
+x_146 = lean_ctor_get(x_145, 0);
 lean_inc(x_146);
-lean_dec(x_138);
-x_148 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_148, 0, x_146);
-lean_ctor_set(x_148, 1, x_147);
+x_147 = lean_ctor_get(x_145, 1);
+lean_inc(x_147);
+lean_dec(x_145);
+x_148 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_123, x_143, x_146, x_2, x_3, x_4, x_5, x_6, x_147);
+lean_dec(x_146);
 return x_148;
 }
-}
-}
 else
 {
 uint8_t x_149; 
-lean_dec(x_120);
+lean_dec(x_123);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_149 = !lean_is_exclusive(x_135);
+x_149 = !lean_is_exclusive(x_142);
 if (x_149 == 0)
 {
-return x_135;
+return x_142;
 }
 else
 {
 lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-x_150 = lean_ctor_get(x_135, 0);
-x_151 = lean_ctor_get(x_135, 1);
+x_150 = lean_ctor_get(x_142, 0);
+x_151 = lean_ctor_get(x_142, 1);
 lean_inc(x_151);
 lean_inc(x_150);
-lean_dec(x_135);
+lean_dec(x_142);
 x_152 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_152, 0, x_150);
 lean_ctor_set(x_152, 1, x_151);
@@ -25569,985 +25662,963 @@ return x_152;
 }
 }
 }
+else
+{
+uint8_t x_153; 
+lean_dec(x_123);
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_153 = !lean_is_exclusive(x_139);
+if (x_153 == 0)
+{
+return x_139;
+}
+else
+{
+lean_object* x_154; lean_object* x_155; lean_object* x_156; 
+x_154 = lean_ctor_get(x_139, 0);
+x_155 = lean_ctor_get(x_139, 1);
+lean_inc(x_155);
+lean_inc(x_154);
+lean_dec(x_139);
+x_156 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_156, 0, x_154);
+lean_ctor_set(x_156, 1, x_155);
+return x_156;
+}
+}
+}
 }
 }
 else
 {
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
-x_153 = lean_ctor_get(x_116, 1);
-lean_inc(x_153);
-lean_dec(x_116);
-x_154 = lean_st_ref_get(x_6, x_153);
-x_155 = lean_ctor_get(x_154, 1);
-lean_inc(x_155);
-lean_dec(x_154);
-x_156 = lean_st_ref_get(x_3, x_155);
-x_157 = lean_ctor_get(x_156, 0);
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; lean_object* x_165; 
+x_157 = lean_ctor_get(x_119, 1);
 lean_inc(x_157);
-x_158 = lean_ctor_get(x_156, 1);
-lean_inc(x_158);
-lean_dec(x_156);
-x_159 = lean_ctor_get(x_157, 0);
+lean_dec(x_119);
+x_158 = lean_st_ref_get(x_6, x_157);
+x_159 = lean_ctor_get(x_158, 1);
 lean_inc(x_159);
-lean_dec(x_157);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_113);
-x_160 = l_Lean_Compiler_LCNF_normFunDeclImp(x_113, x_159, x_4, x_5, x_6, x_158);
-if (lean_obj_tag(x_160) == 0)
-{
-lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; lean_object* x_165; 
+lean_dec(x_158);
+x_160 = lean_st_ref_get(x_3, x_159);
 x_161 = lean_ctor_get(x_160, 0);
 lean_inc(x_161);
 x_162 = lean_ctor_get(x_160, 1);
 lean_inc(x_162);
 lean_dec(x_160);
-x_163 = lean_box(0);
-x_164 = lean_unbox(x_117);
-lean_dec(x_117);
-x_165 = l_Lean_Compiler_LCNF_Simp_simp___lambda__6(x_114, x_113, x_1, x_164, x_161, x_163, x_2, x_3, x_4, x_5, x_6, x_162);
-return x_165;
+x_163 = lean_ctor_get(x_161, 0);
+lean_inc(x_163);
+lean_dec(x_161);
+x_164 = 0;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_116);
+x_165 = l_Lean_Compiler_LCNF_normFunDeclImp(x_164, x_116, x_163, x_4, x_5, x_6, x_162);
+if (lean_obj_tag(x_165) == 0)
+{
+lean_object* x_166; lean_object* x_167; lean_object* x_168; uint8_t x_169; lean_object* x_170; 
+x_166 = lean_ctor_get(x_165, 0);
+lean_inc(x_166);
+x_167 = lean_ctor_get(x_165, 1);
+lean_inc(x_167);
+lean_dec(x_165);
+x_168 = lean_box(0);
+x_169 = lean_unbox(x_120);
+lean_dec(x_120);
+x_170 = l_Lean_Compiler_LCNF_Simp_simp___lambda__6(x_117, x_116, x_1, x_169, x_166, x_168, x_2, x_3, x_4, x_5, x_6, x_167);
+return x_170;
 }
 else
 {
-uint8_t x_166; 
+uint8_t x_171; 
+lean_dec(x_120);
 lean_dec(x_117);
-lean_dec(x_114);
-lean_dec(x_113);
+lean_dec(x_116);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_166 = !lean_is_exclusive(x_160);
-if (x_166 == 0)
+x_171 = !lean_is_exclusive(x_165);
+if (x_171 == 0)
 {
-return x_160;
+return x_165;
 }
 else
 {
-lean_object* x_167; lean_object* x_168; lean_object* x_169; 
-x_167 = lean_ctor_get(x_160, 0);
-x_168 = lean_ctor_get(x_160, 1);
-lean_inc(x_168);
-lean_inc(x_167);
-lean_dec(x_160);
-x_169 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_169, 0, x_167);
-lean_ctor_set(x_169, 1, x_168);
-return x_169;
+lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_172 = lean_ctor_get(x_165, 0);
+x_173 = lean_ctor_get(x_165, 1);
+lean_inc(x_173);
+lean_inc(x_172);
+lean_dec(x_165);
+x_174 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_174, 0, x_172);
+lean_ctor_set(x_174, 1, x_173);
+return x_174;
 }
 }
 }
 }
 case 3:
 {
-lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_170 = lean_ctor_get(x_34, 1);
-lean_inc(x_170);
+lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; uint8_t x_184; lean_object* x_185; lean_object* x_186; 
+x_175 = lean_ctor_get(x_34, 1);
+lean_inc(x_175);
 lean_dec(x_34);
-x_171 = lean_ctor_get(x_1, 0);
-lean_inc(x_171);
-x_172 = lean_ctor_get(x_1, 1);
-lean_inc(x_172);
-x_173 = lean_st_ref_get(x_6, x_170);
-x_174 = lean_ctor_get(x_173, 1);
-lean_inc(x_174);
-lean_dec(x_173);
-x_175 = lean_st_ref_get(x_3, x_174);
-x_176 = lean_ctor_get(x_175, 0);
+x_176 = lean_ctor_get(x_1, 0);
 lean_inc(x_176);
-x_177 = lean_ctor_get(x_175, 1);
+x_177 = lean_ctor_get(x_1, 1);
 lean_inc(x_177);
-lean_dec(x_175);
-x_178 = lean_ctor_get(x_176, 0);
-lean_inc(x_178);
-lean_dec(x_176);
-lean_inc(x_171);
-x_179 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_178, x_171);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_172);
-x_180 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(x_172, x_2, x_3, x_4, x_5, x_6, x_177);
-if (lean_obj_tag(x_180) == 0)
-{
-lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_203; 
+x_178 = lean_st_ref_get(x_6, x_175);
+x_179 = lean_ctor_get(x_178, 1);
+lean_inc(x_179);
+lean_dec(x_178);
+x_180 = lean_st_ref_get(x_3, x_179);
 x_181 = lean_ctor_get(x_180, 0);
 lean_inc(x_181);
 x_182 = lean_ctor_get(x_180, 1);
 lean_inc(x_182);
-if (lean_is_exclusive(x_180)) {
- lean_ctor_release(x_180, 0);
- lean_ctor_release(x_180, 1);
- x_183 = x_180;
+lean_dec(x_180);
+x_183 = lean_ctor_get(x_181, 0);
+lean_inc(x_183);
+lean_dec(x_181);
+x_184 = 0;
+lean_inc(x_176);
+x_185 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_183, x_176, x_184);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+lean_inc(x_177);
+x_186 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(x_184, x_177, x_2, x_3, x_4, x_5, x_6, x_182);
+if (lean_obj_tag(x_186) == 0)
+{
+lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_209; 
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+if (lean_is_exclusive(x_186)) {
+ lean_ctor_release(x_186, 0);
+ lean_ctor_release(x_186, 1);
+ x_189 = x_186;
 } else {
- lean_dec_ref(x_180);
- x_183 = lean_box(0);
+ lean_dec_ref(x_186);
+ x_189 = lean_box(0);
 }
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_181);
-lean_inc(x_179);
-x_203 = l_Lean_Compiler_LCNF_Simp_inlineJp_x3f(x_179, x_181, x_2, x_3, x_4, x_5, x_6, x_182);
-if (lean_obj_tag(x_203) == 0)
+lean_inc(x_187);
+lean_inc(x_185);
+x_209 = l_Lean_Compiler_LCNF_Simp_inlineJp_x3f(x_185, x_187, x_2, x_3, x_4, x_5, x_6, x_188);
+if (lean_obj_tag(x_209) == 0)
 {
-lean_object* x_204; 
-x_204 = lean_ctor_get(x_203, 0);
-lean_inc(x_204);
-if (lean_obj_tag(x_204) == 0)
+lean_object* x_210; 
+x_210 = lean_ctor_get(x_209, 0);
+lean_inc(x_210);
+if (lean_obj_tag(x_210) == 0)
 {
-lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; uint8_t x_210; 
-x_205 = lean_ctor_get(x_203, 1);
-lean_inc(x_205);
-lean_dec(x_203);
-lean_inc(x_179);
-x_206 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_179, x_2, x_3, x_4, x_5, x_6, x_205);
-x_207 = lean_ctor_get(x_206, 1);
-lean_inc(x_207);
-lean_dec(x_206);
-x_208 = lean_array_get_size(x_181);
-x_209 = lean_unsigned_to_nat(0u);
-x_210 = lean_nat_dec_lt(x_209, x_208);
-if (x_210 == 0)
+lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; uint8_t x_216; 
+x_211 = lean_ctor_get(x_209, 1);
+lean_inc(x_211);
+lean_dec(x_209);
+lean_inc(x_185);
+x_212 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_185, x_2, x_3, x_4, x_5, x_6, x_211);
+x_213 = lean_ctor_get(x_212, 1);
+lean_inc(x_213);
+lean_dec(x_212);
+x_214 = lean_array_get_size(x_187);
+x_215 = lean_unsigned_to_nat(0u);
+x_216 = lean_nat_dec_lt(x_215, x_214);
+if (x_216 == 0)
 {
-lean_dec(x_208);
+lean_dec(x_214);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_184 = x_207;
-goto block_202;
+x_190 = x_213;
+goto block_208;
 }
 else
 {
-uint8_t x_211; 
-x_211 = lean_nat_dec_le(x_208, x_208);
-if (x_211 == 0)
+uint8_t x_217; 
+x_217 = lean_nat_dec_le(x_214, x_214);
+if (x_217 == 0)
 {
-lean_dec(x_208);
+lean_dec(x_214);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_184 = x_207;
-goto block_202;
+x_190 = x_213;
+goto block_208;
 }
 else
 {
-size_t x_212; size_t x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; 
-x_212 = 0;
-x_213 = lean_usize_of_nat(x_208);
-lean_dec(x_208);
-x_214 = lean_box(0);
-x_215 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_markUsedCode___spec__1(x_181, x_212, x_213, x_214, x_2, x_3, x_4, x_5, x_6, x_207);
+size_t x_218; size_t x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+x_218 = 0;
+x_219 = lean_usize_of_nat(x_214);
+lean_dec(x_214);
+x_220 = lean_box(0);
+x_221 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_markUsedCode___spec__1(x_187, x_218, x_219, x_220, x_2, x_3, x_4, x_5, x_6, x_213);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_216 = lean_ctor_get(x_215, 1);
-lean_inc(x_216);
-lean_dec(x_215);
-x_184 = x_216;
-goto block_202;
+x_222 = lean_ctor_get(x_221, 1);
+lean_inc(x_222);
+lean_dec(x_221);
+x_190 = x_222;
+goto block_208;
 }
 }
 }
 else
 {
-lean_object* x_217; lean_object* x_218; 
-lean_dec(x_183);
-lean_dec(x_181);
-lean_dec(x_179);
-lean_dec(x_172);
-lean_dec(x_171);
+lean_object* x_223; lean_object* x_224; 
+lean_dec(x_189);
+lean_dec(x_187);
+lean_dec(x_185);
+lean_dec(x_177);
+lean_dec(x_176);
 lean_dec(x_1);
-x_217 = lean_ctor_get(x_203, 1);
-lean_inc(x_217);
-lean_dec(x_203);
-x_218 = lean_ctor_get(x_204, 0);
-lean_inc(x_218);
-lean_dec(x_204);
-x_1 = x_218;
-x_7 = x_217;
+x_223 = lean_ctor_get(x_209, 1);
+lean_inc(x_223);
+lean_dec(x_209);
+x_224 = lean_ctor_get(x_210, 0);
+lean_inc(x_224);
+lean_dec(x_210);
+x_1 = x_224;
+x_7 = x_223;
 goto _start;
 }
 }
 else
 {
-uint8_t x_220; 
-lean_dec(x_183);
-lean_dec(x_181);
-lean_dec(x_179);
-lean_dec(x_172);
-lean_dec(x_171);
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_220 = !lean_is_exclusive(x_203);
-if (x_220 == 0)
-{
-return x_203;
-}
-else
-{
-lean_object* x_221; lean_object* x_222; lean_object* x_223; 
-x_221 = lean_ctor_get(x_203, 0);
-x_222 = lean_ctor_get(x_203, 1);
-lean_inc(x_222);
-lean_inc(x_221);
-lean_dec(x_203);
-x_223 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_223, 0, x_221);
-lean_ctor_set(x_223, 1, x_222);
-return x_223;
-}
-}
-block_202:
-{
-uint8_t x_185; 
-x_185 = lean_name_eq(x_171, x_179);
-lean_dec(x_171);
-if (x_185 == 0)
-{
-uint8_t x_186; 
-lean_dec(x_172);
-x_186 = !lean_is_exclusive(x_1);
-if (x_186 == 0)
-{
-lean_object* x_187; lean_object* x_188; lean_object* x_189; 
-x_187 = lean_ctor_get(x_1, 1);
+uint8_t x_226; 
+lean_dec(x_189);
 lean_dec(x_187);
-x_188 = lean_ctor_get(x_1, 0);
-lean_dec(x_188);
-lean_ctor_set(x_1, 1, x_181);
-lean_ctor_set(x_1, 0, x_179);
-if (lean_is_scalar(x_183)) {
- x_189 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_189 = x_183;
-}
-lean_ctor_set(x_189, 0, x_1);
-lean_ctor_set(x_189, 1, x_184);
-return x_189;
-}
-else
-{
-lean_object* x_190; lean_object* x_191; 
-lean_dec(x_1);
-x_190 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_190, 0, x_179);
-lean_ctor_set(x_190, 1, x_181);
-if (lean_is_scalar(x_183)) {
- x_191 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_191 = x_183;
-}
-lean_ctor_set(x_191, 0, x_190);
-lean_ctor_set(x_191, 1, x_184);
-return x_191;
-}
-}
-else
-{
-size_t x_192; size_t x_193; uint8_t x_194; 
-x_192 = lean_ptr_addr(x_172);
-lean_dec(x_172);
-x_193 = lean_ptr_addr(x_181);
-x_194 = lean_usize_dec_eq(x_192, x_193);
-if (x_194 == 0)
-{
-uint8_t x_195; 
-x_195 = !lean_is_exclusive(x_1);
-if (x_195 == 0)
-{
-lean_object* x_196; lean_object* x_197; lean_object* x_198; 
-x_196 = lean_ctor_get(x_1, 1);
-lean_dec(x_196);
-x_197 = lean_ctor_get(x_1, 0);
-lean_dec(x_197);
-lean_ctor_set(x_1, 1, x_181);
-lean_ctor_set(x_1, 0, x_179);
-if (lean_is_scalar(x_183)) {
- x_198 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_198 = x_183;
-}
-lean_ctor_set(x_198, 0, x_1);
-lean_ctor_set(x_198, 1, x_184);
-return x_198;
-}
-else
-{
-lean_object* x_199; lean_object* x_200; 
-lean_dec(x_1);
-x_199 = lean_alloc_ctor(3, 2, 0);
-lean_ctor_set(x_199, 0, x_179);
-lean_ctor_set(x_199, 1, x_181);
-if (lean_is_scalar(x_183)) {
- x_200 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_200 = x_183;
-}
-lean_ctor_set(x_200, 0, x_199);
-lean_ctor_set(x_200, 1, x_184);
-return x_200;
-}
-}
-else
-{
-lean_object* x_201; 
-lean_dec(x_181);
-lean_dec(x_179);
-if (lean_is_scalar(x_183)) {
- x_201 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_201 = x_183;
-}
-lean_ctor_set(x_201, 0, x_1);
-lean_ctor_set(x_201, 1, x_184);
-return x_201;
-}
-}
-}
-}
-else
-{
-uint8_t x_224; 
-lean_dec(x_179);
-lean_dec(x_172);
-lean_dec(x_171);
+lean_dec(x_185);
+lean_dec(x_177);
+lean_dec(x_176);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_224 = !lean_is_exclusive(x_180);
-if (x_224 == 0)
+x_226 = !lean_is_exclusive(x_209);
+if (x_226 == 0)
 {
-return x_180;
+return x_209;
 }
 else
 {
-lean_object* x_225; lean_object* x_226; lean_object* x_227; 
-x_225 = lean_ctor_get(x_180, 0);
-x_226 = lean_ctor_get(x_180, 1);
-lean_inc(x_226);
-lean_inc(x_225);
-lean_dec(x_180);
-x_227 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_227, 0, x_225);
-lean_ctor_set(x_227, 1, x_226);
-return x_227;
+lean_object* x_227; lean_object* x_228; lean_object* x_229; 
+x_227 = lean_ctor_get(x_209, 0);
+x_228 = lean_ctor_get(x_209, 1);
+lean_inc(x_228);
+lean_inc(x_227);
+lean_dec(x_209);
+x_229 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_229, 0, x_227);
+lean_ctor_set(x_229, 1, x_228);
+return x_229;
+}
+}
+block_208:
+{
+uint8_t x_191; 
+x_191 = lean_name_eq(x_176, x_185);
+lean_dec(x_176);
+if (x_191 == 0)
+{
+uint8_t x_192; 
+lean_dec(x_177);
+x_192 = !lean_is_exclusive(x_1);
+if (x_192 == 0)
+{
+lean_object* x_193; lean_object* x_194; lean_object* x_195; 
+x_193 = lean_ctor_get(x_1, 1);
+lean_dec(x_193);
+x_194 = lean_ctor_get(x_1, 0);
+lean_dec(x_194);
+lean_ctor_set(x_1, 1, x_187);
+lean_ctor_set(x_1, 0, x_185);
+if (lean_is_scalar(x_189)) {
+ x_195 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_195 = x_189;
+}
+lean_ctor_set(x_195, 0, x_1);
+lean_ctor_set(x_195, 1, x_190);
+return x_195;
+}
+else
+{
+lean_object* x_196; lean_object* x_197; 
+lean_dec(x_1);
+x_196 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_196, 0, x_185);
+lean_ctor_set(x_196, 1, x_187);
+if (lean_is_scalar(x_189)) {
+ x_197 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_197 = x_189;
+}
+lean_ctor_set(x_197, 0, x_196);
+lean_ctor_set(x_197, 1, x_190);
+return x_197;
+}
+}
+else
+{
+size_t x_198; size_t x_199; uint8_t x_200; 
+x_198 = lean_ptr_addr(x_177);
+lean_dec(x_177);
+x_199 = lean_ptr_addr(x_187);
+x_200 = lean_usize_dec_eq(x_198, x_199);
+if (x_200 == 0)
+{
+uint8_t x_201; 
+x_201 = !lean_is_exclusive(x_1);
+if (x_201 == 0)
+{
+lean_object* x_202; lean_object* x_203; lean_object* x_204; 
+x_202 = lean_ctor_get(x_1, 1);
+lean_dec(x_202);
+x_203 = lean_ctor_get(x_1, 0);
+lean_dec(x_203);
+lean_ctor_set(x_1, 1, x_187);
+lean_ctor_set(x_1, 0, x_185);
+if (lean_is_scalar(x_189)) {
+ x_204 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_204 = x_189;
+}
+lean_ctor_set(x_204, 0, x_1);
+lean_ctor_set(x_204, 1, x_190);
+return x_204;
+}
+else
+{
+lean_object* x_205; lean_object* x_206; 
+lean_dec(x_1);
+x_205 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_205, 0, x_185);
+lean_ctor_set(x_205, 1, x_187);
+if (lean_is_scalar(x_189)) {
+ x_206 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_206 = x_189;
+}
+lean_ctor_set(x_206, 0, x_205);
+lean_ctor_set(x_206, 1, x_190);
+return x_206;
+}
+}
+else
+{
+lean_object* x_207; 
+lean_dec(x_187);
+lean_dec(x_185);
+if (lean_is_scalar(x_189)) {
+ x_207 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_207 = x_189;
+}
+lean_ctor_set(x_207, 0, x_1);
+lean_ctor_set(x_207, 1, x_190);
+return x_207;
+}
+}
+}
+}
+else
+{
+uint8_t x_230; 
+lean_dec(x_185);
+lean_dec(x_177);
+lean_dec(x_176);
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_230 = !lean_is_exclusive(x_186);
+if (x_230 == 0)
+{
+return x_186;
+}
+else
+{
+lean_object* x_231; lean_object* x_232; lean_object* x_233; 
+x_231 = lean_ctor_get(x_186, 0);
+x_232 = lean_ctor_get(x_186, 1);
+lean_inc(x_232);
+lean_inc(x_231);
+lean_dec(x_186);
+x_233 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_233, 0, x_231);
+lean_ctor_set(x_233, 1, x_232);
+return x_233;
 }
 }
 }
 case 4:
 {
-lean_object* x_228; lean_object* x_229; lean_object* x_230; 
-x_228 = lean_ctor_get(x_34, 1);
-lean_inc(x_228);
+lean_object* x_234; lean_object* x_235; lean_object* x_236; 
+x_234 = lean_ctor_get(x_34, 1);
+lean_inc(x_234);
 lean_dec(x_34);
-x_229 = lean_ctor_get(x_1, 0);
-lean_inc(x_229);
+x_235 = lean_ctor_get(x_1, 0);
+lean_inc(x_235);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_229);
-x_230 = l_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f(x_229, x_2, x_3, x_4, x_5, x_6, x_228);
-if (lean_obj_tag(x_230) == 0)
-{
-lean_object* x_231; 
-x_231 = lean_ctor_get(x_230, 0);
-lean_inc(x_231);
-if (lean_obj_tag(x_231) == 0)
-{
-lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; 
-x_232 = lean_ctor_get(x_230, 1);
-lean_inc(x_232);
-lean_dec(x_230);
-x_233 = lean_ctor_get(x_229, 0);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_229, 1);
-lean_inc(x_234);
-x_235 = lean_ctor_get(x_229, 2);
 lean_inc(x_235);
-x_236 = lean_ctor_get(x_229, 3);
-lean_inc(x_236);
-lean_inc(x_235);
-x_237 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__7___boxed), 8, 1);
-lean_closure_set(x_237, 0, x_235);
-x_238 = l_Lean_Compiler_LCNF_Simp_simp___closed__1;
-x_239 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
-lean_closure_set(x_239, 0, x_238);
-lean_closure_set(x_239, 1, x_237);
+x_236 = l_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f(x_235, x_2, x_3, x_4, x_5, x_6, x_234);
+if (lean_obj_tag(x_236) == 0)
+{
+lean_object* x_237; 
+x_237 = lean_ctor_get(x_236, 0);
+lean_inc(x_237);
+if (lean_obj_tag(x_237) == 0)
+{
+lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
+x_238 = lean_ctor_get(x_236, 1);
+lean_inc(x_238);
+lean_dec(x_236);
+x_239 = lean_ctor_get(x_235, 0);
+lean_inc(x_239);
+x_240 = lean_ctor_get(x_235, 1);
+lean_inc(x_240);
+x_241 = lean_ctor_get(x_235, 2);
+lean_inc(x_241);
+x_242 = lean_ctor_get(x_235, 3);
+lean_inc(x_242);
+lean_inc(x_241);
+x_243 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__7___boxed), 8, 1);
+lean_closure_set(x_243, 0, x_241);
+x_244 = l_Lean_Compiler_LCNF_Simp_simp___closed__1;
+x_245 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
+lean_closure_set(x_245, 0, x_244);
+lean_closure_set(x_245, 1, x_243);
 lean_inc(x_1);
+lean_inc(x_241);
 lean_inc(x_235);
-lean_inc(x_229);
-x_240 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__10___boxed), 10, 3);
-lean_closure_set(x_240, 0, x_229);
-lean_closure_set(x_240, 1, x_235);
-lean_closure_set(x_240, 2, x_1);
-x_241 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
-lean_closure_set(x_241, 0, x_239);
-lean_closure_set(x_241, 1, x_240);
-lean_inc(x_229);
-x_242 = l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f(x_229, x_2, x_3, x_4, x_5, x_6, x_232);
-if (lean_is_exclusive(x_229)) {
- lean_ctor_release(x_229, 0);
- lean_ctor_release(x_229, 1);
- lean_ctor_release(x_229, 2);
- lean_ctor_release(x_229, 3);
- x_243 = x_229;
+x_246 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__10___boxed), 10, 3);
+lean_closure_set(x_246, 0, x_235);
+lean_closure_set(x_246, 1, x_241);
+lean_closure_set(x_246, 2, x_1);
+x_247 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
+lean_closure_set(x_247, 0, x_245);
+lean_closure_set(x_247, 1, x_246);
+lean_inc(x_235);
+x_248 = l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f(x_235, x_2, x_3, x_4, x_5, x_6, x_238);
+if (lean_is_exclusive(x_235)) {
+ lean_ctor_release(x_235, 0);
+ lean_ctor_release(x_235, 1);
+ lean_ctor_release(x_235, 2);
+ lean_ctor_release(x_235, 3);
+ x_249 = x_235;
 } else {
- lean_dec_ref(x_229);
- x_243 = lean_box(0);
+ lean_dec_ref(x_235);
+ x_249 = lean_box(0);
 }
-if (lean_obj_tag(x_242) == 0)
+if (lean_obj_tag(x_248) == 0)
 {
-lean_object* x_244; 
-x_244 = lean_ctor_get(x_242, 0);
-lean_inc(x_244);
-if (lean_obj_tag(x_244) == 0)
-{
-lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; 
-lean_dec(x_241);
-x_245 = lean_ctor_get(x_242, 1);
-lean_inc(x_245);
-lean_dec(x_242);
-x_246 = lean_st_ref_get(x_6, x_245);
-x_247 = lean_ctor_get(x_246, 1);
-lean_inc(x_247);
-lean_dec(x_246);
-x_248 = lean_st_ref_get(x_3, x_247);
-x_249 = lean_ctor_get(x_248, 0);
-lean_inc(x_249);
-x_250 = lean_ctor_get(x_248, 1);
+lean_object* x_250; 
+x_250 = lean_ctor_get(x_248, 0);
 lean_inc(x_250);
-lean_dec(x_248);
-x_251 = lean_ctor_get(x_249, 0);
+if (lean_obj_tag(x_250) == 0)
+{
+lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; uint8_t x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; 
+lean_dec(x_247);
+x_251 = lean_ctor_get(x_248, 1);
 lean_inc(x_251);
-lean_dec(x_249);
-lean_inc(x_235);
-x_252 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_251, x_235);
-x_253 = lean_st_ref_get(x_6, x_250);
-x_254 = lean_ctor_get(x_253, 1);
-lean_inc(x_254);
-lean_dec(x_253);
-x_255 = lean_st_ref_get(x_3, x_254);
-x_256 = lean_ctor_get(x_255, 0);
+lean_dec(x_248);
+x_252 = lean_st_ref_get(x_6, x_251);
+x_253 = lean_ctor_get(x_252, 1);
+lean_inc(x_253);
+lean_dec(x_252);
+x_254 = lean_st_ref_get(x_3, x_253);
+x_255 = lean_ctor_get(x_254, 0);
+lean_inc(x_255);
+x_256 = lean_ctor_get(x_254, 1);
 lean_inc(x_256);
-x_257 = lean_ctor_get(x_255, 1);
+lean_dec(x_254);
+x_257 = lean_ctor_get(x_255, 0);
 lean_inc(x_257);
 lean_dec(x_255);
-x_258 = lean_ctor_get(x_256, 0);
-lean_inc(x_258);
-lean_dec(x_256);
-lean_inc(x_234);
-x_259 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_258, x_234);
-lean_inc(x_252);
-x_260 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_252, x_2, x_3, x_4, x_5, x_6, x_257);
+x_258 = 0;
+lean_inc(x_241);
+x_259 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_257, x_241, x_258);
+x_260 = lean_st_ref_get(x_6, x_256);
 x_261 = lean_ctor_get(x_260, 1);
 lean_inc(x_261);
 lean_dec(x_260);
-lean_inc(x_252);
-x_262 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
-lean_closure_set(x_262, 0, x_252);
+x_262 = lean_st_ref_get(x_3, x_261);
+x_263 = lean_ctor_get(x_262, 0);
+lean_inc(x_263);
+x_264 = lean_ctor_get(x_262, 1);
+lean_inc(x_264);
+lean_dec(x_262);
+x_265 = lean_ctor_get(x_263, 0);
+lean_inc(x_265);
+lean_dec(x_263);
+lean_inc(x_240);
+x_266 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_265, x_258, x_240);
+lean_inc(x_259);
+x_267 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_259, x_2, x_3, x_4, x_5, x_6, x_264);
+x_268 = lean_ctor_get(x_267, 1);
+lean_inc(x_268);
+lean_dec(x_267);
+lean_inc(x_259);
+x_269 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
+lean_closure_set(x_269, 0, x_259);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_236);
-x_263 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_236, x_262, x_2, x_3, x_4, x_5, x_6, x_261);
-if (lean_obj_tag(x_263) == 0)
+lean_inc(x_242);
+x_270 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_242, x_269, x_2, x_3, x_4, x_5, x_6, x_268);
+if (lean_obj_tag(x_270) == 0)
 {
-lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; 
-x_264 = lean_ctor_get(x_263, 0);
-lean_inc(x_264);
-x_265 = lean_ctor_get(x_263, 1);
-lean_inc(x_265);
-if (lean_is_exclusive(x_263)) {
- lean_ctor_release(x_263, 0);
- lean_ctor_release(x_263, 1);
- x_266 = x_263;
+lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
+x_271 = lean_ctor_get(x_270, 0);
+lean_inc(x_271);
+x_272 = lean_ctor_get(x_270, 1);
+lean_inc(x_272);
+if (lean_is_exclusive(x_270)) {
+ lean_ctor_release(x_270, 0);
+ lean_ctor_release(x_270, 1);
+ x_273 = x_270;
 } else {
- lean_dec_ref(x_263);
- x_266 = lean_box(0);
+ lean_dec_ref(x_270);
+ x_273 = lean_box(0);
 }
-x_267 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_264, x_2, x_3, x_4, x_5, x_6, x_265);
-if (lean_obj_tag(x_267) == 0)
+x_274 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_271, x_2, x_3, x_4, x_5, x_6, x_272);
+if (lean_obj_tag(x_274) == 0)
 {
-lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_302; lean_object* x_303; uint8_t x_314; 
-x_268 = lean_ctor_get(x_267, 0);
-lean_inc(x_268);
-x_269 = lean_ctor_get(x_267, 1);
-lean_inc(x_269);
-if (lean_is_exclusive(x_267)) {
- lean_ctor_release(x_267, 0);
- lean_ctor_release(x_267, 1);
- x_270 = x_267;
+lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_309; lean_object* x_310; uint8_t x_321; 
+x_275 = lean_ctor_get(x_274, 0);
+lean_inc(x_275);
+x_276 = lean_ctor_get(x_274, 1);
+lean_inc(x_276);
+if (lean_is_exclusive(x_274)) {
+ lean_ctor_release(x_274, 0);
+ lean_ctor_release(x_274, 1);
+ x_277 = x_274;
 } else {
- lean_dec_ref(x_267);
- x_270 = lean_box(0);
+ lean_dec_ref(x_274);
+ x_277 = lean_box(0);
 }
-x_302 = lean_array_get_size(x_268);
-x_314 = lean_nat_dec_eq(x_302, x_32);
-if (x_314 == 0)
-{
-lean_object* x_315; 
-lean_dec(x_302);
-lean_dec(x_266);
-x_315 = lean_box(0);
-x_271 = x_315;
-goto block_301;
-}
-else
-{
-lean_object* x_316; uint8_t x_317; 
-x_316 = lean_unsigned_to_nat(0u);
-x_317 = lean_nat_dec_lt(x_316, x_302);
-if (x_317 == 0)
-{
-lean_object* x_318; lean_object* x_319; 
-x_318 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_319 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_318);
-if (lean_obj_tag(x_319) == 0)
-{
-lean_object* x_320; 
-lean_dec(x_319);
-lean_dec(x_302);
-lean_dec(x_266);
-x_320 = lean_box(0);
-x_271 = x_320;
-goto block_301;
-}
-else
-{
-lean_object* x_321; 
-lean_dec(x_319);
-lean_dec(x_270);
-lean_dec(x_259);
-lean_dec(x_252);
-lean_dec(x_243);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
-lean_dec(x_1);
-x_321 = lean_box(0);
-x_303 = x_321;
-goto block_313;
-}
-}
-else
+x_309 = lean_array_get_size(x_275);
+x_321 = lean_nat_dec_eq(x_309, x_32);
+if (x_321 == 0)
 {
 lean_object* x_322; 
-x_322 = lean_array_fget(x_268, x_316);
-if (lean_obj_tag(x_322) == 0)
+lean_dec(x_309);
+lean_dec(x_273);
+x_322 = lean_box(0);
+x_278 = x_322;
+goto block_308;
+}
+else
 {
-lean_object* x_323; 
-lean_dec(x_322);
-lean_dec(x_302);
+lean_object* x_323; uint8_t x_324; 
+x_323 = lean_unsigned_to_nat(0u);
+x_324 = lean_nat_dec_lt(x_323, x_309);
+if (x_324 == 0)
+{
+lean_object* x_325; lean_object* x_326; 
+x_325 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_326 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_325);
+if (lean_obj_tag(x_326) == 0)
+{
+lean_object* x_327; 
+lean_dec(x_326);
+lean_dec(x_309);
+lean_dec(x_273);
+x_327 = lean_box(0);
+x_278 = x_327;
+goto block_308;
+}
+else
+{
+lean_object* x_328; 
+lean_dec(x_326);
+lean_dec(x_277);
 lean_dec(x_266);
-x_323 = lean_box(0);
-x_271 = x_323;
-goto block_301;
-}
-else
-{
-lean_object* x_324; 
-lean_dec(x_322);
-lean_dec(x_270);
 lean_dec(x_259);
-lean_dec(x_252);
-lean_dec(x_243);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
+lean_dec(x_249);
+lean_dec(x_242);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_239);
 lean_dec(x_1);
-x_324 = lean_box(0);
-x_303 = x_324;
-goto block_313;
-}
-}
-}
-block_301:
-{
-size_t x_272; size_t x_273; uint8_t x_274; 
-lean_dec(x_271);
-x_272 = lean_ptr_addr(x_236);
-lean_dec(x_236);
-x_273 = lean_ptr_addr(x_268);
-x_274 = lean_usize_dec_eq(x_272, x_273);
-if (x_274 == 0)
-{
-uint8_t x_275; 
-lean_dec(x_235);
-lean_dec(x_234);
-x_275 = !lean_is_exclusive(x_1);
-if (x_275 == 0)
-{
-lean_object* x_276; lean_object* x_277; lean_object* x_278; 
-x_276 = lean_ctor_get(x_1, 0);
-lean_dec(x_276);
-if (lean_is_scalar(x_243)) {
- x_277 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_277 = x_243;
-}
-lean_ctor_set(x_277, 0, x_233);
-lean_ctor_set(x_277, 1, x_259);
-lean_ctor_set(x_277, 2, x_252);
-lean_ctor_set(x_277, 3, x_268);
-lean_ctor_set(x_1, 0, x_277);
-if (lean_is_scalar(x_270)) {
- x_278 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_278 = x_270;
-}
-lean_ctor_set(x_278, 0, x_1);
-lean_ctor_set(x_278, 1, x_269);
-return x_278;
-}
-else
-{
-lean_object* x_279; lean_object* x_280; lean_object* x_281; 
-lean_dec(x_1);
-if (lean_is_scalar(x_243)) {
- x_279 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_279 = x_243;
-}
-lean_ctor_set(x_279, 0, x_233);
-lean_ctor_set(x_279, 1, x_259);
-lean_ctor_set(x_279, 2, x_252);
-lean_ctor_set(x_279, 3, x_268);
-x_280 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_280, 0, x_279);
-if (lean_is_scalar(x_270)) {
- x_281 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_281 = x_270;
-}
-lean_ctor_set(x_281, 0, x_280);
-lean_ctor_set(x_281, 1, x_269);
-return x_281;
+x_328 = lean_box(0);
+x_310 = x_328;
+goto block_320;
 }
 }
 else
 {
-size_t x_282; size_t x_283; uint8_t x_284; 
-x_282 = lean_ptr_addr(x_234);
-lean_dec(x_234);
-x_283 = lean_ptr_addr(x_259);
-x_284 = lean_usize_dec_eq(x_282, x_283);
-if (x_284 == 0)
+lean_object* x_329; 
+x_329 = lean_array_fget(x_275, x_323);
+if (lean_obj_tag(x_329) == 0)
 {
-uint8_t x_285; 
-lean_dec(x_235);
-x_285 = !lean_is_exclusive(x_1);
-if (x_285 == 0)
+lean_object* x_330; 
+lean_dec(x_329);
+lean_dec(x_309);
+lean_dec(x_273);
+x_330 = lean_box(0);
+x_278 = x_330;
+goto block_308;
+}
+else
+{
+lean_object* x_331; 
+lean_dec(x_329);
+lean_dec(x_277);
+lean_dec(x_266);
+lean_dec(x_259);
+lean_dec(x_249);
+lean_dec(x_242);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_239);
+lean_dec(x_1);
+x_331 = lean_box(0);
+x_310 = x_331;
+goto block_320;
+}
+}
+}
+block_308:
+{
+size_t x_279; size_t x_280; uint8_t x_281; 
+lean_dec(x_278);
+x_279 = lean_ptr_addr(x_242);
+lean_dec(x_242);
+x_280 = lean_ptr_addr(x_275);
+x_281 = lean_usize_dec_eq(x_279, x_280);
+if (x_281 == 0)
+{
+uint8_t x_282; 
+lean_dec(x_241);
+lean_dec(x_240);
+x_282 = !lean_is_exclusive(x_1);
+if (x_282 == 0)
+{
+lean_object* x_283; lean_object* x_284; lean_object* x_285; 
+x_283 = lean_ctor_get(x_1, 0);
+lean_dec(x_283);
+if (lean_is_scalar(x_249)) {
+ x_284 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_284 = x_249;
+}
+lean_ctor_set(x_284, 0, x_239);
+lean_ctor_set(x_284, 1, x_266);
+lean_ctor_set(x_284, 2, x_259);
+lean_ctor_set(x_284, 3, x_275);
+lean_ctor_set(x_1, 0, x_284);
+if (lean_is_scalar(x_277)) {
+ x_285 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_285 = x_277;
+}
+lean_ctor_set(x_285, 0, x_1);
+lean_ctor_set(x_285, 1, x_276);
+return x_285;
+}
+else
 {
 lean_object* x_286; lean_object* x_287; lean_object* x_288; 
-x_286 = lean_ctor_get(x_1, 0);
-lean_dec(x_286);
-if (lean_is_scalar(x_243)) {
- x_287 = lean_alloc_ctor(0, 4, 0);
+lean_dec(x_1);
+if (lean_is_scalar(x_249)) {
+ x_286 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_287 = x_243;
+ x_286 = x_249;
 }
-lean_ctor_set(x_287, 0, x_233);
-lean_ctor_set(x_287, 1, x_259);
-lean_ctor_set(x_287, 2, x_252);
-lean_ctor_set(x_287, 3, x_268);
-lean_ctor_set(x_1, 0, x_287);
-if (lean_is_scalar(x_270)) {
+lean_ctor_set(x_286, 0, x_239);
+lean_ctor_set(x_286, 1, x_266);
+lean_ctor_set(x_286, 2, x_259);
+lean_ctor_set(x_286, 3, x_275);
+x_287 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_287, 0, x_286);
+if (lean_is_scalar(x_277)) {
  x_288 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_288 = x_270;
+ x_288 = x_277;
 }
-lean_ctor_set(x_288, 0, x_1);
-lean_ctor_set(x_288, 1, x_269);
+lean_ctor_set(x_288, 0, x_287);
+lean_ctor_set(x_288, 1, x_276);
 return x_288;
 }
+}
 else
 {
-lean_object* x_289; lean_object* x_290; lean_object* x_291; 
-lean_dec(x_1);
-if (lean_is_scalar(x_243)) {
- x_289 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_289 = x_243;
-}
-lean_ctor_set(x_289, 0, x_233);
-lean_ctor_set(x_289, 1, x_259);
-lean_ctor_set(x_289, 2, x_252);
-lean_ctor_set(x_289, 3, x_268);
-x_290 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_290, 0, x_289);
-if (lean_is_scalar(x_270)) {
- x_291 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_291 = x_270;
-}
-lean_ctor_set(x_291, 0, x_290);
-lean_ctor_set(x_291, 1, x_269);
-return x_291;
-}
-}
-else
+size_t x_289; size_t x_290; uint8_t x_291; 
+x_289 = lean_ptr_addr(x_240);
+lean_dec(x_240);
+x_290 = lean_ptr_addr(x_266);
+x_291 = lean_usize_dec_eq(x_289, x_290);
+if (x_291 == 0)
 {
 uint8_t x_292; 
-x_292 = lean_name_eq(x_235, x_252);
-lean_dec(x_235);
+lean_dec(x_241);
+x_292 = !lean_is_exclusive(x_1);
 if (x_292 == 0)
 {
-uint8_t x_293; 
-x_293 = !lean_is_exclusive(x_1);
-if (x_293 == 0)
-{
-lean_object* x_294; lean_object* x_295; lean_object* x_296; 
-x_294 = lean_ctor_get(x_1, 0);
-lean_dec(x_294);
-if (lean_is_scalar(x_243)) {
- x_295 = lean_alloc_ctor(0, 4, 0);
+lean_object* x_293; lean_object* x_294; lean_object* x_295; 
+x_293 = lean_ctor_get(x_1, 0);
+lean_dec(x_293);
+if (lean_is_scalar(x_249)) {
+ x_294 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_295 = x_243;
+ x_294 = x_249;
 }
-lean_ctor_set(x_295, 0, x_233);
-lean_ctor_set(x_295, 1, x_259);
-lean_ctor_set(x_295, 2, x_252);
-lean_ctor_set(x_295, 3, x_268);
-lean_ctor_set(x_1, 0, x_295);
-if (lean_is_scalar(x_270)) {
- x_296 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_294, 0, x_239);
+lean_ctor_set(x_294, 1, x_266);
+lean_ctor_set(x_294, 2, x_259);
+lean_ctor_set(x_294, 3, x_275);
+lean_ctor_set(x_1, 0, x_294);
+if (lean_is_scalar(x_277)) {
+ x_295 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_296 = x_270;
+ x_295 = x_277;
 }
-lean_ctor_set(x_296, 0, x_1);
-lean_ctor_set(x_296, 1, x_269);
-return x_296;
+lean_ctor_set(x_295, 0, x_1);
+lean_ctor_set(x_295, 1, x_276);
+return x_295;
 }
 else
 {
-lean_object* x_297; lean_object* x_298; lean_object* x_299; 
+lean_object* x_296; lean_object* x_297; lean_object* x_298; 
 lean_dec(x_1);
-if (lean_is_scalar(x_243)) {
- x_297 = lean_alloc_ctor(0, 4, 0);
+if (lean_is_scalar(x_249)) {
+ x_296 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_297 = x_243;
+ x_296 = x_249;
+}
+lean_ctor_set(x_296, 0, x_239);
+lean_ctor_set(x_296, 1, x_266);
+lean_ctor_set(x_296, 2, x_259);
+lean_ctor_set(x_296, 3, x_275);
+x_297 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_297, 0, x_296);
+if (lean_is_scalar(x_277)) {
+ x_298 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_298 = x_277;
 }
-lean_ctor_set(x_297, 0, x_233);
-lean_ctor_set(x_297, 1, x_259);
-lean_ctor_set(x_297, 2, x_252);
-lean_ctor_set(x_297, 3, x_268);
-x_298 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_298, 0, x_297);
-if (lean_is_scalar(x_270)) {
- x_299 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_299 = x_270;
-}
-lean_ctor_set(x_299, 0, x_298);
-lean_ctor_set(x_299, 1, x_269);
-return x_299;
+lean_ctor_set(x_298, 1, x_276);
+return x_298;
 }
 }
 else
 {
-lean_object* x_300; 
-lean_dec(x_268);
-lean_dec(x_259);
-lean_dec(x_252);
-lean_dec(x_243);
-lean_dec(x_233);
-if (lean_is_scalar(x_270)) {
- x_300 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_300 = x_270;
-}
-lean_ctor_set(x_300, 0, x_1);
-lean_ctor_set(x_300, 1, x_269);
-return x_300;
-}
-}
-}
-}
-block_313:
+uint8_t x_299; 
+x_299 = lean_name_eq(x_241, x_259);
+lean_dec(x_241);
+if (x_299 == 0)
 {
-lean_object* x_304; uint8_t x_305; 
-lean_dec(x_303);
-x_304 = lean_unsigned_to_nat(0u);
-x_305 = lean_nat_dec_lt(x_304, x_302);
-lean_dec(x_302);
-if (x_305 == 0)
+uint8_t x_300; 
+x_300 = !lean_is_exclusive(x_1);
+if (x_300 == 0)
 {
-lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; 
-lean_dec(x_268);
-x_306 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_307 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_306);
-x_308 = l_Lean_Compiler_LCNF_AltCore_getCode(x_307);
-lean_dec(x_307);
-if (lean_is_scalar(x_266)) {
- x_309 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_301; lean_object* x_302; lean_object* x_303; 
+x_301 = lean_ctor_get(x_1, 0);
+lean_dec(x_301);
+if (lean_is_scalar(x_249)) {
+ x_302 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_309 = x_266;
+ x_302 = x_249;
 }
-lean_ctor_set(x_309, 0, x_308);
-lean_ctor_set(x_309, 1, x_269);
-return x_309;
+lean_ctor_set(x_302, 0, x_239);
+lean_ctor_set(x_302, 1, x_266);
+lean_ctor_set(x_302, 2, x_259);
+lean_ctor_set(x_302, 3, x_275);
+lean_ctor_set(x_1, 0, x_302);
+if (lean_is_scalar(x_277)) {
+ x_303 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_303 = x_277;
+}
+lean_ctor_set(x_303, 0, x_1);
+lean_ctor_set(x_303, 1, x_276);
+return x_303;
 }
 else
 {
-lean_object* x_310; lean_object* x_311; lean_object* x_312; 
-x_310 = lean_array_fget(x_268, x_304);
-lean_dec(x_268);
-x_311 = l_Lean_Compiler_LCNF_AltCore_getCode(x_310);
-lean_dec(x_310);
-if (lean_is_scalar(x_266)) {
- x_312 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_304; lean_object* x_305; lean_object* x_306; 
+lean_dec(x_1);
+if (lean_is_scalar(x_249)) {
+ x_304 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_312 = x_266;
+ x_304 = x_249;
 }
-lean_ctor_set(x_312, 0, x_311);
-lean_ctor_set(x_312, 1, x_269);
-return x_312;
+lean_ctor_set(x_304, 0, x_239);
+lean_ctor_set(x_304, 1, x_266);
+lean_ctor_set(x_304, 2, x_259);
+lean_ctor_set(x_304, 3, x_275);
+x_305 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_305, 0, x_304);
+if (lean_is_scalar(x_277)) {
+ x_306 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_306 = x_277;
 }
+lean_ctor_set(x_306, 0, x_305);
+lean_ctor_set(x_306, 1, x_276);
+return x_306;
 }
 }
 else
 {
-uint8_t x_325; 
+lean_object* x_307; 
+lean_dec(x_275);
 lean_dec(x_266);
 lean_dec(x_259);
-lean_dec(x_252);
-lean_dec(x_243);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
-lean_dec(x_1);
-x_325 = !lean_is_exclusive(x_267);
-if (x_325 == 0)
+lean_dec(x_249);
+lean_dec(x_239);
+if (lean_is_scalar(x_277)) {
+ x_307 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_307 = x_277;
+}
+lean_ctor_set(x_307, 0, x_1);
+lean_ctor_set(x_307, 1, x_276);
+return x_307;
+}
+}
+}
+}
+block_320:
 {
-return x_267;
+lean_object* x_311; uint8_t x_312; 
+lean_dec(x_310);
+x_311 = lean_unsigned_to_nat(0u);
+x_312 = lean_nat_dec_lt(x_311, x_309);
+lean_dec(x_309);
+if (x_312 == 0)
+{
+lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; 
+lean_dec(x_275);
+x_313 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_314 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_313);
+x_315 = l_Lean_Compiler_LCNF_AltCore_getCode(x_314);
+lean_dec(x_314);
+if (lean_is_scalar(x_273)) {
+ x_316 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_316 = x_273;
+}
+lean_ctor_set(x_316, 0, x_315);
+lean_ctor_set(x_316, 1, x_276);
+return x_316;
 }
 else
 {
-lean_object* x_326; lean_object* x_327; lean_object* x_328; 
-x_326 = lean_ctor_get(x_267, 0);
-x_327 = lean_ctor_get(x_267, 1);
-lean_inc(x_327);
-lean_inc(x_326);
-lean_dec(x_267);
-x_328 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_328, 0, x_326);
-lean_ctor_set(x_328, 1, x_327);
-return x_328;
+lean_object* x_317; lean_object* x_318; lean_object* x_319; 
+x_317 = lean_array_fget(x_275, x_311);
+lean_dec(x_275);
+x_318 = l_Lean_Compiler_LCNF_AltCore_getCode(x_317);
+lean_dec(x_317);
+if (lean_is_scalar(x_273)) {
+ x_319 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_319 = x_273;
+}
+lean_ctor_set(x_319, 0, x_318);
+lean_ctor_set(x_319, 1, x_276);
+return x_319;
 }
 }
 }
 else
 {
-uint8_t x_329; 
+uint8_t x_332; 
+lean_dec(x_273);
+lean_dec(x_266);
 lean_dec(x_259);
-lean_dec(x_252);
-lean_dec(x_243);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
-lean_dec(x_5);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
+lean_dec(x_249);
+lean_dec(x_242);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_239);
 lean_dec(x_1);
-x_329 = !lean_is_exclusive(x_263);
-if (x_329 == 0)
+x_332 = !lean_is_exclusive(x_274);
+if (x_332 == 0)
 {
-return x_263;
-}
-else
-{
-lean_object* x_330; lean_object* x_331; lean_object* x_332; 
-x_330 = lean_ctor_get(x_263, 0);
-x_331 = lean_ctor_get(x_263, 1);
-lean_inc(x_331);
-lean_inc(x_330);
-lean_dec(x_263);
-x_332 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_332, 0, x_330);
-lean_ctor_set(x_332, 1, x_331);
-return x_332;
-}
-}
+return x_274;
 }
 else
 {
 lean_object* x_333; lean_object* x_334; lean_object* x_335; 
-lean_dec(x_243);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
-lean_dec(x_1);
-x_333 = lean_ctor_get(x_242, 1);
-lean_inc(x_333);
-lean_dec(x_242);
-x_334 = lean_ctor_get(x_244, 0);
+x_333 = lean_ctor_get(x_274, 0);
+x_334 = lean_ctor_get(x_274, 1);
 lean_inc(x_334);
-lean_dec(x_244);
-x_335 = l_Lean_Compiler_LCNF_Simp_withAddMustInline___rarg(x_334, x_241, x_2, x_3, x_4, x_5, x_6, x_333);
+lean_inc(x_333);
+lean_dec(x_274);
+x_335 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_335, 0, x_333);
+lean_ctor_set(x_335, 1, x_334);
 return x_335;
 }
 }
+}
 else
 {
 uint8_t x_336; 
-lean_dec(x_243);
+lean_dec(x_266);
+lean_dec(x_259);
+lean_dec(x_249);
+lean_dec(x_242);
 lean_dec(x_241);
-lean_dec(x_236);
-lean_dec(x_235);
-lean_dec(x_234);
-lean_dec(x_233);
+lean_dec(x_240);
+lean_dec(x_239);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_336 = !lean_is_exclusive(x_242);
+x_336 = !lean_is_exclusive(x_270);
 if (x_336 == 0)
 {
-return x_242;
+return x_270;
 }
 else
 {
 lean_object* x_337; lean_object* x_338; lean_object* x_339; 
-x_337 = lean_ctor_get(x_242, 0);
-x_338 = lean_ctor_get(x_242, 1);
+x_337 = lean_ctor_get(x_270, 0);
+x_338 = lean_ctor_get(x_270, 1);
 lean_inc(x_338);
 lean_inc(x_337);
-lean_dec(x_242);
+lean_dec(x_270);
 x_339 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_339, 0, x_337);
 lean_ctor_set(x_339, 1, x_338);
@@ -26557,288 +26628,345 @@ return x_339;
 }
 else
 {
-uint8_t x_340; 
-lean_dec(x_229);
+lean_object* x_340; lean_object* x_341; lean_object* x_342; 
+lean_dec(x_249);
+lean_dec(x_242);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_239);
+lean_dec(x_1);
+x_340 = lean_ctor_get(x_248, 1);
+lean_inc(x_340);
+lean_dec(x_248);
+x_341 = lean_ctor_get(x_250, 0);
+lean_inc(x_341);
+lean_dec(x_250);
+x_342 = l_Lean_Compiler_LCNF_Simp_withAddMustInline___rarg(x_341, x_247, x_2, x_3, x_4, x_5, x_6, x_340);
+return x_342;
+}
+}
+else
+{
+uint8_t x_343; 
+lean_dec(x_249);
+lean_dec(x_247);
+lean_dec(x_242);
+lean_dec(x_241);
+lean_dec(x_240);
+lean_dec(x_239);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_340 = !lean_is_exclusive(x_230);
-if (x_340 == 0)
+x_343 = !lean_is_exclusive(x_248);
+if (x_343 == 0)
 {
-lean_object* x_341; lean_object* x_342; 
-x_341 = lean_ctor_get(x_230, 0);
-lean_dec(x_341);
-x_342 = lean_ctor_get(x_231, 0);
-lean_inc(x_342);
-lean_dec(x_231);
-lean_ctor_set(x_230, 0, x_342);
-return x_230;
+return x_248;
 }
 else
 {
-lean_object* x_343; lean_object* x_344; lean_object* x_345; 
-x_343 = lean_ctor_get(x_230, 1);
-lean_inc(x_343);
-lean_dec(x_230);
-x_344 = lean_ctor_get(x_231, 0);
+lean_object* x_344; lean_object* x_345; lean_object* x_346; 
+x_344 = lean_ctor_get(x_248, 0);
+x_345 = lean_ctor_get(x_248, 1);
+lean_inc(x_345);
 lean_inc(x_344);
-lean_dec(x_231);
-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_dec(x_248);
+x_346 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_346, 0, x_344);
+lean_ctor_set(x_346, 1, x_345);
+return x_346;
 }
 }
 }
 else
 {
-uint8_t x_346; 
-lean_dec(x_229);
+uint8_t x_347; 
+lean_dec(x_235);
 lean_dec(x_5);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_346 = !lean_is_exclusive(x_230);
-if (x_346 == 0)
+x_347 = !lean_is_exclusive(x_236);
+if (x_347 == 0)
 {
-return x_230;
+lean_object* x_348; lean_object* x_349; 
+x_348 = lean_ctor_get(x_236, 0);
+lean_dec(x_348);
+x_349 = lean_ctor_get(x_237, 0);
+lean_inc(x_349);
+lean_dec(x_237);
+lean_ctor_set(x_236, 0, x_349);
+return x_236;
 }
 else
 {
-lean_object* x_347; lean_object* x_348; lean_object* x_349; 
-x_347 = lean_ctor_get(x_230, 0);
-x_348 = lean_ctor_get(x_230, 1);
-lean_inc(x_348);
-lean_inc(x_347);
-lean_dec(x_230);
-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_350; lean_object* x_351; lean_object* x_352; 
+x_350 = lean_ctor_get(x_236, 1);
+lean_inc(x_350);
+lean_dec(x_236);
+x_351 = lean_ctor_get(x_237, 0);
+lean_inc(x_351);
+lean_dec(x_237);
+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_353; 
+lean_dec(x_235);
+lean_dec(x_5);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_353 = !lean_is_exclusive(x_236);
+if (x_353 == 0)
+{
+return x_236;
+}
+else
+{
+lean_object* x_354; lean_object* x_355; lean_object* x_356; 
+x_354 = lean_ctor_get(x_236, 0);
+x_355 = lean_ctor_get(x_236, 1);
+lean_inc(x_355);
+lean_inc(x_354);
+lean_dec(x_236);
+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;
 }
 }
 }
 case 5:
 {
-lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; uint8_t x_360; 
-x_350 = lean_ctor_get(x_34, 1);
-lean_inc(x_350);
-lean_dec(x_34);
-x_351 = lean_ctor_get(x_1, 0);
-lean_inc(x_351);
-x_352 = lean_st_ref_get(x_6, x_350);
-x_353 = lean_ctor_get(x_352, 1);
-lean_inc(x_353);
-lean_dec(x_352);
-x_354 = lean_st_ref_get(x_3, x_353);
-x_355 = lean_ctor_get(x_354, 0);
-lean_inc(x_355);
-x_356 = lean_ctor_get(x_354, 1);
-lean_inc(x_356);
-lean_dec(x_354);
-x_357 = lean_ctor_get(x_355, 0);
+lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; uint8_t x_365; lean_object* x_366; lean_object* x_367; uint8_t x_368; 
+x_357 = lean_ctor_get(x_34, 1);
 lean_inc(x_357);
-lean_dec(x_355);
-lean_inc(x_351);
-x_358 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_357, x_351);
+lean_dec(x_34);
+x_358 = lean_ctor_get(x_1, 0);
 lean_inc(x_358);
-x_359 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_358, x_2, x_3, x_4, x_5, x_6, x_356);
+x_359 = lean_st_ref_get(x_6, x_357);
+x_360 = lean_ctor_get(x_359, 1);
+lean_inc(x_360);
+lean_dec(x_359);
+x_361 = lean_st_ref_get(x_3, x_360);
+x_362 = lean_ctor_get(x_361, 0);
+lean_inc(x_362);
+x_363 = lean_ctor_get(x_361, 1);
+lean_inc(x_363);
+lean_dec(x_361);
+x_364 = lean_ctor_get(x_362, 0);
+lean_inc(x_364);
+lean_dec(x_362);
+x_365 = 0;
+lean_inc(x_358);
+x_366 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_364, x_358, x_365);
+lean_inc(x_366);
+x_367 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_366, x_2, x_3, x_4, x_5, x_6, x_363);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_360 = !lean_is_exclusive(x_359);
-if (x_360 == 0)
-{
-lean_object* x_361; uint8_t x_362; 
-x_361 = lean_ctor_get(x_359, 0);
-lean_dec(x_361);
-x_362 = lean_name_eq(x_351, x_358);
-lean_dec(x_351);
-if (x_362 == 0)
-{
-uint8_t x_363; 
-x_363 = !lean_is_exclusive(x_1);
-if (x_363 == 0)
-{
-lean_object* x_364; 
-x_364 = lean_ctor_get(x_1, 0);
-lean_dec(x_364);
-lean_ctor_set(x_1, 0, x_358);
-lean_ctor_set(x_359, 0, x_1);
-return x_359;
-}
-else
-{
-lean_object* x_365; 
-lean_dec(x_1);
-x_365 = lean_alloc_ctor(5, 1, 0);
-lean_ctor_set(x_365, 0, x_358);
-lean_ctor_set(x_359, 0, x_365);
-return x_359;
-}
-}
-else
+x_368 = !lean_is_exclusive(x_367);
+if (x_368 == 0)
 {
+lean_object* x_369; uint8_t x_370; 
+x_369 = lean_ctor_get(x_367, 0);
+lean_dec(x_369);
+x_370 = lean_name_eq(x_358, x_366);
 lean_dec(x_358);
-lean_ctor_set(x_359, 0, x_1);
-return x_359;
+if (x_370 == 0)
+{
+uint8_t x_371; 
+x_371 = !lean_is_exclusive(x_1);
+if (x_371 == 0)
+{
+lean_object* x_372; 
+x_372 = lean_ctor_get(x_1, 0);
+lean_dec(x_372);
+lean_ctor_set(x_1, 0, x_366);
+lean_ctor_set(x_367, 0, x_1);
+return x_367;
+}
+else
+{
+lean_object* x_373; 
+lean_dec(x_1);
+x_373 = lean_alloc_ctor(5, 1, 0);
+lean_ctor_set(x_373, 0, x_366);
+lean_ctor_set(x_367, 0, x_373);
+return x_367;
 }
 }
 else
 {
-lean_object* x_366; uint8_t x_367; 
-x_366 = lean_ctor_get(x_359, 1);
-lean_inc(x_366);
-lean_dec(x_359);
-x_367 = lean_name_eq(x_351, x_358);
-lean_dec(x_351);
-if (x_367 == 0)
+lean_dec(x_366);
+lean_ctor_set(x_367, 0, x_1);
+return x_367;
+}
+}
+else
 {
-lean_object* x_368; lean_object* x_369; lean_object* x_370; 
+lean_object* x_374; uint8_t x_375; 
+x_374 = lean_ctor_get(x_367, 1);
+lean_inc(x_374);
+lean_dec(x_367);
+x_375 = lean_name_eq(x_358, x_366);
+lean_dec(x_358);
+if (x_375 == 0)
+{
+lean_object* x_376; lean_object* x_377; lean_object* x_378; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_368 = x_1;
+ x_376 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_368 = lean_box(0);
+ x_376 = lean_box(0);
 }
-if (lean_is_scalar(x_368)) {
- x_369 = lean_alloc_ctor(5, 1, 0);
+if (lean_is_scalar(x_376)) {
+ x_377 = lean_alloc_ctor(5, 1, 0);
 } else {
- x_369 = x_368;
+ x_377 = x_376;
 }
-lean_ctor_set(x_369, 0, x_358);
-x_370 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_370, 0, x_369);
-lean_ctor_set(x_370, 1, x_366);
-return x_370;
+lean_ctor_set(x_377, 0, x_366);
+x_378 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_378, 0, x_377);
+lean_ctor_set(x_378, 1, x_374);
+return x_378;
 }
 else
 {
-lean_object* x_371; 
-lean_dec(x_358);
-x_371 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_371, 0, x_1);
-lean_ctor_set(x_371, 1, x_366);
-return x_371;
+lean_object* x_379; 
+lean_dec(x_366);
+x_379 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_379, 0, x_1);
+lean_ctor_set(x_379, 1, x_374);
+return x_379;
 }
 }
 }
 default: 
 {
-lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; uint8_t x_377; 
+lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; uint8_t x_385; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_372 = lean_ctor_get(x_34, 1);
-lean_inc(x_372);
+x_380 = lean_ctor_get(x_34, 1);
+lean_inc(x_380);
 lean_dec(x_34);
-x_373 = lean_ctor_get(x_1, 0);
-lean_inc(x_373);
-x_374 = lean_st_ref_get(x_6, x_372);
+x_381 = lean_ctor_get(x_1, 0);
+lean_inc(x_381);
+x_382 = lean_st_ref_get(x_6, x_380);
 lean_dec(x_6);
-x_375 = lean_ctor_get(x_374, 1);
-lean_inc(x_375);
-lean_dec(x_374);
-x_376 = lean_st_ref_get(x_3, x_375);
+x_383 = lean_ctor_get(x_382, 1);
+lean_inc(x_383);
+lean_dec(x_382);
+x_384 = lean_st_ref_get(x_3, x_383);
 lean_dec(x_3);
-x_377 = !lean_is_exclusive(x_376);
-if (x_377 == 0)
+x_385 = !lean_is_exclusive(x_384);
+if (x_385 == 0)
 {
-lean_object* x_378; lean_object* x_379; lean_object* x_380; size_t x_381; size_t x_382; uint8_t x_383; 
-x_378 = lean_ctor_get(x_376, 0);
-x_379 = lean_ctor_get(x_378, 0);
-lean_inc(x_379);
-lean_dec(x_378);
-lean_inc(x_373);
-x_380 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_379, x_373);
-x_381 = lean_ptr_addr(x_373);
-lean_dec(x_373);
-x_382 = lean_ptr_addr(x_380);
-x_383 = lean_usize_dec_eq(x_381, x_382);
-if (x_383 == 0)
-{
-uint8_t x_384; 
-x_384 = !lean_is_exclusive(x_1);
-if (x_384 == 0)
-{
-lean_object* x_385; 
-x_385 = lean_ctor_get(x_1, 0);
-lean_dec(x_385);
-lean_ctor_set(x_1, 0, x_380);
-lean_ctor_set(x_376, 0, x_1);
-return x_376;
-}
-else
-{
-lean_object* x_386; 
-lean_dec(x_1);
-x_386 = lean_alloc_ctor(6, 1, 0);
-lean_ctor_set(x_386, 0, x_380);
-lean_ctor_set(x_376, 0, x_386);
-return x_376;
-}
-}
-else
-{
-lean_dec(x_380);
-lean_ctor_set(x_376, 0, x_1);
-return x_376;
-}
-}
-else
-{
-lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; size_t x_391; size_t x_392; uint8_t x_393; 
-x_387 = lean_ctor_get(x_376, 0);
-x_388 = lean_ctor_get(x_376, 1);
-lean_inc(x_388);
+lean_object* x_386; lean_object* x_387; uint8_t x_388; lean_object* x_389; size_t x_390; size_t x_391; uint8_t x_392; 
+x_386 = lean_ctor_get(x_384, 0);
+x_387 = lean_ctor_get(x_386, 0);
 lean_inc(x_387);
-lean_dec(x_376);
-x_389 = lean_ctor_get(x_387, 0);
-lean_inc(x_389);
-lean_dec(x_387);
-lean_inc(x_373);
-x_390 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_389, x_373);
-x_391 = lean_ptr_addr(x_373);
-lean_dec(x_373);
-x_392 = lean_ptr_addr(x_390);
-x_393 = lean_usize_dec_eq(x_391, x_392);
+lean_dec(x_386);
+x_388 = 0;
+lean_inc(x_381);
+x_389 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_387, x_388, x_381);
+x_390 = lean_ptr_addr(x_381);
+lean_dec(x_381);
+x_391 = lean_ptr_addr(x_389);
+x_392 = lean_usize_dec_eq(x_390, x_391);
+if (x_392 == 0)
+{
+uint8_t x_393; 
+x_393 = !lean_is_exclusive(x_1);
 if (x_393 == 0)
 {
-lean_object* x_394; lean_object* x_395; lean_object* x_396; 
+lean_object* x_394; 
+x_394 = lean_ctor_get(x_1, 0);
+lean_dec(x_394);
+lean_ctor_set(x_1, 0, x_389);
+lean_ctor_set(x_384, 0, x_1);
+return x_384;
+}
+else
+{
+lean_object* x_395; 
+lean_dec(x_1);
+x_395 = lean_alloc_ctor(6, 1, 0);
+lean_ctor_set(x_395, 0, x_389);
+lean_ctor_set(x_384, 0, x_395);
+return x_384;
+}
+}
+else
+{
+lean_dec(x_389);
+lean_ctor_set(x_384, 0, x_1);
+return x_384;
+}
+}
+else
+{
+lean_object* x_396; lean_object* x_397; lean_object* x_398; uint8_t x_399; lean_object* x_400; size_t x_401; size_t x_402; uint8_t x_403; 
+x_396 = lean_ctor_get(x_384, 0);
+x_397 = lean_ctor_get(x_384, 1);
+lean_inc(x_397);
+lean_inc(x_396);
+lean_dec(x_384);
+x_398 = lean_ctor_get(x_396, 0);
+lean_inc(x_398);
+lean_dec(x_396);
+x_399 = 0;
+lean_inc(x_381);
+x_400 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_398, x_399, x_381);
+x_401 = lean_ptr_addr(x_381);
+lean_dec(x_381);
+x_402 = lean_ptr_addr(x_400);
+x_403 = lean_usize_dec_eq(x_401, x_402);
+if (x_403 == 0)
+{
+lean_object* x_404; lean_object* x_405; lean_object* x_406; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_394 = x_1;
+ x_404 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_394 = lean_box(0);
+ x_404 = lean_box(0);
 }
-if (lean_is_scalar(x_394)) {
- x_395 = lean_alloc_ctor(6, 1, 0);
+if (lean_is_scalar(x_404)) {
+ x_405 = lean_alloc_ctor(6, 1, 0);
 } else {
- x_395 = x_394;
+ x_405 = x_404;
 }
-lean_ctor_set(x_395, 0, x_390);
-x_396 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_396, 0, x_395);
-lean_ctor_set(x_396, 1, x_388);
-return x_396;
+lean_ctor_set(x_405, 0, x_400);
+x_406 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_406, 0, x_405);
+lean_ctor_set(x_406, 1, x_397);
+return x_406;
 }
 else
 {
-lean_object* x_397; 
-lean_dec(x_390);
-x_397 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_397, 0, x_1);
-lean_ctor_set(x_397, 1, x_388);
-return x_397;
+lean_object* x_407; 
+lean_dec(x_400);
+x_407 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_407, 0, x_1);
+lean_ctor_set(x_407, 1, x_397);
+return x_407;
 }
 }
 }
@@ -26846,1632 +26974,1641 @@ return x_397;
 }
 else
 {
-lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; 
+lean_object* x_408; lean_object* x_409; lean_object* x_410; lean_object* x_411; 
 lean_dec(x_5);
-x_398 = lean_unsigned_to_nat(1u);
-x_399 = lean_nat_add(x_11, x_398);
+x_408 = lean_unsigned_to_nat(1u);
+x_409 = lean_nat_add(x_11, x_408);
 lean_dec(x_11);
-x_400 = lean_alloc_ctor(0, 11, 0);
-lean_ctor_set(x_400, 0, x_8);
-lean_ctor_set(x_400, 1, x_9);
-lean_ctor_set(x_400, 2, x_10);
-lean_ctor_set(x_400, 3, x_399);
-lean_ctor_set(x_400, 4, x_12);
-lean_ctor_set(x_400, 5, x_13);
-lean_ctor_set(x_400, 6, x_14);
-lean_ctor_set(x_400, 7, x_15);
-lean_ctor_set(x_400, 8, x_16);
-lean_ctor_set(x_400, 9, x_17);
-lean_ctor_set(x_400, 10, x_18);
-x_401 = l_Lean_Compiler_LCNF_Simp_incVisited___rarg(x_3, x_4, x_400, x_6, x_7);
+x_410 = lean_alloc_ctor(0, 11, 0);
+lean_ctor_set(x_410, 0, x_8);
+lean_ctor_set(x_410, 1, x_9);
+lean_ctor_set(x_410, 2, x_10);
+lean_ctor_set(x_410, 3, x_409);
+lean_ctor_set(x_410, 4, x_12);
+lean_ctor_set(x_410, 5, x_13);
+lean_ctor_set(x_410, 6, x_14);
+lean_ctor_set(x_410, 7, x_15);
+lean_ctor_set(x_410, 8, x_16);
+lean_ctor_set(x_410, 9, x_17);
+lean_ctor_set(x_410, 10, x_18);
+x_411 = l_Lean_Compiler_LCNF_Simp_incVisited___rarg(x_3, x_4, x_410, x_6, x_7);
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; lean_object* x_409; lean_object* x_410; 
-x_402 = lean_ctor_get(x_401, 1);
-lean_inc(x_402);
-lean_dec(x_401);
-x_403 = lean_ctor_get(x_1, 0);
-lean_inc(x_403);
-x_404 = lean_ctor_get(x_1, 1);
-lean_inc(x_404);
-lean_inc(x_403);
-x_405 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_403, x_2, x_3, x_4, x_400, x_6, x_402);
-x_406 = lean_ctor_get(x_405, 0);
-lean_inc(x_406);
-x_407 = lean_ctor_get(x_405, 1);
-lean_inc(x_407);
-lean_dec(x_405);
-x_408 = lean_ctor_get(x_406, 3);
-lean_inc(x_408);
-x_409 = l_Lean_Compiler_LCNF_Simp_simpValue_x3f(x_408, x_2, x_3, x_4, x_400, x_6, x_407);
-x_410 = lean_ctor_get(x_409, 0);
-lean_inc(x_410);
-if (lean_obj_tag(x_410) == 0)
-{
-lean_object* x_411; lean_object* x_412; lean_object* x_413; 
-x_411 = lean_ctor_get(x_409, 1);
-lean_inc(x_411);
-lean_dec(x_409);
-x_412 = lean_box(0);
-x_413 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_404, x_403, x_1, x_406, x_412, x_2, x_3, x_4, x_400, x_6, x_411);
-return x_413;
-}
-else
-{
-lean_object* x_414; lean_object* x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; 
-x_414 = lean_ctor_get(x_409, 1);
+lean_object* x_412; lean_object* x_413; lean_object* x_414; uint8_t x_415; lean_object* x_416; lean_object* x_417; lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; 
+x_412 = lean_ctor_get(x_411, 1);
+lean_inc(x_412);
+lean_dec(x_411);
+x_413 = lean_ctor_get(x_1, 0);
+lean_inc(x_413);
+x_414 = lean_ctor_get(x_1, 1);
 lean_inc(x_414);
-lean_dec(x_409);
-x_415 = lean_ctor_get(x_410, 0);
-lean_inc(x_415);
-lean_dec(x_410);
-x_416 = l_Lean_Compiler_LCNF_LetDecl_updateValue(x_406, x_415, x_4, x_400, x_6, x_414);
+x_415 = 0;
+lean_inc(x_413);
+x_416 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_415, x_413, x_2, x_3, x_4, x_410, x_6, x_412);
 x_417 = lean_ctor_get(x_416, 0);
 lean_inc(x_417);
 x_418 = lean_ctor_get(x_416, 1);
 lean_inc(x_418);
 lean_dec(x_416);
-x_419 = lean_box(0);
-x_420 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_404, x_403, x_1, x_417, x_419, x_2, x_3, x_4, x_400, x_6, x_418);
-return x_420;
+x_419 = lean_ctor_get(x_417, 3);
+lean_inc(x_419);
+x_420 = l_Lean_Compiler_LCNF_Simp_simpValue_x3f(x_419, x_2, x_3, x_4, x_410, x_6, x_418);
+x_421 = lean_ctor_get(x_420, 0);
+lean_inc(x_421);
+if (lean_obj_tag(x_421) == 0)
+{
+lean_object* x_422; lean_object* x_423; lean_object* x_424; 
+x_422 = lean_ctor_get(x_420, 1);
+lean_inc(x_422);
+lean_dec(x_420);
+x_423 = lean_box(0);
+x_424 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_414, x_413, x_1, x_417, x_423, x_2, x_3, x_4, x_410, x_6, x_422);
+return x_424;
+}
+else
+{
+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_ctor_get(x_420, 1);
+lean_inc(x_425);
+lean_dec(x_420);
+x_426 = lean_ctor_get(x_421, 0);
+lean_inc(x_426);
+lean_dec(x_421);
+x_427 = l_Lean_Compiler_LCNF_LetDecl_updateValue(x_417, x_426, x_4, x_410, x_6, x_425);
+x_428 = lean_ctor_get(x_427, 0);
+lean_inc(x_428);
+x_429 = lean_ctor_get(x_427, 1);
+lean_inc(x_429);
+lean_dec(x_427);
+x_430 = lean_box(0);
+x_431 = l_Lean_Compiler_LCNF_Simp_simp___lambda__1(x_414, x_413, x_1, x_428, x_430, x_2, x_3, x_4, x_410, x_6, x_429);
+return x_431;
 }
 }
 case 1:
 {
-lean_object* x_421; lean_object* x_422; lean_object* x_423; lean_object* x_424; lean_object* x_425; lean_object* x_426; uint8_t x_427; 
-x_421 = lean_ctor_get(x_401, 1);
-lean_inc(x_421);
-lean_dec(x_401);
-x_422 = lean_ctor_get(x_1, 0);
-lean_inc(x_422);
-x_423 = lean_ctor_get(x_1, 1);
-lean_inc(x_423);
-x_424 = lean_ctor_get(x_422, 0);
-lean_inc(x_424);
-x_425 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_424, x_2, x_3, x_4, x_400, x_6, x_421);
-x_426 = lean_ctor_get(x_425, 0);
-lean_inc(x_426);
-x_427 = lean_unbox(x_426);
-if (x_427 == 0)
-{
-lean_object* x_428; lean_object* x_429; uint8_t x_430; 
-x_428 = lean_ctor_get(x_425, 1);
-lean_inc(x_428);
-lean_dec(x_425);
-lean_inc(x_1);
-lean_inc(x_422);
-x_429 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__3___boxed), 12, 4);
-lean_closure_set(x_429, 0, x_423);
-lean_closure_set(x_429, 1, x_422);
-lean_closure_set(x_429, 2, x_1);
-lean_closure_set(x_429, 3, x_426);
-x_430 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
-lean_dec(x_1);
-if (x_430 == 0)
-{
-lean_object* x_431; lean_object* x_432; 
-x_431 = lean_box(0);
-x_432 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_429, x_422, x_431, x_2, x_3, x_4, x_400, x_6, x_428);
-return x_432;
-}
-else
-{
-lean_object* x_433; lean_object* x_434; uint8_t x_435; 
-x_433 = lean_ctor_get(x_422, 3);
+lean_object* x_432; lean_object* x_433; lean_object* x_434; lean_object* x_435; lean_object* x_436; lean_object* x_437; uint8_t x_438; 
+x_432 = lean_ctor_get(x_411, 1);
+lean_inc(x_432);
+lean_dec(x_411);
+x_433 = lean_ctor_get(x_1, 0);
 lean_inc(x_433);
-x_434 = lean_ctor_get(x_422, 2);
+x_434 = lean_ctor_get(x_1, 1);
 lean_inc(x_434);
-x_435 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_433, x_434);
-lean_dec(x_434);
-if (x_435 == 0)
+x_435 = lean_ctor_get(x_433, 0);
+lean_inc(x_435);
+x_436 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_435, x_2, x_3, x_4, x_410, x_6, x_432);
+x_437 = lean_ctor_get(x_436, 0);
+lean_inc(x_437);
+x_438 = lean_unbox(x_437);
+if (x_438 == 0)
 {
-lean_object* x_436; lean_object* x_437; 
-x_436 = lean_box(0);
-x_437 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_429, x_422, x_436, x_2, x_3, x_4, x_400, x_6, x_428);
-return x_437;
-}
-else
-{
-lean_object* x_438; lean_object* x_439; lean_object* x_440; lean_object* x_441; lean_object* x_442; lean_object* x_443; lean_object* x_444; 
-x_438 = lean_st_ref_get(x_6, x_428);
-x_439 = lean_ctor_get(x_438, 1);
+lean_object* x_439; lean_object* x_440; uint8_t x_441; 
+x_439 = lean_ctor_get(x_436, 1);
 lean_inc(x_439);
-lean_dec(x_438);
-x_440 = lean_st_ref_get(x_3, x_439);
-x_441 = lean_ctor_get(x_440, 0);
-lean_inc(x_441);
-x_442 = lean_ctor_get(x_440, 1);
-lean_inc(x_442);
-lean_dec(x_440);
-x_443 = lean_ctor_get(x_441, 0);
-lean_inc(x_443);
-lean_dec(x_441);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-x_444 = l_Lean_Compiler_LCNF_normFunDeclImp(x_422, x_443, x_4, x_400, x_6, x_442);
-if (lean_obj_tag(x_444) == 0)
+lean_dec(x_436);
+lean_inc(x_1);
+lean_inc(x_433);
+x_440 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__3___boxed), 12, 4);
+lean_closure_set(x_440, 0, x_434);
+lean_closure_set(x_440, 1, x_433);
+lean_closure_set(x_440, 2, x_1);
+lean_closure_set(x_440, 3, x_437);
+x_441 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
+lean_dec(x_1);
+if (x_441 == 0)
 {
-lean_object* x_445; lean_object* x_446; lean_object* x_447; 
-x_445 = lean_ctor_get(x_444, 0);
+lean_object* x_442; lean_object* x_443; 
+x_442 = lean_box(0);
+x_443 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_440, x_433, x_442, x_2, x_3, x_4, x_410, x_6, x_439);
+return x_443;
+}
+else
+{
+lean_object* x_444; lean_object* x_445; uint8_t x_446; 
+x_444 = lean_ctor_get(x_433, 3);
+lean_inc(x_444);
+x_445 = lean_ctor_get(x_433, 2);
 lean_inc(x_445);
-x_446 = lean_ctor_get(x_444, 1);
-lean_inc(x_446);
-lean_dec(x_444);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-x_447 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_445, x_4, x_400, x_6, x_446);
-if (lean_obj_tag(x_447) == 0)
+x_446 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_444, x_445);
+lean_dec(x_445);
+if (x_446 == 0)
 {
-lean_object* x_448; lean_object* x_449; lean_object* x_450; lean_object* x_451; lean_object* x_452; lean_object* x_453; 
-x_448 = lean_ctor_get(x_447, 0);
-lean_inc(x_448);
-x_449 = lean_ctor_get(x_447, 1);
-lean_inc(x_449);
-lean_dec(x_447);
-x_450 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_400, x_6, x_449);
-x_451 = lean_ctor_get(x_450, 0);
-lean_inc(x_451);
-x_452 = lean_ctor_get(x_450, 1);
+lean_object* x_447; lean_object* x_448; 
+x_447 = lean_box(0);
+x_448 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_440, x_433, x_447, x_2, x_3, x_4, x_410, x_6, x_439);
+return x_448;
+}
+else
+{
+lean_object* x_449; lean_object* x_450; lean_object* x_451; lean_object* x_452; lean_object* x_453; lean_object* x_454; uint8_t x_455; lean_object* x_456; 
+x_449 = lean_st_ref_get(x_6, x_439);
+x_450 = lean_ctor_get(x_449, 1);
+lean_inc(x_450);
+lean_dec(x_449);
+x_451 = lean_st_ref_get(x_3, x_450);
+x_452 = lean_ctor_get(x_451, 0);
 lean_inc(x_452);
-lean_dec(x_450);
-x_453 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_429, x_448, x_451, x_2, x_3, x_4, x_400, x_6, x_452);
+x_453 = lean_ctor_get(x_451, 1);
+lean_inc(x_453);
 lean_dec(x_451);
-return x_453;
-}
-else
-{
-lean_object* x_454; lean_object* x_455; lean_object* x_456; lean_object* x_457; 
-lean_dec(x_429);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_454 = lean_ctor_get(x_447, 0);
+x_454 = lean_ctor_get(x_452, 0);
 lean_inc(x_454);
-x_455 = lean_ctor_get(x_447, 1);
-lean_inc(x_455);
-if (lean_is_exclusive(x_447)) {
- lean_ctor_release(x_447, 0);
- lean_ctor_release(x_447, 1);
- x_456 = x_447;
-} else {
- lean_dec_ref(x_447);
- x_456 = lean_box(0);
-}
-if (lean_is_scalar(x_456)) {
- x_457 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_457 = x_456;
-}
-lean_ctor_set(x_457, 0, x_454);
-lean_ctor_set(x_457, 1, x_455);
-return x_457;
-}
+lean_dec(x_452);
+x_455 = 0;
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+x_456 = l_Lean_Compiler_LCNF_normFunDeclImp(x_455, x_433, x_454, x_4, x_410, x_6, x_453);
+if (lean_obj_tag(x_456) == 0)
+{
+lean_object* x_457; lean_object* x_458; lean_object* x_459; 
+x_457 = lean_ctor_get(x_456, 0);
+lean_inc(x_457);
+x_458 = lean_ctor_get(x_456, 1);
+lean_inc(x_458);
+lean_dec(x_456);
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+x_459 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_457, x_4, x_410, x_6, x_458);
+if (lean_obj_tag(x_459) == 0)
+{
+lean_object* x_460; lean_object* x_461; lean_object* x_462; lean_object* x_463; lean_object* x_464; lean_object* x_465; 
+x_460 = lean_ctor_get(x_459, 0);
+lean_inc(x_460);
+x_461 = lean_ctor_get(x_459, 1);
+lean_inc(x_461);
+lean_dec(x_459);
+x_462 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_410, x_6, x_461);
+x_463 = lean_ctor_get(x_462, 0);
+lean_inc(x_463);
+x_464 = lean_ctor_get(x_462, 1);
+lean_inc(x_464);
+lean_dec(x_462);
+x_465 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_440, x_460, x_463, x_2, x_3, x_4, x_410, x_6, x_464);
+lean_dec(x_463);
+return x_465;
 }
 else
 {
-lean_object* x_458; lean_object* x_459; lean_object* x_460; lean_object* x_461; 
-lean_dec(x_429);
-lean_dec(x_400);
+lean_object* x_466; lean_object* x_467; lean_object* x_468; lean_object* x_469; 
+lean_dec(x_440);
+lean_dec(x_410);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_458 = lean_ctor_get(x_444, 0);
-lean_inc(x_458);
-x_459 = lean_ctor_get(x_444, 1);
-lean_inc(x_459);
-if (lean_is_exclusive(x_444)) {
- lean_ctor_release(x_444, 0);
- lean_ctor_release(x_444, 1);
- x_460 = x_444;
-} else {
- lean_dec_ref(x_444);
- x_460 = lean_box(0);
-}
-if (lean_is_scalar(x_460)) {
- x_461 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_461 = x_460;
-}
-lean_ctor_set(x_461, 0, x_458);
-lean_ctor_set(x_461, 1, x_459);
-return x_461;
-}
-}
-}
-}
-else
-{
-lean_object* x_462; lean_object* x_463; lean_object* x_464; lean_object* x_465; lean_object* x_466; lean_object* x_467; lean_object* x_468; lean_object* x_469; 
-x_462 = lean_ctor_get(x_425, 1);
-lean_inc(x_462);
-lean_dec(x_425);
-x_463 = lean_st_ref_get(x_6, x_462);
-x_464 = lean_ctor_get(x_463, 1);
-lean_inc(x_464);
-lean_dec(x_463);
-x_465 = lean_st_ref_get(x_3, x_464);
-x_466 = lean_ctor_get(x_465, 0);
+x_466 = lean_ctor_get(x_459, 0);
 lean_inc(x_466);
-x_467 = lean_ctor_get(x_465, 1);
+x_467 = lean_ctor_get(x_459, 1);
 lean_inc(x_467);
-lean_dec(x_465);
-x_468 = lean_ctor_get(x_466, 0);
-lean_inc(x_468);
-lean_dec(x_466);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-lean_inc(x_422);
-x_469 = l_Lean_Compiler_LCNF_normFunDeclImp(x_422, x_468, x_4, x_400, x_6, x_467);
-if (lean_obj_tag(x_469) == 0)
-{
-lean_object* x_470; lean_object* x_471; lean_object* x_472; uint8_t x_473; lean_object* x_474; 
-x_470 = lean_ctor_get(x_469, 0);
-lean_inc(x_470);
-x_471 = lean_ctor_get(x_469, 1);
-lean_inc(x_471);
-lean_dec(x_469);
-x_472 = lean_box(0);
-x_473 = lean_unbox(x_426);
-lean_dec(x_426);
-x_474 = l_Lean_Compiler_LCNF_Simp_simp___lambda__3(x_423, x_422, x_1, x_473, x_470, x_472, x_2, x_3, x_4, x_400, x_6, x_471);
-return x_474;
+if (lean_is_exclusive(x_459)) {
+ lean_ctor_release(x_459, 0);
+ lean_ctor_release(x_459, 1);
+ x_468 = x_459;
+} else {
+ lean_dec_ref(x_459);
+ x_468 = lean_box(0);
+}
+if (lean_is_scalar(x_468)) {
+ x_469 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_469 = x_468;
+}
+lean_ctor_set(x_469, 0, x_466);
+lean_ctor_set(x_469, 1, x_467);
+return x_469;
+}
 }
 else
 {
-lean_object* x_475; lean_object* x_476; lean_object* x_477; lean_object* x_478; 
-lean_dec(x_426);
-lean_dec(x_423);
-lean_dec(x_422);
-lean_dec(x_400);
+lean_object* x_470; lean_object* x_471; lean_object* x_472; lean_object* x_473; 
+lean_dec(x_440);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_470 = lean_ctor_get(x_456, 0);
+lean_inc(x_470);
+x_471 = lean_ctor_get(x_456, 1);
+lean_inc(x_471);
+if (lean_is_exclusive(x_456)) {
+ lean_ctor_release(x_456, 0);
+ lean_ctor_release(x_456, 1);
+ x_472 = x_456;
+} else {
+ lean_dec_ref(x_456);
+ x_472 = lean_box(0);
+}
+if (lean_is_scalar(x_472)) {
+ x_473 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_473 = x_472;
+}
+lean_ctor_set(x_473, 0, x_470);
+lean_ctor_set(x_473, 1, x_471);
+return x_473;
+}
+}
+}
+}
+else
+{
+lean_object* x_474; lean_object* x_475; lean_object* x_476; lean_object* x_477; lean_object* x_478; lean_object* x_479; lean_object* x_480; uint8_t x_481; lean_object* x_482; 
+x_474 = lean_ctor_get(x_436, 1);
+lean_inc(x_474);
+lean_dec(x_436);
+x_475 = lean_st_ref_get(x_6, x_474);
+x_476 = lean_ctor_get(x_475, 1);
+lean_inc(x_476);
+lean_dec(x_475);
+x_477 = lean_st_ref_get(x_3, x_476);
+x_478 = lean_ctor_get(x_477, 0);
+lean_inc(x_478);
+x_479 = lean_ctor_get(x_477, 1);
+lean_inc(x_479);
+lean_dec(x_477);
+x_480 = lean_ctor_get(x_478, 0);
+lean_inc(x_480);
+lean_dec(x_478);
+x_481 = 0;
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+lean_inc(x_433);
+x_482 = l_Lean_Compiler_LCNF_normFunDeclImp(x_481, x_433, x_480, x_4, x_410, x_6, x_479);
+if (lean_obj_tag(x_482) == 0)
+{
+lean_object* x_483; lean_object* x_484; lean_object* x_485; uint8_t x_486; lean_object* x_487; 
+x_483 = lean_ctor_get(x_482, 0);
+lean_inc(x_483);
+x_484 = lean_ctor_get(x_482, 1);
+lean_inc(x_484);
+lean_dec(x_482);
+x_485 = lean_box(0);
+x_486 = lean_unbox(x_437);
+lean_dec(x_437);
+x_487 = l_Lean_Compiler_LCNF_Simp_simp___lambda__3(x_434, x_433, x_1, x_486, x_483, x_485, x_2, x_3, x_4, x_410, x_6, x_484);
+return x_487;
+}
+else
+{
+lean_object* x_488; lean_object* x_489; lean_object* x_490; lean_object* x_491; 
+lean_dec(x_437);
+lean_dec(x_434);
+lean_dec(x_433);
+lean_dec(x_410);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_475 = lean_ctor_get(x_469, 0);
-lean_inc(x_475);
-x_476 = lean_ctor_get(x_469, 1);
-lean_inc(x_476);
-if (lean_is_exclusive(x_469)) {
- lean_ctor_release(x_469, 0);
- lean_ctor_release(x_469, 1);
- x_477 = x_469;
+x_488 = lean_ctor_get(x_482, 0);
+lean_inc(x_488);
+x_489 = lean_ctor_get(x_482, 1);
+lean_inc(x_489);
+if (lean_is_exclusive(x_482)) {
+ lean_ctor_release(x_482, 0);
+ lean_ctor_release(x_482, 1);
+ x_490 = x_482;
 } else {
- lean_dec_ref(x_469);
- x_477 = lean_box(0);
+ lean_dec_ref(x_482);
+ x_490 = lean_box(0);
 }
-if (lean_is_scalar(x_477)) {
- x_478 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_490)) {
+ x_491 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_478 = x_477;
+ x_491 = x_490;
 }
-lean_ctor_set(x_478, 0, x_475);
-lean_ctor_set(x_478, 1, x_476);
-return x_478;
+lean_ctor_set(x_491, 0, x_488);
+lean_ctor_set(x_491, 1, x_489);
+return x_491;
 }
 }
 }
 case 2:
 {
-lean_object* x_479; lean_object* x_480; lean_object* x_481; lean_object* x_482; lean_object* x_483; lean_object* x_484; uint8_t x_485; 
-x_479 = lean_ctor_get(x_401, 1);
-lean_inc(x_479);
-lean_dec(x_401);
-x_480 = lean_ctor_get(x_1, 0);
-lean_inc(x_480);
-x_481 = lean_ctor_get(x_1, 1);
-lean_inc(x_481);
-x_482 = lean_ctor_get(x_480, 0);
-lean_inc(x_482);
-x_483 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_482, x_2, x_3, x_4, x_400, x_6, x_479);
-x_484 = lean_ctor_get(x_483, 0);
-lean_inc(x_484);
-x_485 = lean_unbox(x_484);
-if (x_485 == 0)
-{
-lean_object* x_486; lean_object* x_487; uint8_t x_488; 
-x_486 = lean_ctor_get(x_483, 1);
-lean_inc(x_486);
-lean_dec(x_483);
-lean_inc(x_1);
-lean_inc(x_480);
-x_487 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__6___boxed), 12, 4);
-lean_closure_set(x_487, 0, x_481);
-lean_closure_set(x_487, 1, x_480);
-lean_closure_set(x_487, 2, x_1);
-lean_closure_set(x_487, 3, x_484);
-x_488 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
-lean_dec(x_1);
-if (x_488 == 0)
-{
-lean_object* x_489; lean_object* x_490; 
-x_489 = lean_box(0);
-x_490 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_487, x_480, x_489, x_2, x_3, x_4, x_400, x_6, x_486);
-return x_490;
-}
-else
-{
-lean_object* x_491; lean_object* x_492; uint8_t x_493; 
-x_491 = lean_ctor_get(x_480, 3);
-lean_inc(x_491);
-x_492 = lean_ctor_get(x_480, 2);
+lean_object* x_492; lean_object* x_493; lean_object* x_494; lean_object* x_495; lean_object* x_496; lean_object* x_497; uint8_t x_498; 
+x_492 = lean_ctor_get(x_411, 1);
 lean_inc(x_492);
-x_493 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_491, x_492);
-lean_dec(x_492);
-if (x_493 == 0)
-{
-lean_object* x_494; lean_object* x_495; 
-x_494 = lean_box(0);
-x_495 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_487, x_480, x_494, x_2, x_3, x_4, x_400, x_6, x_486);
-return x_495;
-}
-else
-{
-lean_object* x_496; lean_object* x_497; lean_object* x_498; lean_object* x_499; lean_object* x_500; lean_object* x_501; lean_object* x_502; 
-x_496 = lean_st_ref_get(x_6, x_486);
-x_497 = lean_ctor_get(x_496, 1);
+lean_dec(x_411);
+x_493 = lean_ctor_get(x_1, 0);
+lean_inc(x_493);
+x_494 = lean_ctor_get(x_1, 1);
+lean_inc(x_494);
+x_495 = lean_ctor_get(x_493, 0);
+lean_inc(x_495);
+x_496 = l_Lean_Compiler_LCNF_Simp_isOnceOrMustInline(x_495, x_2, x_3, x_4, x_410, x_6, x_492);
+x_497 = lean_ctor_get(x_496, 0);
 lean_inc(x_497);
-lean_dec(x_496);
-x_498 = lean_st_ref_get(x_3, x_497);
-x_499 = lean_ctor_get(x_498, 0);
+x_498 = lean_unbox(x_497);
+if (x_498 == 0)
+{
+lean_object* x_499; lean_object* x_500; uint8_t x_501; 
+x_499 = lean_ctor_get(x_496, 1);
 lean_inc(x_499);
-x_500 = lean_ctor_get(x_498, 1);
-lean_inc(x_500);
-lean_dec(x_498);
-x_501 = lean_ctor_get(x_499, 0);
-lean_inc(x_501);
-lean_dec(x_499);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-x_502 = l_Lean_Compiler_LCNF_normFunDeclImp(x_480, x_501, x_4, x_400, x_6, x_500);
-if (lean_obj_tag(x_502) == 0)
-{
-lean_object* x_503; lean_object* x_504; lean_object* x_505; 
-x_503 = lean_ctor_get(x_502, 0);
-lean_inc(x_503);
-x_504 = lean_ctor_get(x_502, 1);
-lean_inc(x_504);
-lean_dec(x_502);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-x_505 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_503, x_4, x_400, x_6, x_504);
-if (lean_obj_tag(x_505) == 0)
-{
-lean_object* x_506; lean_object* x_507; lean_object* x_508; lean_object* x_509; lean_object* x_510; lean_object* x_511; 
-x_506 = lean_ctor_get(x_505, 0);
-lean_inc(x_506);
-x_507 = lean_ctor_get(x_505, 1);
-lean_inc(x_507);
-lean_dec(x_505);
-x_508 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_400, x_6, x_507);
-x_509 = lean_ctor_get(x_508, 0);
-lean_inc(x_509);
-x_510 = lean_ctor_get(x_508, 1);
-lean_inc(x_510);
-lean_dec(x_508);
-x_511 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_487, x_506, x_509, x_2, x_3, x_4, x_400, x_6, x_510);
-lean_dec(x_509);
-return x_511;
-}
-else
-{
-lean_object* x_512; lean_object* x_513; lean_object* x_514; lean_object* x_515; 
-lean_dec(x_487);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_512 = lean_ctor_get(x_505, 0);
-lean_inc(x_512);
-x_513 = lean_ctor_get(x_505, 1);
-lean_inc(x_513);
-if (lean_is_exclusive(x_505)) {
- lean_ctor_release(x_505, 0);
- lean_ctor_release(x_505, 1);
- x_514 = x_505;
-} else {
- lean_dec_ref(x_505);
- x_514 = lean_box(0);
-}
-if (lean_is_scalar(x_514)) {
- x_515 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_515 = x_514;
-}
-lean_ctor_set(x_515, 0, x_512);
-lean_ctor_set(x_515, 1, x_513);
-return x_515;
-}
-}
-else
-{
-lean_object* x_516; lean_object* x_517; lean_object* x_518; lean_object* x_519; 
-lean_dec(x_487);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_516 = lean_ctor_get(x_502, 0);
-lean_inc(x_516);
-x_517 = lean_ctor_get(x_502, 1);
-lean_inc(x_517);
-if (lean_is_exclusive(x_502)) {
- lean_ctor_release(x_502, 0);
- lean_ctor_release(x_502, 1);
- x_518 = x_502;
-} else {
- lean_dec_ref(x_502);
- x_518 = lean_box(0);
-}
-if (lean_is_scalar(x_518)) {
- x_519 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_519 = x_518;
-}
-lean_ctor_set(x_519, 0, x_516);
-lean_ctor_set(x_519, 1, x_517);
-return x_519;
-}
-}
-}
-}
-else
-{
-lean_object* x_520; lean_object* x_521; lean_object* x_522; lean_object* x_523; lean_object* x_524; lean_object* x_525; lean_object* x_526; lean_object* x_527; 
-x_520 = lean_ctor_get(x_483, 1);
-lean_inc(x_520);
-lean_dec(x_483);
-x_521 = lean_st_ref_get(x_6, x_520);
-x_522 = lean_ctor_get(x_521, 1);
-lean_inc(x_522);
-lean_dec(x_521);
-x_523 = lean_st_ref_get(x_3, x_522);
-x_524 = lean_ctor_get(x_523, 0);
-lean_inc(x_524);
-x_525 = lean_ctor_get(x_523, 1);
-lean_inc(x_525);
-lean_dec(x_523);
-x_526 = lean_ctor_get(x_524, 0);
-lean_inc(x_526);
-lean_dec(x_524);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-lean_inc(x_480);
-x_527 = l_Lean_Compiler_LCNF_normFunDeclImp(x_480, x_526, x_4, x_400, x_6, x_525);
-if (lean_obj_tag(x_527) == 0)
-{
-lean_object* x_528; lean_object* x_529; lean_object* x_530; uint8_t x_531; lean_object* x_532; 
-x_528 = lean_ctor_get(x_527, 0);
-lean_inc(x_528);
-x_529 = lean_ctor_get(x_527, 1);
-lean_inc(x_529);
-lean_dec(x_527);
-x_530 = lean_box(0);
-x_531 = lean_unbox(x_484);
-lean_dec(x_484);
-x_532 = l_Lean_Compiler_LCNF_Simp_simp___lambda__6(x_481, x_480, x_1, x_531, x_528, x_530, x_2, x_3, x_4, x_400, x_6, x_529);
-return x_532;
-}
-else
-{
-lean_object* x_533; lean_object* x_534; lean_object* x_535; lean_object* x_536; 
-lean_dec(x_484);
-lean_dec(x_481);
-lean_dec(x_480);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
+lean_dec(x_496);
+lean_inc(x_1);
+lean_inc(x_493);
+x_500 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__6___boxed), 12, 4);
+lean_closure_set(x_500, 0, x_494);
+lean_closure_set(x_500, 1, x_493);
+lean_closure_set(x_500, 2, x_1);
+lean_closure_set(x_500, 3, x_497);
+x_501 = l_Lean_Compiler_LCNF_Code_isFun(x_1);
 lean_dec(x_1);
-x_533 = lean_ctor_get(x_527, 0);
-lean_inc(x_533);
-x_534 = lean_ctor_get(x_527, 1);
-lean_inc(x_534);
-if (lean_is_exclusive(x_527)) {
- lean_ctor_release(x_527, 0);
- lean_ctor_release(x_527, 1);
- x_535 = x_527;
-} else {
- lean_dec_ref(x_527);
- x_535 = lean_box(0);
-}
-if (lean_is_scalar(x_535)) {
- x_536 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_536 = x_535;
-}
-lean_ctor_set(x_536, 0, x_533);
-lean_ctor_set(x_536, 1, x_534);
-return x_536;
-}
-}
-}
-case 3:
+if (x_501 == 0)
 {
-lean_object* x_537; lean_object* x_538; lean_object* x_539; lean_object* x_540; 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_537 = lean_ctor_get(x_401, 1);
-lean_inc(x_537);
-lean_dec(x_401);
-x_538 = lean_ctor_get(x_1, 0);
+lean_object* x_502; lean_object* x_503; 
+x_502 = lean_box(0);
+x_503 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_500, x_493, x_502, x_2, x_3, x_4, x_410, x_6, x_499);
+return x_503;
+}
+else
+{
+lean_object* x_504; lean_object* x_505; uint8_t x_506; 
+x_504 = lean_ctor_get(x_493, 3);
+lean_inc(x_504);
+x_505 = lean_ctor_get(x_493, 2);
+lean_inc(x_505);
+x_506 = l_Lean_Compiler_LCNF_isEtaExpandCandidateCore(x_504, x_505);
+lean_dec(x_505);
+if (x_506 == 0)
+{
+lean_object* x_507; lean_object* x_508; 
+x_507 = lean_box(0);
+x_508 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_500, x_493, x_507, x_2, x_3, x_4, x_410, x_6, x_499);
+return x_508;
+}
+else
+{
+lean_object* x_509; lean_object* x_510; lean_object* x_511; lean_object* x_512; lean_object* x_513; lean_object* x_514; uint8_t x_515; lean_object* x_516; 
+x_509 = lean_st_ref_get(x_6, x_499);
+x_510 = lean_ctor_get(x_509, 1);
+lean_inc(x_510);
+lean_dec(x_509);
+x_511 = lean_st_ref_get(x_3, x_510);
+x_512 = lean_ctor_get(x_511, 0);
+lean_inc(x_512);
+x_513 = lean_ctor_get(x_511, 1);
+lean_inc(x_513);
+lean_dec(x_511);
+x_514 = lean_ctor_get(x_512, 0);
+lean_inc(x_514);
+lean_dec(x_512);
+x_515 = 0;
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+x_516 = l_Lean_Compiler_LCNF_normFunDeclImp(x_515, x_493, x_514, x_4, x_410, x_6, x_513);
+if (lean_obj_tag(x_516) == 0)
+{
+lean_object* x_517; lean_object* x_518; lean_object* x_519; 
+x_517 = lean_ctor_get(x_516, 0);
+lean_inc(x_517);
+x_518 = lean_ctor_get(x_516, 1);
+lean_inc(x_518);
+lean_dec(x_516);
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+x_519 = l_Lean_Compiler_LCNF_FunDeclCore_etaExpand(x_517, x_4, x_410, x_6, x_518);
+if (lean_obj_tag(x_519) == 0)
+{
+lean_object* x_520; lean_object* x_521; lean_object* x_522; lean_object* x_523; lean_object* x_524; lean_object* x_525; 
+x_520 = lean_ctor_get(x_519, 0);
+lean_inc(x_520);
+x_521 = lean_ctor_get(x_519, 1);
+lean_inc(x_521);
+lean_dec(x_519);
+x_522 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_410, x_6, x_521);
+x_523 = lean_ctor_get(x_522, 0);
+lean_inc(x_523);
+x_524 = lean_ctor_get(x_522, 1);
+lean_inc(x_524);
+lean_dec(x_522);
+x_525 = l_Lean_Compiler_LCNF_Simp_simp___lambda__4(x_500, x_520, x_523, x_2, x_3, x_4, x_410, x_6, x_524);
+lean_dec(x_523);
+return x_525;
+}
+else
+{
+lean_object* x_526; lean_object* x_527; lean_object* x_528; lean_object* x_529; 
+lean_dec(x_500);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_526 = lean_ctor_get(x_519, 0);
+lean_inc(x_526);
+x_527 = lean_ctor_get(x_519, 1);
+lean_inc(x_527);
+if (lean_is_exclusive(x_519)) {
+ lean_ctor_release(x_519, 0);
+ lean_ctor_release(x_519, 1);
+ x_528 = x_519;
+} else {
+ lean_dec_ref(x_519);
+ x_528 = lean_box(0);
+}
+if (lean_is_scalar(x_528)) {
+ x_529 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_529 = x_528;
+}
+lean_ctor_set(x_529, 0, x_526);
+lean_ctor_set(x_529, 1, x_527);
+return x_529;
+}
+}
+else
+{
+lean_object* x_530; lean_object* x_531; lean_object* x_532; lean_object* x_533; 
+lean_dec(x_500);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_530 = lean_ctor_get(x_516, 0);
+lean_inc(x_530);
+x_531 = lean_ctor_get(x_516, 1);
+lean_inc(x_531);
+if (lean_is_exclusive(x_516)) {
+ lean_ctor_release(x_516, 0);
+ lean_ctor_release(x_516, 1);
+ x_532 = x_516;
+} else {
+ lean_dec_ref(x_516);
+ x_532 = lean_box(0);
+}
+if (lean_is_scalar(x_532)) {
+ x_533 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_533 = x_532;
+}
+lean_ctor_set(x_533, 0, x_530);
+lean_ctor_set(x_533, 1, x_531);
+return x_533;
+}
+}
+}
+}
+else
+{
+lean_object* x_534; lean_object* x_535; lean_object* x_536; lean_object* x_537; lean_object* x_538; lean_object* x_539; lean_object* x_540; uint8_t x_541; lean_object* x_542; 
+x_534 = lean_ctor_get(x_496, 1);
+lean_inc(x_534);
+lean_dec(x_496);
+x_535 = lean_st_ref_get(x_6, x_534);
+x_536 = lean_ctor_get(x_535, 1);
+lean_inc(x_536);
+lean_dec(x_535);
+x_537 = lean_st_ref_get(x_3, x_536);
+x_538 = lean_ctor_get(x_537, 0);
 lean_inc(x_538);
-x_539 = lean_ctor_get(x_1, 1);
+x_539 = lean_ctor_get(x_537, 1);
 lean_inc(x_539);
-x_540 = lean_st_ref_get(x_6, x_537);
-x_541 = lean_ctor_get(x_540, 1);
-lean_inc(x_541);
-lean_dec(x_540);
-x_542 = lean_st_ref_get(x_3, x_541);
+lean_dec(x_537);
+x_540 = lean_ctor_get(x_538, 0);
+lean_inc(x_540);
+lean_dec(x_538);
+x_541 = 0;
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+lean_inc(x_493);
+x_542 = l_Lean_Compiler_LCNF_normFunDeclImp(x_541, x_493, x_540, x_4, x_410, x_6, x_539);
+if (lean_obj_tag(x_542) == 0)
+{
+lean_object* x_543; lean_object* x_544; lean_object* x_545; uint8_t x_546; lean_object* x_547; 
 x_543 = lean_ctor_get(x_542, 0);
 lean_inc(x_543);
 x_544 = lean_ctor_get(x_542, 1);
 lean_inc(x_544);
 lean_dec(x_542);
-x_545 = lean_ctor_get(x_543, 0);
-lean_inc(x_545);
-lean_dec(x_543);
-lean_inc(x_538);
-x_546 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_545, x_538);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_539);
-x_547 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(x_539, x_2, x_3, x_4, x_400, x_6, x_544);
-if (lean_obj_tag(x_547) == 0)
+x_545 = lean_box(0);
+x_546 = lean_unbox(x_497);
+lean_dec(x_497);
+x_547 = l_Lean_Compiler_LCNF_Simp_simp___lambda__6(x_494, x_493, x_1, x_546, x_543, x_545, x_2, x_3, x_4, x_410, x_6, x_544);
+return x_547;
+}
+else
 {
-lean_object* x_548; lean_object* x_549; lean_object* x_550; lean_object* x_551; lean_object* x_564; 
-x_548 = lean_ctor_get(x_547, 0);
+lean_object* x_548; lean_object* x_549; lean_object* x_550; lean_object* x_551; 
+lean_dec(x_497);
+lean_dec(x_494);
+lean_dec(x_493);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_548 = lean_ctor_get(x_542, 0);
 lean_inc(x_548);
-x_549 = lean_ctor_get(x_547, 1);
+x_549 = lean_ctor_get(x_542, 1);
 lean_inc(x_549);
-if (lean_is_exclusive(x_547)) {
- lean_ctor_release(x_547, 0);
- lean_ctor_release(x_547, 1);
- x_550 = x_547;
+if (lean_is_exclusive(x_542)) {
+ lean_ctor_release(x_542, 0);
+ lean_ctor_release(x_542, 1);
+ x_550 = x_542;
 } else {
- lean_dec_ref(x_547);
+ lean_dec_ref(x_542);
  x_550 = lean_box(0);
 }
+if (lean_is_scalar(x_550)) {
+ x_551 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_551 = x_550;
+}
+lean_ctor_set(x_551, 0, x_548);
+lean_ctor_set(x_551, 1, x_549);
+return x_551;
+}
+}
+}
+case 3:
+{
+lean_object* x_552; lean_object* x_553; lean_object* x_554; lean_object* x_555; lean_object* x_556; lean_object* x_557; lean_object* x_558; lean_object* x_559; lean_object* x_560; uint8_t x_561; lean_object* x_562; lean_object* x_563; 
+x_552 = lean_ctor_get(x_411, 1);
+lean_inc(x_552);
+lean_dec(x_411);
+x_553 = lean_ctor_get(x_1, 0);
+lean_inc(x_553);
+x_554 = lean_ctor_get(x_1, 1);
+lean_inc(x_554);
+x_555 = lean_st_ref_get(x_6, x_552);
+x_556 = lean_ctor_get(x_555, 1);
+lean_inc(x_556);
+lean_dec(x_555);
+x_557 = lean_st_ref_get(x_3, x_556);
+x_558 = lean_ctor_get(x_557, 0);
+lean_inc(x_558);
+x_559 = lean_ctor_get(x_557, 1);
+lean_inc(x_559);
+lean_dec(x_557);
+x_560 = lean_ctor_get(x_558, 0);
+lean_inc(x_560);
+lean_dec(x_558);
+x_561 = 0;
+lean_inc(x_553);
+x_562 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_560, x_553, x_561);
 lean_inc(x_6);
-lean_inc(x_400);
+lean_inc(x_410);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_548);
-lean_inc(x_546);
-x_564 = l_Lean_Compiler_LCNF_Simp_inlineJp_x3f(x_546, x_548, x_2, x_3, x_4, x_400, x_6, x_549);
-if (lean_obj_tag(x_564) == 0)
+lean_inc(x_554);
+x_563 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(x_561, x_554, x_2, x_3, x_4, x_410, x_6, x_559);
+if (lean_obj_tag(x_563) == 0)
 {
-lean_object* x_565; 
-x_565 = lean_ctor_get(x_564, 0);
+lean_object* x_564; lean_object* x_565; lean_object* x_566; lean_object* x_567; lean_object* x_580; 
+x_564 = lean_ctor_get(x_563, 0);
+lean_inc(x_564);
+x_565 = lean_ctor_get(x_563, 1);
 lean_inc(x_565);
-if (lean_obj_tag(x_565) == 0)
+if (lean_is_exclusive(x_563)) {
+ lean_ctor_release(x_563, 0);
+ lean_ctor_release(x_563, 1);
+ x_566 = x_563;
+} else {
+ lean_dec_ref(x_563);
+ x_566 = lean_box(0);
+}
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+lean_inc(x_564);
+lean_inc(x_562);
+x_580 = l_Lean_Compiler_LCNF_Simp_inlineJp_x3f(x_562, x_564, x_2, x_3, x_4, x_410, x_6, x_565);
+if (lean_obj_tag(x_580) == 0)
 {
-lean_object* x_566; lean_object* x_567; lean_object* x_568; lean_object* x_569; lean_object* x_570; uint8_t x_571; 
-x_566 = lean_ctor_get(x_564, 1);
-lean_inc(x_566);
+lean_object* x_581; 
+x_581 = lean_ctor_get(x_580, 0);
+lean_inc(x_581);
+if (lean_obj_tag(x_581) == 0)
+{
+lean_object* x_582; lean_object* x_583; lean_object* x_584; lean_object* x_585; lean_object* x_586; uint8_t x_587; 
+x_582 = lean_ctor_get(x_580, 1);
+lean_inc(x_582);
+lean_dec(x_580);
+lean_inc(x_562);
+x_583 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_562, x_2, x_3, x_4, x_410, x_6, x_582);
+x_584 = lean_ctor_get(x_583, 1);
+lean_inc(x_584);
+lean_dec(x_583);
+x_585 = lean_array_get_size(x_564);
+x_586 = lean_unsigned_to_nat(0u);
+x_587 = lean_nat_dec_lt(x_586, x_585);
+if (x_587 == 0)
+{
+lean_dec(x_585);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_567 = x_584;
+goto block_579;
+}
+else
+{
+uint8_t x_588; 
+x_588 = lean_nat_dec_le(x_585, x_585);
+if (x_588 == 0)
+{
+lean_dec(x_585);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_567 = x_584;
+goto block_579;
+}
+else
+{
+size_t x_589; size_t x_590; lean_object* x_591; lean_object* x_592; lean_object* x_593; 
+x_589 = 0;
+x_590 = lean_usize_of_nat(x_585);
+lean_dec(x_585);
+x_591 = lean_box(0);
+x_592 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_markUsedCode___spec__1(x_564, x_589, x_590, x_591, x_2, x_3, x_4, x_410, x_6, x_584);
+lean_dec(x_6);
+lean_dec(x_410);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_593 = lean_ctor_get(x_592, 1);
+lean_inc(x_593);
+lean_dec(x_592);
+x_567 = x_593;
+goto block_579;
+}
+}
+}
+else
+{
+lean_object* x_594; lean_object* x_595; 
+lean_dec(x_566);
 lean_dec(x_564);
-lean_inc(x_546);
-x_567 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_546, x_2, x_3, x_4, x_400, x_6, x_566);
-x_568 = lean_ctor_get(x_567, 1);
-lean_inc(x_568);
-lean_dec(x_567);
-x_569 = lean_array_get_size(x_548);
-x_570 = lean_unsigned_to_nat(0u);
-x_571 = lean_nat_dec_lt(x_570, x_569);
-if (x_571 == 0)
-{
-lean_dec(x_569);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_551 = x_568;
-goto block_563;
-}
-else
-{
-uint8_t x_572; 
-x_572 = lean_nat_dec_le(x_569, x_569);
-if (x_572 == 0)
-{
-lean_dec(x_569);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_551 = x_568;
-goto block_563;
-}
-else
-{
-size_t x_573; size_t x_574; lean_object* x_575; lean_object* x_576; lean_object* x_577; 
-x_573 = 0;
-x_574 = lean_usize_of_nat(x_569);
-lean_dec(x_569);
-x_575 = lean_box(0);
-x_576 = l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Simp_markUsedCode___spec__1(x_548, x_573, x_574, x_575, x_2, x_3, x_4, x_400, x_6, x_568);
-lean_dec(x_6);
-lean_dec(x_400);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_577 = lean_ctor_get(x_576, 1);
-lean_inc(x_577);
-lean_dec(x_576);
-x_551 = x_577;
-goto block_563;
-}
-}
-}
-else
-{
-lean_object* x_578; lean_object* x_579; 
-lean_dec(x_550);
-lean_dec(x_548);
-lean_dec(x_546);
-lean_dec(x_539);
-lean_dec(x_538);
+lean_dec(x_562);
+lean_dec(x_554);
+lean_dec(x_553);
 lean_dec(x_1);
-x_578 = lean_ctor_get(x_564, 1);
-lean_inc(x_578);
-lean_dec(x_564);
-x_579 = lean_ctor_get(x_565, 0);
-lean_inc(x_579);
-lean_dec(x_565);
-x_1 = x_579;
-x_5 = x_400;
-x_7 = x_578;
+x_594 = lean_ctor_get(x_580, 1);
+lean_inc(x_594);
+lean_dec(x_580);
+x_595 = lean_ctor_get(x_581, 0);
+lean_inc(x_595);
+lean_dec(x_581);
+x_1 = x_595;
+x_5 = x_410;
+x_7 = x_594;
 goto _start;
 }
 }
 else
 {
-lean_object* x_581; lean_object* x_582; lean_object* x_583; lean_object* x_584; 
-lean_dec(x_550);
-lean_dec(x_548);
-lean_dec(x_546);
-lean_dec(x_539);
-lean_dec(x_538);
-lean_dec(x_400);
+lean_object* x_597; lean_object* x_598; lean_object* x_599; lean_object* x_600; 
+lean_dec(x_566);
+lean_dec(x_564);
+lean_dec(x_562);
+lean_dec(x_554);
+lean_dec(x_553);
+lean_dec(x_410);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_581 = lean_ctor_get(x_564, 0);
-lean_inc(x_581);
-x_582 = lean_ctor_get(x_564, 1);
-lean_inc(x_582);
-if (lean_is_exclusive(x_564)) {
- lean_ctor_release(x_564, 0);
- lean_ctor_release(x_564, 1);
- x_583 = x_564;
+x_597 = lean_ctor_get(x_580, 0);
+lean_inc(x_597);
+x_598 = lean_ctor_get(x_580, 1);
+lean_inc(x_598);
+if (lean_is_exclusive(x_580)) {
+ lean_ctor_release(x_580, 0);
+ lean_ctor_release(x_580, 1);
+ x_599 = x_580;
 } else {
- lean_dec_ref(x_564);
- x_583 = lean_box(0);
+ lean_dec_ref(x_580);
+ x_599 = lean_box(0);
 }
-if (lean_is_scalar(x_583)) {
- x_584 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_599)) {
+ x_600 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_584 = x_583;
+ x_600 = x_599;
 }
-lean_ctor_set(x_584, 0, x_581);
-lean_ctor_set(x_584, 1, x_582);
-return x_584;
+lean_ctor_set(x_600, 0, x_597);
+lean_ctor_set(x_600, 1, x_598);
+return x_600;
 }
-block_563:
+block_579:
 {
-uint8_t x_552; 
-x_552 = lean_name_eq(x_538, x_546);
-lean_dec(x_538);
-if (x_552 == 0)
+uint8_t x_568; 
+x_568 = lean_name_eq(x_553, x_562);
+lean_dec(x_553);
+if (x_568 == 0)
 {
-lean_object* x_553; lean_object* x_554; lean_object* x_555; 
-lean_dec(x_539);
+lean_object* x_569; lean_object* x_570; lean_object* x_571; 
+lean_dec(x_554);
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_553 = x_1;
+ x_569 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_553 = lean_box(0);
+ x_569 = lean_box(0);
 }
-if (lean_is_scalar(x_553)) {
- x_554 = lean_alloc_ctor(3, 2, 0);
+if (lean_is_scalar(x_569)) {
+ x_570 = lean_alloc_ctor(3, 2, 0);
 } else {
- x_554 = x_553;
+ x_570 = x_569;
 }
-lean_ctor_set(x_554, 0, x_546);
-lean_ctor_set(x_554, 1, x_548);
-if (lean_is_scalar(x_550)) {
- x_555 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_570, 0, x_562);
+lean_ctor_set(x_570, 1, x_564);
+if (lean_is_scalar(x_566)) {
+ x_571 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_555 = x_550;
+ x_571 = x_566;
 }
-lean_ctor_set(x_555, 0, x_554);
-lean_ctor_set(x_555, 1, x_551);
-return x_555;
+lean_ctor_set(x_571, 0, x_570);
+lean_ctor_set(x_571, 1, x_567);
+return x_571;
 }
 else
 {
-size_t x_556; size_t x_557; uint8_t x_558; 
-x_556 = lean_ptr_addr(x_539);
-lean_dec(x_539);
-x_557 = lean_ptr_addr(x_548);
-x_558 = lean_usize_dec_eq(x_556, x_557);
-if (x_558 == 0)
+size_t x_572; size_t x_573; uint8_t x_574; 
+x_572 = lean_ptr_addr(x_554);
+lean_dec(x_554);
+x_573 = lean_ptr_addr(x_564);
+x_574 = lean_usize_dec_eq(x_572, x_573);
+if (x_574 == 0)
 {
-lean_object* x_559; lean_object* x_560; lean_object* x_561; 
+lean_object* x_575; lean_object* x_576; lean_object* x_577; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
  lean_ctor_release(x_1, 1);
- x_559 = x_1;
+ x_575 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_559 = lean_box(0);
+ x_575 = lean_box(0);
 }
-if (lean_is_scalar(x_559)) {
- x_560 = lean_alloc_ctor(3, 2, 0);
+if (lean_is_scalar(x_575)) {
+ x_576 = lean_alloc_ctor(3, 2, 0);
 } else {
- x_560 = x_559;
+ x_576 = x_575;
 }
-lean_ctor_set(x_560, 0, x_546);
-lean_ctor_set(x_560, 1, x_548);
-if (lean_is_scalar(x_550)) {
- x_561 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_576, 0, x_562);
+lean_ctor_set(x_576, 1, x_564);
+if (lean_is_scalar(x_566)) {
+ x_577 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_561 = x_550;
+ x_577 = x_566;
 }
-lean_ctor_set(x_561, 0, x_560);
-lean_ctor_set(x_561, 1, x_551);
-return x_561;
+lean_ctor_set(x_577, 0, x_576);
+lean_ctor_set(x_577, 1, x_567);
+return x_577;
 }
 else
 {
-lean_object* x_562; 
-lean_dec(x_548);
-lean_dec(x_546);
-if (lean_is_scalar(x_550)) {
- x_562 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_578; 
+lean_dec(x_564);
+lean_dec(x_562);
+if (lean_is_scalar(x_566)) {
+ x_578 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_562 = x_550;
+ x_578 = x_566;
 }
-lean_ctor_set(x_562, 0, x_1);
-lean_ctor_set(x_562, 1, x_551);
-return x_562;
+lean_ctor_set(x_578, 0, x_1);
+lean_ctor_set(x_578, 1, x_567);
+return x_578;
 }
 }
 }
 }
 else
 {
-lean_object* x_585; lean_object* x_586; lean_object* x_587; lean_object* x_588; 
-lean_dec(x_546);
-lean_dec(x_539);
-lean_dec(x_538);
-lean_dec(x_400);
+lean_object* x_601; lean_object* x_602; lean_object* x_603; lean_object* x_604; 
+lean_dec(x_562);
+lean_dec(x_554);
+lean_dec(x_553);
+lean_dec(x_410);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_585 = lean_ctor_get(x_547, 0);
-lean_inc(x_585);
-x_586 = lean_ctor_get(x_547, 1);
-lean_inc(x_586);
-if (lean_is_exclusive(x_547)) {
- lean_ctor_release(x_547, 0);
- lean_ctor_release(x_547, 1);
- x_587 = x_547;
+x_601 = lean_ctor_get(x_563, 0);
+lean_inc(x_601);
+x_602 = lean_ctor_get(x_563, 1);
+lean_inc(x_602);
+if (lean_is_exclusive(x_563)) {
+ lean_ctor_release(x_563, 0);
+ lean_ctor_release(x_563, 1);
+ x_603 = x_563;
 } else {
- lean_dec_ref(x_547);
- x_587 = lean_box(0);
+ lean_dec_ref(x_563);
+ x_603 = lean_box(0);
 }
-if (lean_is_scalar(x_587)) {
- x_588 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_603)) {
+ x_604 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_588 = x_587;
+ x_604 = x_603;
 }
-lean_ctor_set(x_588, 0, x_585);
-lean_ctor_set(x_588, 1, x_586);
-return x_588;
+lean_ctor_set(x_604, 0, x_601);
+lean_ctor_set(x_604, 1, x_602);
+return x_604;
 }
 }
 case 4:
 {
-lean_object* x_589; lean_object* x_590; lean_object* x_591; 
-x_589 = lean_ctor_get(x_401, 1);
-lean_inc(x_589);
-lean_dec(x_401);
-x_590 = lean_ctor_get(x_1, 0);
-lean_inc(x_590);
-lean_inc(x_6);
-lean_inc(x_400);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_590);
-x_591 = l_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f(x_590, x_2, x_3, x_4, x_400, x_6, x_589);
-if (lean_obj_tag(x_591) == 0)
-{
-lean_object* x_592; 
-x_592 = lean_ctor_get(x_591, 0);
-lean_inc(x_592);
-if (lean_obj_tag(x_592) == 0)
-{
-lean_object* x_593; lean_object* x_594; lean_object* x_595; lean_object* x_596; lean_object* x_597; 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_593 = lean_ctor_get(x_591, 1);
-lean_inc(x_593);
-lean_dec(x_591);
-x_594 = lean_ctor_get(x_590, 0);
-lean_inc(x_594);
-x_595 = lean_ctor_get(x_590, 1);
-lean_inc(x_595);
-x_596 = lean_ctor_get(x_590, 2);
-lean_inc(x_596);
-x_597 = lean_ctor_get(x_590, 3);
-lean_inc(x_597);
-lean_inc(x_596);
-x_598 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__7___boxed), 8, 1);
-lean_closure_set(x_598, 0, x_596);
-x_599 = l_Lean_Compiler_LCNF_Simp_simp___closed__1;
-x_600 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
-lean_closure_set(x_600, 0, x_599);
-lean_closure_set(x_600, 1, x_598);
-lean_inc(x_1);
-lean_inc(x_596);
-lean_inc(x_590);
-x_601 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__10___boxed), 10, 3);
-lean_closure_set(x_601, 0, x_590);
-lean_closure_set(x_601, 1, x_596);
-lean_closure_set(x_601, 2, x_1);
-x_602 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___spec__1___rarg), 8, 2);
-lean_closure_set(x_602, 0, x_600);
-lean_closure_set(x_602, 1, x_601);
-lean_inc(x_590);
-x_603 = l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f(x_590, x_2, x_3, x_4, x_400, x_6, x_593);
-if (lean_is_exclusive(x_590)) {
- lean_ctor_release(x_590, 0);
- lean_ctor_release(x_590, 1);
- lean_ctor_release(x_590, 2);
- lean_ctor_release(x_590, 3);
- x_604 = x_590;
-} else {
- lean_dec_ref(x_590);
- x_604 = lean_box(0);
-}
-if (lean_obj_tag(x_603) == 0)
-{
-lean_object* x_605; 
-x_605 = lean_ctor_get(x_603, 0);
+lean_object* x_605; lean_object* x_606; lean_object* x_607; 
+x_605 = lean_ctor_get(x_411, 1);
 lean_inc(x_605);
-if (lean_obj_tag(x_605) == 0)
-{
-lean_object* x_606; 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; lean_object* x_614; lean_object* x_615; lean_object* x_616; 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; lean_object* x_624; 
-lean_dec(x_602);
-x_606 = lean_ctor_get(x_603, 1);
+lean_dec(x_411);
+x_606 = lean_ctor_get(x_1, 0);
 lean_inc(x_606);
-lean_dec(x_603);
-x_607 = lean_st_ref_get(x_6, x_606);
-x_608 = lean_ctor_get(x_607, 1);
-lean_inc(x_608);
-lean_dec(x_607);
-x_609 = lean_st_ref_get(x_3, x_608);
-x_610 = lean_ctor_get(x_609, 0);
-lean_inc(x_610);
-x_611 = lean_ctor_get(x_609, 1);
-lean_inc(x_611);
-lean_dec(x_609);
-x_612 = lean_ctor_get(x_610, 0);
-lean_inc(x_612);
-lean_dec(x_610);
-lean_inc(x_596);
-x_613 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_612, x_596);
-x_614 = lean_st_ref_get(x_6, x_611);
-x_615 = lean_ctor_get(x_614, 1);
-lean_inc(x_615);
-lean_dec(x_614);
-x_616 = lean_st_ref_get(x_3, x_615);
-x_617 = lean_ctor_get(x_616, 0);
-lean_inc(x_617);
-x_618 = lean_ctor_get(x_616, 1);
-lean_inc(x_618);
-lean_dec(x_616);
-x_619 = lean_ctor_get(x_617, 0);
-lean_inc(x_619);
-lean_dec(x_617);
-lean_inc(x_595);
-x_620 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_619, x_595);
-lean_inc(x_613);
-x_621 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_613, x_2, x_3, x_4, x_400, x_6, x_618);
-x_622 = lean_ctor_get(x_621, 1);
-lean_inc(x_622);
-lean_dec(x_621);
-lean_inc(x_613);
-x_623 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
-lean_closure_set(x_623, 0, x_613);
 lean_inc(x_6);
-lean_inc(x_400);
+lean_inc(x_410);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-lean_inc(x_597);
-x_624 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_597, x_623, x_2, x_3, x_4, x_400, x_6, x_622);
-if (lean_obj_tag(x_624) == 0)
+lean_inc(x_606);
+x_607 = l_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f(x_606, x_2, x_3, x_4, x_410, x_6, x_605);
+if (lean_obj_tag(x_607) == 0)
 {
-lean_object* x_625; lean_object* x_626; lean_object* x_627; lean_object* x_628; 
-x_625 = lean_ctor_get(x_624, 0);
-lean_inc(x_625);
-x_626 = lean_ctor_get(x_624, 1);
+lean_object* x_608; 
+x_608 = lean_ctor_get(x_607, 0);
+lean_inc(x_608);
+if (lean_obj_tag(x_608) == 0)
+{
+lean_object* x_609; lean_object* x_610; lean_object* x_611; lean_object* x_612; lean_object* x_613; lean_object* x_614; lean_object* x_615; lean_object* x_616; lean_object* x_617; lean_object* x_618; lean_object* x_619; lean_object* x_620; 
+x_609 = lean_ctor_get(x_607, 1);
+lean_inc(x_609);
+lean_dec(x_607);
+x_610 = lean_ctor_get(x_606, 0);
+lean_inc(x_610);
+x_611 = lean_ctor_get(x_606, 1);
+lean_inc(x_611);
+x_612 = lean_ctor_get(x_606, 2);
+lean_inc(x_612);
+x_613 = lean_ctor_get(x_606, 3);
+lean_inc(x_613);
+lean_inc(x_612);
+x_614 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__7___boxed), 8, 1);
+lean_closure_set(x_614, 0, x_612);
+x_615 = l_Lean_Compiler_LCNF_Simp_simp___closed__1;
+x_616 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
+lean_closure_set(x_616, 0, x_615);
+lean_closure_set(x_616, 1, x_614);
+lean_inc(x_1);
+lean_inc(x_612);
+lean_inc(x_606);
+x_617 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__10___boxed), 10, 3);
+lean_closure_set(x_617, 0, x_606);
+lean_closure_set(x_617, 1, x_612);
+lean_closure_set(x_617, 2, x_1);
+x_618 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___spec__1___rarg), 8, 2);
+lean_closure_set(x_618, 0, x_616);
+lean_closure_set(x_618, 1, x_617);
+lean_inc(x_606);
+x_619 = l_Lean_Compiler_LCNF_Simp_isCasesOnCases_x3f(x_606, x_2, x_3, x_4, x_410, x_6, x_609);
+if (lean_is_exclusive(x_606)) {
+ lean_ctor_release(x_606, 0);
+ lean_ctor_release(x_606, 1);
+ lean_ctor_release(x_606, 2);
+ lean_ctor_release(x_606, 3);
+ x_620 = x_606;
+} else {
+ lean_dec_ref(x_606);
+ x_620 = lean_box(0);
+}
+if (lean_obj_tag(x_619) == 0)
+{
+lean_object* x_621; 
+x_621 = lean_ctor_get(x_619, 0);
+lean_inc(x_621);
+if (lean_obj_tag(x_621) == 0)
+{
+lean_object* x_622; lean_object* x_623; lean_object* x_624; lean_object* x_625; lean_object* x_626; lean_object* x_627; lean_object* x_628; uint8_t x_629; lean_object* x_630; lean_object* x_631; lean_object* x_632; lean_object* x_633; lean_object* x_634; lean_object* x_635; 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_dec(x_618);
+x_622 = lean_ctor_get(x_619, 1);
+lean_inc(x_622);
+lean_dec(x_619);
+x_623 = lean_st_ref_get(x_6, x_622);
+x_624 = lean_ctor_get(x_623, 1);
+lean_inc(x_624);
+lean_dec(x_623);
+x_625 = lean_st_ref_get(x_3, x_624);
+x_626 = lean_ctor_get(x_625, 0);
 lean_inc(x_626);
-if (lean_is_exclusive(x_624)) {
- lean_ctor_release(x_624, 0);
- lean_ctor_release(x_624, 1);
- x_627 = x_624;
-} else {
- lean_dec_ref(x_624);
- x_627 = lean_box(0);
-}
-x_628 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_625, x_2, x_3, x_4, x_400, x_6, x_626);
-if (lean_obj_tag(x_628) == 0)
-{
-lean_object* x_629; lean_object* x_630; lean_object* x_631; lean_object* x_632; lean_object* x_654; lean_object* x_655; uint8_t x_666; 
-x_629 = lean_ctor_get(x_628, 0);
-lean_inc(x_629);
-x_630 = lean_ctor_get(x_628, 1);
+x_627 = lean_ctor_get(x_625, 1);
+lean_inc(x_627);
+lean_dec(x_625);
+x_628 = lean_ctor_get(x_626, 0);
+lean_inc(x_628);
+lean_dec(x_626);
+x_629 = 0;
+lean_inc(x_612);
+x_630 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_628, x_612, x_629);
+x_631 = lean_st_ref_get(x_6, x_627);
+x_632 = lean_ctor_get(x_631, 1);
+lean_inc(x_632);
+lean_dec(x_631);
+x_633 = lean_st_ref_get(x_3, x_632);
+x_634 = lean_ctor_get(x_633, 0);
+lean_inc(x_634);
+x_635 = lean_ctor_get(x_633, 1);
+lean_inc(x_635);
+lean_dec(x_633);
+x_636 = lean_ctor_get(x_634, 0);
+lean_inc(x_636);
+lean_dec(x_634);
+lean_inc(x_611);
+x_637 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_636, x_629, x_611);
 lean_inc(x_630);
-if (lean_is_exclusive(x_628)) {
- lean_ctor_release(x_628, 0);
- lean_ctor_release(x_628, 1);
- x_631 = x_628;
+x_638 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_630, x_2, x_3, x_4, x_410, x_6, x_635);
+x_639 = lean_ctor_get(x_638, 1);
+lean_inc(x_639);
+lean_dec(x_638);
+lean_inc(x_630);
+x_640 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_Simp_simp___lambda__9), 8, 1);
+lean_closure_set(x_640, 0, x_630);
+lean_inc(x_6);
+lean_inc(x_410);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+lean_inc(x_613);
+x_641 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simp___spec__6(x_613, x_640, x_2, x_3, x_4, x_410, x_6, x_639);
+if (lean_obj_tag(x_641) == 0)
+{
+lean_object* x_642; lean_object* x_643; lean_object* x_644; lean_object* x_645; 
+x_642 = lean_ctor_get(x_641, 0);
+lean_inc(x_642);
+x_643 = lean_ctor_get(x_641, 1);
+lean_inc(x_643);
+if (lean_is_exclusive(x_641)) {
+ lean_ctor_release(x_641, 0);
+ lean_ctor_release(x_641, 1);
+ x_644 = x_641;
 } else {
- lean_dec_ref(x_628);
- x_631 = lean_box(0);
+ lean_dec_ref(x_641);
+ x_644 = lean_box(0);
 }
-x_654 = lean_array_get_size(x_629);
-x_666 = lean_nat_dec_eq(x_654, x_398);
-if (x_666 == 0)
+x_645 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_addDefault(x_642, x_2, x_3, x_4, x_410, x_6, x_643);
+if (lean_obj_tag(x_645) == 0)
 {
-lean_object* x_667; 
-lean_dec(x_654);
-lean_dec(x_627);
-x_667 = lean_box(0);
-x_632 = x_667;
-goto block_653;
-}
-else
-{
-lean_object* x_668; uint8_t x_669; 
-x_668 = lean_unsigned_to_nat(0u);
-x_669 = lean_nat_dec_lt(x_668, x_654);
-if (x_669 == 0)
-{
-lean_object* x_670; lean_object* x_671; 
-x_670 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_671 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_670);
-if (lean_obj_tag(x_671) == 0)
-{
-lean_object* x_672; 
-lean_dec(x_671);
-lean_dec(x_654);
-lean_dec(x_627);
-x_672 = lean_box(0);
-x_632 = x_672;
-goto block_653;
-}
-else
-{
-lean_object* x_673; 
-lean_dec(x_671);
-lean_dec(x_631);
-lean_dec(x_620);
-lean_dec(x_613);
-lean_dec(x_604);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
-lean_dec(x_1);
-x_673 = lean_box(0);
-x_655 = x_673;
-goto block_665;
-}
-}
-else
-{
-lean_object* x_674; 
-x_674 = lean_array_fget(x_629, x_668);
-if (lean_obj_tag(x_674) == 0)
-{
-lean_object* x_675; 
-lean_dec(x_674);
-lean_dec(x_654);
-lean_dec(x_627);
-x_675 = lean_box(0);
-x_632 = x_675;
-goto block_653;
-}
-else
-{
-lean_object* x_676; 
-lean_dec(x_674);
-lean_dec(x_631);
-lean_dec(x_620);
-lean_dec(x_613);
-lean_dec(x_604);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
-lean_dec(x_1);
-x_676 = lean_box(0);
-x_655 = x_676;
-goto block_665;
-}
-}
-}
-block_653:
-{
-size_t x_633; size_t x_634; uint8_t x_635; 
-lean_dec(x_632);
-x_633 = lean_ptr_addr(x_597);
-lean_dec(x_597);
-x_634 = lean_ptr_addr(x_629);
-x_635 = lean_usize_dec_eq(x_633, x_634);
-if (x_635 == 0)
-{
-lean_object* x_636; lean_object* x_637; lean_object* x_638; lean_object* x_639; 
-lean_dec(x_596);
-lean_dec(x_595);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_636 = x_1;
+lean_object* x_646; lean_object* x_647; lean_object* x_648; lean_object* x_649; lean_object* x_671; lean_object* x_672; uint8_t x_683; 
+x_646 = lean_ctor_get(x_645, 0);
+lean_inc(x_646);
+x_647 = lean_ctor_get(x_645, 1);
+lean_inc(x_647);
+if (lean_is_exclusive(x_645)) {
+ lean_ctor_release(x_645, 0);
+ lean_ctor_release(x_645, 1);
+ x_648 = x_645;
 } else {
- lean_dec_ref(x_1);
- x_636 = lean_box(0);
-}
-if (lean_is_scalar(x_604)) {
- x_637 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_637 = x_604;
-}
-lean_ctor_set(x_637, 0, x_594);
-lean_ctor_set(x_637, 1, x_620);
-lean_ctor_set(x_637, 2, x_613);
-lean_ctor_set(x_637, 3, x_629);
-if (lean_is_scalar(x_636)) {
- x_638 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_638 = x_636;
-}
-lean_ctor_set(x_638, 0, x_637);
-if (lean_is_scalar(x_631)) {
- x_639 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_639 = x_631;
-}
-lean_ctor_set(x_639, 0, x_638);
-lean_ctor_set(x_639, 1, x_630);
-return x_639;
-}
-else
-{
-size_t x_640; size_t x_641; uint8_t x_642; 
-x_640 = lean_ptr_addr(x_595);
-lean_dec(x_595);
-x_641 = lean_ptr_addr(x_620);
-x_642 = lean_usize_dec_eq(x_640, x_641);
-if (x_642 == 0)
-{
-lean_object* x_643; lean_object* x_644; lean_object* x_645; lean_object* x_646; 
-lean_dec(x_596);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_643 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_643 = lean_box(0);
-}
-if (lean_is_scalar(x_604)) {
- x_644 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_644 = x_604;
-}
-lean_ctor_set(x_644, 0, x_594);
-lean_ctor_set(x_644, 1, x_620);
-lean_ctor_set(x_644, 2, x_613);
-lean_ctor_set(x_644, 3, x_629);
-if (lean_is_scalar(x_643)) {
- x_645 = lean_alloc_ctor(4, 1, 0);
-} else {
- x_645 = x_643;
-}
-lean_ctor_set(x_645, 0, x_644);
-if (lean_is_scalar(x_631)) {
- x_646 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_646 = x_631;
-}
-lean_ctor_set(x_646, 0, x_645);
-lean_ctor_set(x_646, 1, x_630);
-return x_646;
-}
-else
-{
-uint8_t x_647; 
-x_647 = lean_name_eq(x_596, x_613);
-lean_dec(x_596);
-if (x_647 == 0)
-{
-lean_object* x_648; lean_object* x_649; lean_object* x_650; lean_object* x_651; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_648 = x_1;
-} else {
- lean_dec_ref(x_1);
+ lean_dec_ref(x_645);
  x_648 = lean_box(0);
 }
-if (lean_is_scalar(x_604)) {
- x_649 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_649 = x_604;
+x_671 = lean_array_get_size(x_646);
+x_683 = lean_nat_dec_eq(x_671, x_408);
+if (x_683 == 0)
+{
+lean_object* x_684; 
+lean_dec(x_671);
+lean_dec(x_644);
+x_684 = lean_box(0);
+x_649 = x_684;
+goto block_670;
 }
-lean_ctor_set(x_649, 0, x_594);
-lean_ctor_set(x_649, 1, x_620);
-lean_ctor_set(x_649, 2, x_613);
-lean_ctor_set(x_649, 3, x_629);
+else
+{
+lean_object* x_685; uint8_t x_686; 
+x_685 = lean_unsigned_to_nat(0u);
+x_686 = lean_nat_dec_lt(x_685, x_671);
+if (x_686 == 0)
+{
+lean_object* x_687; lean_object* x_688; 
+x_687 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_688 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_687);
+if (lean_obj_tag(x_688) == 0)
+{
+lean_object* x_689; 
+lean_dec(x_688);
+lean_dec(x_671);
+lean_dec(x_644);
+x_689 = lean_box(0);
+x_649 = x_689;
+goto block_670;
+}
+else
+{
+lean_object* x_690; 
+lean_dec(x_688);
+lean_dec(x_648);
+lean_dec(x_637);
+lean_dec(x_630);
+lean_dec(x_620);
+lean_dec(x_613);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
+lean_dec(x_1);
+x_690 = lean_box(0);
+x_672 = x_690;
+goto block_682;
+}
+}
+else
+{
+lean_object* x_691; 
+x_691 = lean_array_fget(x_646, x_685);
+if (lean_obj_tag(x_691) == 0)
+{
+lean_object* x_692; 
+lean_dec(x_691);
+lean_dec(x_671);
+lean_dec(x_644);
+x_692 = lean_box(0);
+x_649 = x_692;
+goto block_670;
+}
+else
+{
+lean_object* x_693; 
+lean_dec(x_691);
+lean_dec(x_648);
+lean_dec(x_637);
+lean_dec(x_630);
+lean_dec(x_620);
+lean_dec(x_613);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
+lean_dec(x_1);
+x_693 = lean_box(0);
+x_672 = x_693;
+goto block_682;
+}
+}
+}
+block_670:
+{
+size_t x_650; size_t x_651; uint8_t x_652; 
+lean_dec(x_649);
+x_650 = lean_ptr_addr(x_613);
+lean_dec(x_613);
+x_651 = lean_ptr_addr(x_646);
+x_652 = lean_usize_dec_eq(x_650, x_651);
+if (x_652 == 0)
+{
+lean_object* x_653; lean_object* x_654; lean_object* x_655; lean_object* x_656; 
+lean_dec(x_612);
+lean_dec(x_611);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_653 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_653 = lean_box(0);
+}
+if (lean_is_scalar(x_620)) {
+ x_654 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_654 = x_620;
+}
+lean_ctor_set(x_654, 0, x_610);
+lean_ctor_set(x_654, 1, x_637);
+lean_ctor_set(x_654, 2, x_630);
+lean_ctor_set(x_654, 3, x_646);
+if (lean_is_scalar(x_653)) {
+ x_655 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_655 = x_653;
+}
+lean_ctor_set(x_655, 0, x_654);
 if (lean_is_scalar(x_648)) {
- x_650 = lean_alloc_ctor(4, 1, 0);
+ x_656 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_650 = x_648;
+ x_656 = x_648;
 }
-lean_ctor_set(x_650, 0, x_649);
-if (lean_is_scalar(x_631)) {
- x_651 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_651 = x_631;
-}
-lean_ctor_set(x_651, 0, x_650);
-lean_ctor_set(x_651, 1, x_630);
-return x_651;
+lean_ctor_set(x_656, 0, x_655);
+lean_ctor_set(x_656, 1, x_647);
+return x_656;
 }
 else
 {
-lean_object* x_652; 
-lean_dec(x_629);
+size_t x_657; size_t x_658; uint8_t x_659; 
+x_657 = lean_ptr_addr(x_611);
+lean_dec(x_611);
+x_658 = lean_ptr_addr(x_637);
+x_659 = lean_usize_dec_eq(x_657, x_658);
+if (x_659 == 0)
+{
+lean_object* x_660; lean_object* x_661; lean_object* x_662; lean_object* x_663; 
+lean_dec(x_612);
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_660 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_660 = lean_box(0);
+}
+if (lean_is_scalar(x_620)) {
+ x_661 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_661 = x_620;
+}
+lean_ctor_set(x_661, 0, x_610);
+lean_ctor_set(x_661, 1, x_637);
+lean_ctor_set(x_661, 2, x_630);
+lean_ctor_set(x_661, 3, x_646);
+if (lean_is_scalar(x_660)) {
+ x_662 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_662 = x_660;
+}
+lean_ctor_set(x_662, 0, x_661);
+if (lean_is_scalar(x_648)) {
+ x_663 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_663 = x_648;
+}
+lean_ctor_set(x_663, 0, x_662);
+lean_ctor_set(x_663, 1, x_647);
+return x_663;
+}
+else
+{
+uint8_t x_664; 
+x_664 = lean_name_eq(x_612, x_630);
+lean_dec(x_612);
+if (x_664 == 0)
+{
+lean_object* x_665; lean_object* x_666; lean_object* x_667; lean_object* x_668; 
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_665 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_665 = lean_box(0);
+}
+if (lean_is_scalar(x_620)) {
+ x_666 = lean_alloc_ctor(0, 4, 0);
+} else {
+ x_666 = x_620;
+}
+lean_ctor_set(x_666, 0, x_610);
+lean_ctor_set(x_666, 1, x_637);
+lean_ctor_set(x_666, 2, x_630);
+lean_ctor_set(x_666, 3, x_646);
+if (lean_is_scalar(x_665)) {
+ x_667 = lean_alloc_ctor(4, 1, 0);
+} else {
+ x_667 = x_665;
+}
+lean_ctor_set(x_667, 0, x_666);
+if (lean_is_scalar(x_648)) {
+ x_668 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_668 = x_648;
+}
+lean_ctor_set(x_668, 0, x_667);
+lean_ctor_set(x_668, 1, x_647);
+return x_668;
+}
+else
+{
+lean_object* x_669; 
+lean_dec(x_646);
+lean_dec(x_637);
+lean_dec(x_630);
+lean_dec(x_620);
+lean_dec(x_610);
+if (lean_is_scalar(x_648)) {
+ x_669 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_669 = x_648;
+}
+lean_ctor_set(x_669, 0, x_1);
+lean_ctor_set(x_669, 1, x_647);
+return x_669;
+}
+}
+}
+}
+block_682:
+{
+lean_object* x_673; uint8_t x_674; 
+lean_dec(x_672);
+x_673 = lean_unsigned_to_nat(0u);
+x_674 = lean_nat_dec_lt(x_673, x_671);
+lean_dec(x_671);
+if (x_674 == 0)
+{
+lean_object* x_675; lean_object* x_676; lean_object* x_677; lean_object* x_678; 
+lean_dec(x_646);
+x_675 = l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4;
+x_676 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_675);
+x_677 = l_Lean_Compiler_LCNF_AltCore_getCode(x_676);
+lean_dec(x_676);
+if (lean_is_scalar(x_644)) {
+ x_678 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_678 = x_644;
+}
+lean_ctor_set(x_678, 0, x_677);
+lean_ctor_set(x_678, 1, x_647);
+return x_678;
+}
+else
+{
+lean_object* x_679; lean_object* x_680; lean_object* x_681; 
+x_679 = lean_array_fget(x_646, x_673);
+lean_dec(x_646);
+x_680 = l_Lean_Compiler_LCNF_AltCore_getCode(x_679);
+lean_dec(x_679);
+if (lean_is_scalar(x_644)) {
+ x_681 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_681 = x_644;
+}
+lean_ctor_set(x_681, 0, x_680);
+lean_ctor_set(x_681, 1, x_647);
+return x_681;
+}
+}
+}
+else
+{
+lean_object* x_694; lean_object* x_695; lean_object* x_696; lean_object* x_697; 
+lean_dec(x_644);
+lean_dec(x_637);
+lean_dec(x_630);
 lean_dec(x_620);
 lean_dec(x_613);
-lean_dec(x_604);
-lean_dec(x_594);
-if (lean_is_scalar(x_631)) {
- x_652 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_652 = x_631;
-}
-lean_ctor_set(x_652, 0, x_1);
-lean_ctor_set(x_652, 1, x_630);
-return x_652;
-}
-}
-}
-}
-block_665:
-{
-lean_object* x_656; uint8_t x_657; 
-lean_dec(x_655);
-x_656 = lean_unsigned_to_nat(0u);
-x_657 = lean_nat_dec_lt(x_656, x_654);
-lean_dec(x_654);
-if (x_657 == 0)
-{
-lean_object* x_658; lean_object* x_659; lean_object* x_660; lean_object* x_661; 
-lean_dec(x_629);
-x_658 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4;
-x_659 = l_panic___at___private_Lean_Compiler_LCNF_Basic_0__Lean_Compiler_LCNF_updateAltImp___spec__1(x_658);
-x_660 = l_Lean_Compiler_LCNF_AltCore_getCode(x_659);
-lean_dec(x_659);
-if (lean_is_scalar(x_627)) {
- x_661 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_661 = x_627;
-}
-lean_ctor_set(x_661, 0, x_660);
-lean_ctor_set(x_661, 1, x_630);
-return x_661;
-}
-else
-{
-lean_object* x_662; lean_object* x_663; lean_object* x_664; 
-x_662 = lean_array_fget(x_629, x_656);
-lean_dec(x_629);
-x_663 = l_Lean_Compiler_LCNF_AltCore_getCode(x_662);
-lean_dec(x_662);
-if (lean_is_scalar(x_627)) {
- x_664 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_664 = x_627;
-}
-lean_ctor_set(x_664, 0, x_663);
-lean_ctor_set(x_664, 1, x_630);
-return x_664;
-}
-}
-}
-else
-{
-lean_object* x_677; lean_object* x_678; lean_object* x_679; lean_object* x_680; 
-lean_dec(x_627);
-lean_dec(x_620);
-lean_dec(x_613);
-lean_dec(x_604);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
 lean_dec(x_1);
-x_677 = lean_ctor_get(x_628, 0);
-lean_inc(x_677);
-x_678 = lean_ctor_get(x_628, 1);
-lean_inc(x_678);
-if (lean_is_exclusive(x_628)) {
- lean_ctor_release(x_628, 0);
- lean_ctor_release(x_628, 1);
- x_679 = x_628;
-} else {
- lean_dec_ref(x_628);
- x_679 = lean_box(0);
-}
-if (lean_is_scalar(x_679)) {
- x_680 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_680 = x_679;
-}
-lean_ctor_set(x_680, 0, x_677);
-lean_ctor_set(x_680, 1, x_678);
-return x_680;
-}
-}
-else
-{
-lean_object* x_681; lean_object* x_682; lean_object* x_683; lean_object* x_684; 
-lean_dec(x_620);
-lean_dec(x_613);
-lean_dec(x_604);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_681 = lean_ctor_get(x_624, 0);
-lean_inc(x_681);
-x_682 = lean_ctor_get(x_624, 1);
-lean_inc(x_682);
-if (lean_is_exclusive(x_624)) {
- lean_ctor_release(x_624, 0);
- lean_ctor_release(x_624, 1);
- x_683 = x_624;
-} else {
- lean_dec_ref(x_624);
- x_683 = lean_box(0);
-}
-if (lean_is_scalar(x_683)) {
- x_684 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_684 = x_683;
-}
-lean_ctor_set(x_684, 0, x_681);
-lean_ctor_set(x_684, 1, x_682);
-return x_684;
-}
-}
-else
-{
-lean_object* x_685; lean_object* x_686; lean_object* x_687; 
-lean_dec(x_604);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
-lean_dec(x_1);
-x_685 = lean_ctor_get(x_603, 1);
-lean_inc(x_685);
-lean_dec(x_603);
-x_686 = lean_ctor_get(x_605, 0);
-lean_inc(x_686);
-lean_dec(x_605);
-x_687 = l_Lean_Compiler_LCNF_Simp_withAddMustInline___rarg(x_686, x_602, x_2, x_3, x_4, x_400, x_6, x_685);
-return x_687;
-}
-}
-else
-{
-lean_object* x_688; lean_object* x_689; lean_object* x_690; lean_object* x_691; 
-lean_dec(x_604);
-lean_dec(x_602);
-lean_dec(x_597);
-lean_dec(x_596);
-lean_dec(x_595);
-lean_dec(x_594);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_688 = lean_ctor_get(x_603, 0);
-lean_inc(x_688);
-x_689 = lean_ctor_get(x_603, 1);
-lean_inc(x_689);
-if (lean_is_exclusive(x_603)) {
- lean_ctor_release(x_603, 0);
- lean_ctor_release(x_603, 1);
- x_690 = x_603;
-} else {
- lean_dec_ref(x_603);
- x_690 = lean_box(0);
-}
-if (lean_is_scalar(x_690)) {
- x_691 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_691 = x_690;
-}
-lean_ctor_set(x_691, 0, x_688);
-lean_ctor_set(x_691, 1, x_689);
-return x_691;
-}
-}
-else
-{
-lean_object* x_692; lean_object* x_693; lean_object* x_694; lean_object* x_695; 
-lean_dec(x_590);
-lean_dec(x_400);
-lean_dec(x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_692 = lean_ctor_get(x_591, 1);
-lean_inc(x_692);
-if (lean_is_exclusive(x_591)) {
- lean_ctor_release(x_591, 0);
- lean_ctor_release(x_591, 1);
- x_693 = x_591;
-} else {
- lean_dec_ref(x_591);
- x_693 = lean_box(0);
-}
-x_694 = lean_ctor_get(x_592, 0);
+x_694 = lean_ctor_get(x_645, 0);
 lean_inc(x_694);
-lean_dec(x_592);
-if (lean_is_scalar(x_693)) {
- x_695 = lean_alloc_ctor(0, 2, 0);
+x_695 = lean_ctor_get(x_645, 1);
+lean_inc(x_695);
+if (lean_is_exclusive(x_645)) {
+ lean_ctor_release(x_645, 0);
+ lean_ctor_release(x_645, 1);
+ x_696 = x_645;
 } else {
- x_695 = x_693;
+ lean_dec_ref(x_645);
+ x_696 = lean_box(0);
 }
-lean_ctor_set(x_695, 0, x_694);
-lean_ctor_set(x_695, 1, x_692);
-return x_695;
+if (lean_is_scalar(x_696)) {
+ x_697 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_697 = x_696;
+}
+lean_ctor_set(x_697, 0, x_694);
+lean_ctor_set(x_697, 1, x_695);
+return x_697;
 }
 }
 else
 {
-lean_object* x_696; lean_object* x_697; lean_object* x_698; lean_object* x_699; 
-lean_dec(x_590);
-lean_dec(x_400);
+lean_object* x_698; lean_object* x_699; lean_object* x_700; lean_object* x_701; 
+lean_dec(x_637);
+lean_dec(x_630);
+lean_dec(x_620);
+lean_dec(x_613);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
+lean_dec(x_410);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_696 = lean_ctor_get(x_591, 0);
-lean_inc(x_696);
-x_697 = lean_ctor_get(x_591, 1);
-lean_inc(x_697);
-if (lean_is_exclusive(x_591)) {
- lean_ctor_release(x_591, 0);
- lean_ctor_release(x_591, 1);
- x_698 = x_591;
+x_698 = lean_ctor_get(x_641, 0);
+lean_inc(x_698);
+x_699 = lean_ctor_get(x_641, 1);
+lean_inc(x_699);
+if (lean_is_exclusive(x_641)) {
+ lean_ctor_release(x_641, 0);
+ lean_ctor_release(x_641, 1);
+ x_700 = x_641;
 } else {
- lean_dec_ref(x_591);
- x_698 = lean_box(0);
+ lean_dec_ref(x_641);
+ x_700 = lean_box(0);
 }
-if (lean_is_scalar(x_698)) {
- x_699 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_700)) {
+ x_701 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_699 = x_698;
+ x_701 = x_700;
 }
-lean_ctor_set(x_699, 0, x_696);
-lean_ctor_set(x_699, 1, x_697);
-return x_699;
+lean_ctor_set(x_701, 0, x_698);
+lean_ctor_set(x_701, 1, x_699);
+return x_701;
+}
+}
+else
+{
+lean_object* x_702; lean_object* x_703; lean_object* x_704; 
+lean_dec(x_620);
+lean_dec(x_613);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
+lean_dec(x_1);
+x_702 = lean_ctor_get(x_619, 1);
+lean_inc(x_702);
+lean_dec(x_619);
+x_703 = lean_ctor_get(x_621, 0);
+lean_inc(x_703);
+lean_dec(x_621);
+x_704 = l_Lean_Compiler_LCNF_Simp_withAddMustInline___rarg(x_703, x_618, x_2, x_3, x_4, x_410, x_6, x_702);
+return x_704;
+}
+}
+else
+{
+lean_object* x_705; lean_object* x_706; lean_object* x_707; lean_object* x_708; 
+lean_dec(x_620);
+lean_dec(x_618);
+lean_dec(x_613);
+lean_dec(x_612);
+lean_dec(x_611);
+lean_dec(x_610);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_705 = lean_ctor_get(x_619, 0);
+lean_inc(x_705);
+x_706 = lean_ctor_get(x_619, 1);
+lean_inc(x_706);
+if (lean_is_exclusive(x_619)) {
+ lean_ctor_release(x_619, 0);
+ lean_ctor_release(x_619, 1);
+ x_707 = x_619;
+} else {
+ lean_dec_ref(x_619);
+ x_707 = lean_box(0);
+}
+if (lean_is_scalar(x_707)) {
+ x_708 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_708 = x_707;
+}
+lean_ctor_set(x_708, 0, x_705);
+lean_ctor_set(x_708, 1, x_706);
+return x_708;
+}
+}
+else
+{
+lean_object* x_709; lean_object* x_710; lean_object* x_711; lean_object* x_712; 
+lean_dec(x_606);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_709 = lean_ctor_get(x_607, 1);
+lean_inc(x_709);
+if (lean_is_exclusive(x_607)) {
+ lean_ctor_release(x_607, 0);
+ lean_ctor_release(x_607, 1);
+ x_710 = x_607;
+} else {
+ lean_dec_ref(x_607);
+ x_710 = lean_box(0);
+}
+x_711 = lean_ctor_get(x_608, 0);
+lean_inc(x_711);
+lean_dec(x_608);
+if (lean_is_scalar(x_710)) {
+ x_712 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_712 = x_710;
+}
+lean_ctor_set(x_712, 0, x_711);
+lean_ctor_set(x_712, 1, x_709);
+return x_712;
+}
+}
+else
+{
+lean_object* x_713; lean_object* x_714; lean_object* x_715; lean_object* x_716; 
+lean_dec(x_606);
+lean_dec(x_410);
+lean_dec(x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_713 = lean_ctor_get(x_607, 0);
+lean_inc(x_713);
+x_714 = lean_ctor_get(x_607, 1);
+lean_inc(x_714);
+if (lean_is_exclusive(x_607)) {
+ lean_ctor_release(x_607, 0);
+ lean_ctor_release(x_607, 1);
+ x_715 = x_607;
+} else {
+ lean_dec_ref(x_607);
+ x_715 = lean_box(0);
+}
+if (lean_is_scalar(x_715)) {
+ x_716 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_716 = x_715;
+}
+lean_ctor_set(x_716, 0, x_713);
+lean_ctor_set(x_716, 1, x_714);
+return x_716;
 }
 }
 case 5:
 {
-lean_object* x_700; lean_object* x_701; lean_object* x_702; lean_object* x_703; 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; lean_object* x_711; uint8_t x_712; 
-x_700 = lean_ctor_get(x_401, 1);
-lean_inc(x_700);
-lean_dec(x_401);
-x_701 = lean_ctor_get(x_1, 0);
-lean_inc(x_701);
-x_702 = lean_st_ref_get(x_6, x_700);
-x_703 = lean_ctor_get(x_702, 1);
-lean_inc(x_703);
-lean_dec(x_702);
-x_704 = lean_st_ref_get(x_3, x_703);
-x_705 = lean_ctor_get(x_704, 0);
-lean_inc(x_705);
-x_706 = lean_ctor_get(x_704, 1);
-lean_inc(x_706);
-lean_dec(x_704);
-x_707 = lean_ctor_get(x_705, 0);
-lean_inc(x_707);
-lean_dec(x_705);
-lean_inc(x_701);
-x_708 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_707, x_701);
-lean_inc(x_708);
-x_709 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_708, x_2, x_3, x_4, x_400, x_6, x_706);
-lean_dec(x_6);
-lean_dec(x_400);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_710 = lean_ctor_get(x_709, 1);
-lean_inc(x_710);
-if (lean_is_exclusive(x_709)) {
- lean_ctor_release(x_709, 0);
- lean_ctor_release(x_709, 1);
- x_711 = x_709;
-} else {
- lean_dec_ref(x_709);
- x_711 = lean_box(0);
-}
-x_712 = lean_name_eq(x_701, x_708);
-lean_dec(x_701);
-if (x_712 == 0)
-{
-lean_object* x_713; lean_object* x_714; lean_object* x_715; 
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- x_713 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_713 = lean_box(0);
-}
-if (lean_is_scalar(x_713)) {
- x_714 = lean_alloc_ctor(5, 1, 0);
-} else {
- x_714 = x_713;
-}
-lean_ctor_set(x_714, 0, x_708);
-if (lean_is_scalar(x_711)) {
- x_715 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_715 = x_711;
-}
-lean_ctor_set(x_715, 0, x_714);
-lean_ctor_set(x_715, 1, x_710);
-return x_715;
-}
-else
-{
-lean_object* x_716; 
-lean_dec(x_708);
-if (lean_is_scalar(x_711)) {
- x_716 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_716 = x_711;
-}
-lean_ctor_set(x_716, 0, x_1);
-lean_ctor_set(x_716, 1, x_710);
-return x_716;
-}
-}
-default: 
-{
-lean_object* x_717; lean_object* x_718; lean_object* x_719; lean_object* x_720; lean_object* x_721; lean_object* x_722; lean_object* x_723; lean_object* x_724; lean_object* x_725; lean_object* x_726; size_t x_727; size_t x_728; uint8_t x_729; 
-lean_dec(x_400);
-lean_dec(x_4);
-lean_dec(x_2);
-x_717 = lean_ctor_get(x_401, 1);
+lean_object* x_717; lean_object* x_718; lean_object* x_719; lean_object* x_720; lean_object* x_721; lean_object* x_722; lean_object* x_723; lean_object* x_724; uint8_t x_725; lean_object* x_726; lean_object* x_727; lean_object* x_728; lean_object* x_729; uint8_t x_730; 
+x_717 = lean_ctor_get(x_411, 1);
 lean_inc(x_717);
-lean_dec(x_401);
+lean_dec(x_411);
 x_718 = lean_ctor_get(x_1, 0);
 lean_inc(x_718);
 x_719 = lean_st_ref_get(x_6, x_717);
-lean_dec(x_6);
 x_720 = lean_ctor_get(x_719, 1);
 lean_inc(x_720);
 lean_dec(x_719);
 x_721 = lean_st_ref_get(x_3, x_720);
-lean_dec(x_3);
 x_722 = lean_ctor_get(x_721, 0);
 lean_inc(x_722);
 x_723 = lean_ctor_get(x_721, 1);
 lean_inc(x_723);
-if (lean_is_exclusive(x_721)) {
- lean_ctor_release(x_721, 0);
- lean_ctor_release(x_721, 1);
- x_724 = x_721;
-} else {
- lean_dec_ref(x_721);
- x_724 = lean_box(0);
-}
-x_725 = lean_ctor_get(x_722, 0);
-lean_inc(x_725);
+lean_dec(x_721);
+x_724 = lean_ctor_get(x_722, 0);
+lean_inc(x_724);
 lean_dec(x_722);
+x_725 = 0;
 lean_inc(x_718);
-x_726 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_725, x_718);
-x_727 = lean_ptr_addr(x_718);
+x_726 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_724, x_718, x_725);
+lean_inc(x_726);
+x_727 = l_Lean_Compiler_LCNF_Simp_markUsedFVar(x_726, x_2, x_3, x_4, x_410, x_6, x_723);
+lean_dec(x_6);
+lean_dec(x_410);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_728 = lean_ctor_get(x_727, 1);
+lean_inc(x_728);
+if (lean_is_exclusive(x_727)) {
+ lean_ctor_release(x_727, 0);
+ lean_ctor_release(x_727, 1);
+ x_729 = x_727;
+} else {
+ lean_dec_ref(x_727);
+ x_729 = lean_box(0);
+}
+x_730 = lean_name_eq(x_718, x_726);
 lean_dec(x_718);
-x_728 = lean_ptr_addr(x_726);
-x_729 = lean_usize_dec_eq(x_727, x_728);
-if (x_729 == 0)
+if (x_730 == 0)
 {
-lean_object* x_730; lean_object* x_731; lean_object* x_732; 
+lean_object* x_731; lean_object* x_732; lean_object* x_733; 
 if (lean_is_exclusive(x_1)) {
  lean_ctor_release(x_1, 0);
- x_730 = x_1;
+ x_731 = x_1;
 } else {
  lean_dec_ref(x_1);
- x_730 = lean_box(0);
+ x_731 = lean_box(0);
 }
-if (lean_is_scalar(x_730)) {
- x_731 = lean_alloc_ctor(6, 1, 0);
+if (lean_is_scalar(x_731)) {
+ x_732 = lean_alloc_ctor(5, 1, 0);
 } else {
- x_731 = x_730;
+ x_732 = x_731;
 }
-lean_ctor_set(x_731, 0, x_726);
-if (lean_is_scalar(x_724)) {
- x_732 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_732 = x_724;
-}
-lean_ctor_set(x_732, 0, x_731);
-lean_ctor_set(x_732, 1, x_723);
-return x_732;
-}
-else
-{
-lean_object* x_733; 
-lean_dec(x_726);
-if (lean_is_scalar(x_724)) {
+lean_ctor_set(x_732, 0, x_726);
+if (lean_is_scalar(x_729)) {
  x_733 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_733 = x_724;
+ x_733 = x_729;
 }
-lean_ctor_set(x_733, 0, x_1);
-lean_ctor_set(x_733, 1, x_723);
+lean_ctor_set(x_733, 0, x_732);
+lean_ctor_set(x_733, 1, x_728);
 return x_733;
 }
-}
-}
-}
-}
 else
 {
 lean_object* x_734; 
+lean_dec(x_726);
+if (lean_is_scalar(x_729)) {
+ x_734 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_734 = x_729;
+}
+lean_ctor_set(x_734, 0, x_1);
+lean_ctor_set(x_734, 1, x_728);
+return x_734;
+}
+}
+default: 
+{
+lean_object* x_735; lean_object* x_736; lean_object* x_737; lean_object* x_738; lean_object* x_739; lean_object* x_740; lean_object* x_741; lean_object* x_742; lean_object* x_743; uint8_t x_744; lean_object* x_745; size_t x_746; size_t x_747; uint8_t x_748; 
+lean_dec(x_410);
+lean_dec(x_4);
+lean_dec(x_2);
+x_735 = lean_ctor_get(x_411, 1);
+lean_inc(x_735);
+lean_dec(x_411);
+x_736 = lean_ctor_get(x_1, 0);
+lean_inc(x_736);
+x_737 = lean_st_ref_get(x_6, x_735);
+lean_dec(x_6);
+x_738 = lean_ctor_get(x_737, 1);
+lean_inc(x_738);
+lean_dec(x_737);
+x_739 = lean_st_ref_get(x_3, x_738);
+lean_dec(x_3);
+x_740 = lean_ctor_get(x_739, 0);
+lean_inc(x_740);
+x_741 = lean_ctor_get(x_739, 1);
+lean_inc(x_741);
+if (lean_is_exclusive(x_739)) {
+ lean_ctor_release(x_739, 0);
+ lean_ctor_release(x_739, 1);
+ x_742 = x_739;
+} else {
+ lean_dec_ref(x_739);
+ x_742 = lean_box(0);
+}
+x_743 = lean_ctor_get(x_740, 0);
+lean_inc(x_743);
+lean_dec(x_740);
+x_744 = 0;
+lean_inc(x_736);
+x_745 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_743, x_744, x_736);
+x_746 = lean_ptr_addr(x_736);
+lean_dec(x_736);
+x_747 = lean_ptr_addr(x_745);
+x_748 = lean_usize_dec_eq(x_746, x_747);
+if (x_748 == 0)
+{
+lean_object* x_749; lean_object* x_750; lean_object* x_751; 
+if (lean_is_exclusive(x_1)) {
+ lean_ctor_release(x_1, 0);
+ x_749 = x_1;
+} else {
+ lean_dec_ref(x_1);
+ x_749 = lean_box(0);
+}
+if (lean_is_scalar(x_749)) {
+ x_750 = lean_alloc_ctor(6, 1, 0);
+} else {
+ x_750 = x_749;
+}
+lean_ctor_set(x_750, 0, x_745);
+if (lean_is_scalar(x_742)) {
+ x_751 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_751 = x_742;
+}
+lean_ctor_set(x_751, 0, x_750);
+lean_ctor_set(x_751, 1, x_741);
+return x_751;
+}
+else
+{
+lean_object* x_752; 
+lean_dec(x_745);
+if (lean_is_scalar(x_742)) {
+ x_752 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_752 = x_742;
+}
+lean_ctor_set(x_752, 0, x_1);
+lean_ctor_set(x_752, 1, x_741);
+return x_752;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_753; 
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
@@ -28483,13 +28620,13 @@ lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_1);
-x_734 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8(x_13, x_2, x_3, x_4, x_5, x_6, x_7);
+x_753 = l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8(x_13, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-return x_734;
+return x_753;
 }
 }
 }
@@ -28561,14 +28698,14 @@ x_38 = l_Lean_Expr_isFVar(x_35);
 if (x_38 == 0)
 {
 lean_object* x_39; lean_object* x_40; 
-x_39 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
+x_39 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 x_40 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_35, x_39, x_7, x_8, x_9, x_10);
 if (lean_obj_tag(x_40) == 0)
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+lean_object* x_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; uint8_t x_52; 
 x_41 = lean_ctor_get(x_40, 0);
 lean_inc(x_41);
 x_42 = lean_ctor_get(x_40, 1);
@@ -28584,164 +28721,375 @@ lean_dec(x_13);
 x_46 = lean_ctor_get(x_41, 0);
 lean_inc(x_46);
 lean_dec(x_41);
-x_47 = l_Lean_Expr_fvar___override(x_46);
-x_48 = l_Lean_Compiler_LCNF_Simp_addSubst(x_45, x_47, x_5, x_6, x_7, x_8, x_9, x_42);
-x_49 = lean_ctor_get(x_48, 1);
-lean_inc(x_49);
-lean_dec(x_48);
-lean_ctor_set(x_4, 1, x_44);
-x_50 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_50, 0, x_4);
-x_14 = x_50;
-x_15 = x_49;
-goto block_22;
-}
-else
+x_47 = lean_st_ref_get(x_9, x_42);
+x_48 = lean_ctor_get(x_47, 1);
+lean_inc(x_48);
+lean_dec(x_47);
+x_49 = lean_st_ref_take(x_6, x_48);
+x_50 = lean_ctor_get(x_49, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_49, 1);
+lean_inc(x_51);
+lean_dec(x_49);
+x_52 = !lean_is_exclusive(x_50);
+if (x_52 == 0)
 {
-uint8_t x_51; 
-lean_dec(x_24);
-lean_free_object(x_4);
-lean_dec(x_25);
-lean_dec(x_13);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-x_51 = !lean_is_exclusive(x_40);
-if (x_51 == 0)
-{
-return x_40;
-}
-else
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_52 = lean_ctor_get(x_40, 0);
-x_53 = lean_ctor_get(x_40, 1);
-lean_inc(x_53);
-lean_inc(x_52);
-lean_dec(x_40);
-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_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_55 = lean_ctor_get(x_13, 0);
-lean_inc(x_55);
-lean_dec(x_13);
-x_56 = l_Lean_Compiler_LCNF_Simp_addSubst(x_55, x_35, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_53 = lean_ctor_get(x_50, 0);
+x_54 = l_Lean_Expr_fvar___override(x_46);
+x_55 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_53, x_45, x_54);
+lean_ctor_set(x_50, 0, x_55);
+x_56 = lean_st_ref_set(x_6, x_50, x_51);
 x_57 = lean_ctor_get(x_56, 1);
 lean_inc(x_57);
 lean_dec(x_56);
+lean_ctor_set(x_4, 1, x_44);
 x_58 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_58, 0, x_4);
 x_14 = x_58;
 x_15 = x_57;
 goto block_22;
 }
-}
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-lean_dec(x_24);
-x_59 = lean_array_fget(x_26, x_27);
-x_60 = lean_unsigned_to_nat(1u);
-x_61 = lean_nat_add(x_27, x_60);
-lean_dec(x_27);
-x_62 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_62, 0, x_26);
-lean_ctor_set(x_62, 1, x_61);
-lean_ctor_set(x_62, 2, x_28);
-x_63 = l_Lean_Expr_isFVar(x_59);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; 
-x_64 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-x_65 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_59, x_64, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_65) == 0)
-{
-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_66 = lean_ctor_get(x_65, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_65, 1);
-lean_inc(x_67);
-lean_dec(x_65);
-lean_inc(x_66);
-x_68 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_68, 0, x_66);
-x_69 = lean_array_push(x_25, x_68);
-x_70 = lean_ctor_get(x_13, 0);
+lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_59 = lean_ctor_get(x_50, 0);
+x_60 = lean_ctor_get(x_50, 1);
+x_61 = lean_ctor_get(x_50, 2);
+x_62 = lean_ctor_get_uint8(x_50, sizeof(void*)*6);
+x_63 = lean_ctor_get(x_50, 3);
+x_64 = lean_ctor_get(x_50, 4);
+x_65 = lean_ctor_get(x_50, 5);
+lean_inc(x_65);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_inc(x_59);
+lean_dec(x_50);
+x_66 = l_Lean_Expr_fvar___override(x_46);
+x_67 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_59, x_45, x_66);
+x_68 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_60);
+lean_ctor_set(x_68, 2, x_61);
+lean_ctor_set(x_68, 3, x_63);
+lean_ctor_set(x_68, 4, x_64);
+lean_ctor_set(x_68, 5, x_65);
+lean_ctor_set_uint8(x_68, sizeof(void*)*6, x_62);
+x_69 = lean_st_ref_set(x_6, x_68, x_51);
+x_70 = lean_ctor_get(x_69, 1);
 lean_inc(x_70);
-lean_dec(x_13);
-x_71 = lean_ctor_get(x_66, 0);
-lean_inc(x_71);
-lean_dec(x_66);
-x_72 = l_Lean_Expr_fvar___override(x_71);
-x_73 = l_Lean_Compiler_LCNF_Simp_addSubst(x_70, x_72, x_5, x_6, x_7, x_8, x_9, x_67);
-x_74 = lean_ctor_get(x_73, 1);
-lean_inc(x_74);
-lean_dec(x_73);
-lean_ctor_set(x_4, 1, x_69);
-lean_ctor_set(x_4, 0, x_62);
-x_75 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_75, 0, x_4);
-x_14 = x_75;
-x_15 = x_74;
+lean_dec(x_69);
+lean_ctor_set(x_4, 1, x_44);
+x_71 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_71, 0, x_4);
+x_14 = x_71;
+x_15 = x_70;
 goto block_22;
 }
+}
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-lean_dec(x_62);
+uint8_t x_72; 
+lean_dec(x_24);
 lean_free_object(x_4);
 lean_dec(x_25);
 lean_dec(x_13);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_76 = lean_ctor_get(x_65, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_65, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_65)) {
- lean_ctor_release(x_65, 0);
- lean_ctor_release(x_65, 1);
- x_78 = x_65;
-} else {
- lean_dec_ref(x_65);
- x_78 = lean_box(0);
+x_72 = !lean_is_exclusive(x_40);
+if (x_72 == 0)
+{
+return x_40;
 }
-if (lean_is_scalar(x_78)) {
- x_79 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_79 = x_78;
+else
+{
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_40, 0);
+x_74 = lean_ctor_get(x_40, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_40);
+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;
 }
-lean_ctor_set(x_79, 0, x_76);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
 }
 }
 else
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_80 = lean_ctor_get(x_13, 0);
-lean_inc(x_80);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; 
+x_76 = lean_ctor_get(x_13, 0);
+lean_inc(x_76);
 lean_dec(x_13);
-x_81 = l_Lean_Compiler_LCNF_Simp_addSubst(x_80, x_59, x_5, x_6, x_7, x_8, x_9, x_10);
-x_82 = lean_ctor_get(x_81, 1);
+x_77 = l_Lean_Expr_fvarId_x21(x_35);
+x_78 = lean_st_ref_get(x_9, x_10);
+x_79 = lean_ctor_get(x_78, 1);
+lean_inc(x_79);
+lean_dec(x_78);
+x_80 = lean_st_ref_take(x_6, x_79);
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_80, 1);
 lean_inc(x_82);
+lean_dec(x_80);
+x_83 = !lean_is_exclusive(x_81);
+if (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_81, 0);
+x_85 = l_Lean_Expr_fvar___override(x_77);
+x_86 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_84, x_76, x_85);
+lean_ctor_set(x_81, 0, x_86);
+x_87 = lean_st_ref_set(x_6, x_81, x_82);
+x_88 = lean_ctor_get(x_87, 1);
+lean_inc(x_88);
+lean_dec(x_87);
+x_89 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_89, 0, x_4);
+x_14 = x_89;
+x_15 = x_88;
+goto block_22;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; uint8_t x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_90 = lean_ctor_get(x_81, 0);
+x_91 = lean_ctor_get(x_81, 1);
+x_92 = lean_ctor_get(x_81, 2);
+x_93 = lean_ctor_get_uint8(x_81, sizeof(void*)*6);
+x_94 = lean_ctor_get(x_81, 3);
+x_95 = lean_ctor_get(x_81, 4);
+x_96 = lean_ctor_get(x_81, 5);
+lean_inc(x_96);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_inc(x_90);
 lean_dec(x_81);
-lean_ctor_set(x_4, 0, x_62);
-x_83 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_83, 0, x_4);
-x_14 = x_83;
-x_15 = x_82;
+x_97 = l_Lean_Expr_fvar___override(x_77);
+x_98 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_90, x_76, x_97);
+x_99 = lean_alloc_ctor(0, 6, 1);
+lean_ctor_set(x_99, 0, x_98);
+lean_ctor_set(x_99, 1, x_91);
+lean_ctor_set(x_99, 2, x_92);
+lean_ctor_set(x_99, 3, x_94);
+lean_ctor_set(x_99, 4, x_95);
+lean_ctor_set(x_99, 5, x_96);
+lean_ctor_set_uint8(x_99, sizeof(void*)*6, x_93);
+x_100 = lean_st_ref_set(x_6, x_99, x_82);
+x_101 = lean_ctor_get(x_100, 1);
+lean_inc(x_101);
+lean_dec(x_100);
+x_102 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_102, 0, x_4);
+x_14 = x_102;
+x_15 = x_101;
+goto block_22;
+}
+}
+}
+else
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; uint8_t x_107; 
+lean_dec(x_24);
+x_103 = lean_array_fget(x_26, x_27);
+x_104 = lean_unsigned_to_nat(1u);
+x_105 = lean_nat_add(x_27, x_104);
+lean_dec(x_27);
+x_106 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_106, 0, x_26);
+lean_ctor_set(x_106, 1, x_105);
+lean_ctor_set(x_106, 2, x_28);
+x_107 = l_Lean_Expr_isFVar(x_103);
+if (x_107 == 0)
+{
+lean_object* x_108; lean_object* x_109; 
+x_108 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_109 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_103, x_108, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_109) == 0)
+{
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; uint8_t x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+x_110 = lean_ctor_get(x_109, 0);
+lean_inc(x_110);
+x_111 = lean_ctor_get(x_109, 1);
+lean_inc(x_111);
+lean_dec(x_109);
+lean_inc(x_110);
+x_112 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_112, 0, x_110);
+x_113 = lean_array_push(x_25, x_112);
+x_114 = lean_ctor_get(x_13, 0);
+lean_inc(x_114);
+lean_dec(x_13);
+x_115 = lean_ctor_get(x_110, 0);
+lean_inc(x_115);
+lean_dec(x_110);
+x_116 = lean_st_ref_get(x_9, x_111);
+x_117 = lean_ctor_get(x_116, 1);
+lean_inc(x_117);
+lean_dec(x_116);
+x_118 = lean_st_ref_take(x_6, x_117);
+x_119 = lean_ctor_get(x_118, 0);
+lean_inc(x_119);
+x_120 = lean_ctor_get(x_118, 1);
+lean_inc(x_120);
+lean_dec(x_118);
+x_121 = lean_ctor_get(x_119, 0);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_119, 1);
+lean_inc(x_122);
+x_123 = lean_ctor_get(x_119, 2);
+lean_inc(x_123);
+x_124 = lean_ctor_get_uint8(x_119, sizeof(void*)*6);
+x_125 = lean_ctor_get(x_119, 3);
+lean_inc(x_125);
+x_126 = lean_ctor_get(x_119, 4);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_119, 5);
+lean_inc(x_127);
+if (lean_is_exclusive(x_119)) {
+ lean_ctor_release(x_119, 0);
+ lean_ctor_release(x_119, 1);
+ lean_ctor_release(x_119, 2);
+ lean_ctor_release(x_119, 3);
+ lean_ctor_release(x_119, 4);
+ lean_ctor_release(x_119, 5);
+ x_128 = x_119;
+} else {
+ lean_dec_ref(x_119);
+ x_128 = lean_box(0);
+}
+x_129 = l_Lean_Expr_fvar___override(x_115);
+x_130 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_121, x_114, x_129);
+if (lean_is_scalar(x_128)) {
+ x_131 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_131 = x_128;
+}
+lean_ctor_set(x_131, 0, x_130);
+lean_ctor_set(x_131, 1, x_122);
+lean_ctor_set(x_131, 2, x_123);
+lean_ctor_set(x_131, 3, x_125);
+lean_ctor_set(x_131, 4, x_126);
+lean_ctor_set(x_131, 5, x_127);
+lean_ctor_set_uint8(x_131, sizeof(void*)*6, x_124);
+x_132 = lean_st_ref_set(x_6, x_131, x_120);
+x_133 = lean_ctor_get(x_132, 1);
+lean_inc(x_133);
+lean_dec(x_132);
+lean_ctor_set(x_4, 1, x_113);
+lean_ctor_set(x_4, 0, x_106);
+x_134 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_134, 0, x_4);
+x_14 = x_134;
+x_15 = x_133;
+goto block_22;
+}
+else
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+lean_dec(x_106);
+lean_free_object(x_4);
+lean_dec(x_25);
+lean_dec(x_13);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_135 = lean_ctor_get(x_109, 0);
+lean_inc(x_135);
+x_136 = lean_ctor_get(x_109, 1);
+lean_inc(x_136);
+if (lean_is_exclusive(x_109)) {
+ lean_ctor_release(x_109, 0);
+ lean_ctor_release(x_109, 1);
+ x_137 = x_109;
+} else {
+ lean_dec_ref(x_109);
+ x_137 = lean_box(0);
+}
+if (lean_is_scalar(x_137)) {
+ x_138 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_138 = x_137;
+}
+lean_ctor_set(x_138, 0, x_135);
+lean_ctor_set(x_138, 1, x_136);
+return x_138;
+}
+}
+else
+{
+lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; uint8_t x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+x_139 = lean_ctor_get(x_13, 0);
+lean_inc(x_139);
+lean_dec(x_13);
+x_140 = l_Lean_Expr_fvarId_x21(x_103);
+x_141 = lean_st_ref_get(x_9, x_10);
+x_142 = lean_ctor_get(x_141, 1);
+lean_inc(x_142);
+lean_dec(x_141);
+x_143 = lean_st_ref_take(x_6, x_142);
+x_144 = lean_ctor_get(x_143, 0);
+lean_inc(x_144);
+x_145 = lean_ctor_get(x_143, 1);
+lean_inc(x_145);
+lean_dec(x_143);
+x_146 = lean_ctor_get(x_144, 0);
+lean_inc(x_146);
+x_147 = lean_ctor_get(x_144, 1);
+lean_inc(x_147);
+x_148 = lean_ctor_get(x_144, 2);
+lean_inc(x_148);
+x_149 = lean_ctor_get_uint8(x_144, sizeof(void*)*6);
+x_150 = lean_ctor_get(x_144, 3);
+lean_inc(x_150);
+x_151 = lean_ctor_get(x_144, 4);
+lean_inc(x_151);
+x_152 = lean_ctor_get(x_144, 5);
+lean_inc(x_152);
+if (lean_is_exclusive(x_144)) {
+ lean_ctor_release(x_144, 0);
+ lean_ctor_release(x_144, 1);
+ lean_ctor_release(x_144, 2);
+ lean_ctor_release(x_144, 3);
+ lean_ctor_release(x_144, 4);
+ lean_ctor_release(x_144, 5);
+ x_153 = x_144;
+} else {
+ lean_dec_ref(x_144);
+ x_153 = lean_box(0);
+}
+x_154 = l_Lean_Expr_fvar___override(x_140);
+x_155 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_146, x_139, x_154);
+if (lean_is_scalar(x_153)) {
+ x_156 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_156 = x_153;
+}
+lean_ctor_set(x_156, 0, x_155);
+lean_ctor_set(x_156, 1, x_147);
+lean_ctor_set(x_156, 2, x_148);
+lean_ctor_set(x_156, 3, x_150);
+lean_ctor_set(x_156, 4, x_151);
+lean_ctor_set(x_156, 5, x_152);
+lean_ctor_set_uint8(x_156, sizeof(void*)*6, x_149);
+x_157 = lean_st_ref_set(x_6, x_156, x_145);
+x_158 = lean_ctor_get(x_157, 1);
+lean_inc(x_158);
+lean_dec(x_157);
+lean_ctor_set(x_4, 0, x_106);
+x_159 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_159, 0, x_4);
+x_14 = x_159;
+x_15 = x_158;
 goto block_22;
 }
 }
@@ -28749,148 +29097,246 @@ goto block_22;
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; uint8_t x_89; 
-x_84 = lean_ctor_get(x_4, 0);
-x_85 = lean_ctor_get(x_4, 1);
-lean_inc(x_85);
-lean_inc(x_84);
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165; 
+x_160 = lean_ctor_get(x_4, 0);
+x_161 = lean_ctor_get(x_4, 1);
+lean_inc(x_161);
+lean_inc(x_160);
 lean_dec(x_4);
-x_86 = lean_ctor_get(x_84, 0);
-lean_inc(x_86);
-x_87 = lean_ctor_get(x_84, 1);
-lean_inc(x_87);
-x_88 = lean_ctor_get(x_84, 2);
-lean_inc(x_88);
-x_89 = lean_nat_dec_lt(x_87, x_88);
-if (x_89 == 0)
+x_162 = lean_ctor_get(x_160, 0);
+lean_inc(x_162);
+x_163 = lean_ctor_get(x_160, 1);
+lean_inc(x_163);
+x_164 = lean_ctor_get(x_160, 2);
+lean_inc(x_164);
+x_165 = lean_nat_dec_lt(x_163, x_164);
+if (x_165 == 0)
 {
-lean_object* x_90; lean_object* x_91; 
-lean_dec(x_88);
-lean_dec(x_87);
-lean_dec(x_86);
+lean_object* x_166; lean_object* x_167; 
+lean_dec(x_164);
+lean_dec(x_163);
+lean_dec(x_162);
 lean_dec(x_13);
-x_90 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_90, 0, x_84);
-lean_ctor_set(x_90, 1, x_85);
-x_91 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_91, 0, x_90);
-x_14 = x_91;
+x_166 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_166, 0, x_160);
+lean_ctor_set(x_166, 1, x_161);
+x_167 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_167, 0, x_166);
+x_14 = x_167;
 x_15 = x_10;
 goto block_22;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; uint8_t x_97; 
-if (lean_is_exclusive(x_84)) {
- lean_ctor_release(x_84, 0);
- lean_ctor_release(x_84, 1);
- lean_ctor_release(x_84, 2);
- x_92 = x_84;
+lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; uint8_t x_173; 
+if (lean_is_exclusive(x_160)) {
+ lean_ctor_release(x_160, 0);
+ lean_ctor_release(x_160, 1);
+ lean_ctor_release(x_160, 2);
+ x_168 = x_160;
 } else {
- lean_dec_ref(x_84);
- x_92 = lean_box(0);
+ lean_dec_ref(x_160);
+ x_168 = lean_box(0);
 }
-x_93 = lean_array_fget(x_86, x_87);
-x_94 = lean_unsigned_to_nat(1u);
-x_95 = lean_nat_add(x_87, x_94);
-lean_dec(x_87);
-if (lean_is_scalar(x_92)) {
- x_96 = lean_alloc_ctor(0, 3, 0);
+x_169 = lean_array_fget(x_162, x_163);
+x_170 = lean_unsigned_to_nat(1u);
+x_171 = lean_nat_add(x_163, x_170);
+lean_dec(x_163);
+if (lean_is_scalar(x_168)) {
+ x_172 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_96 = x_92;
+ x_172 = x_168;
 }
-lean_ctor_set(x_96, 0, x_86);
-lean_ctor_set(x_96, 1, x_95);
-lean_ctor_set(x_96, 2, x_88);
-x_97 = l_Lean_Expr_isFVar(x_93);
-if (x_97 == 0)
+lean_ctor_set(x_172, 0, x_162);
+lean_ctor_set(x_172, 1, x_171);
+lean_ctor_set(x_172, 2, x_164);
+x_173 = l_Lean_Expr_isFVar(x_169);
+if (x_173 == 0)
 {
-lean_object* x_98; lean_object* x_99; 
-x_98 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2;
+lean_object* x_174; lean_object* x_175; 
+x_174 = l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2;
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_99 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_93, x_98, x_7, x_8, x_9, x_10);
-if (lean_obj_tag(x_99) == 0)
+x_175 = l_Lean_Compiler_LCNF_mkAuxLetDecl(x_169, x_174, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_175) == 0)
 {
-lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_100 = lean_ctor_get(x_99, 0);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_99, 1);
-lean_inc(x_101);
-lean_dec(x_99);
-lean_inc(x_100);
-x_102 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_102, 0, x_100);
-x_103 = lean_array_push(x_85, x_102);
-x_104 = lean_ctor_get(x_13, 0);
-lean_inc(x_104);
+lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; uint8_t x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
+x_176 = lean_ctor_get(x_175, 0);
+lean_inc(x_176);
+x_177 = lean_ctor_get(x_175, 1);
+lean_inc(x_177);
+lean_dec(x_175);
+lean_inc(x_176);
+x_178 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_178, 0, x_176);
+x_179 = lean_array_push(x_161, x_178);
+x_180 = lean_ctor_get(x_13, 0);
+lean_inc(x_180);
 lean_dec(x_13);
-x_105 = lean_ctor_get(x_100, 0);
-lean_inc(x_105);
-lean_dec(x_100);
-x_106 = l_Lean_Expr_fvar___override(x_105);
-x_107 = l_Lean_Compiler_LCNF_Simp_addSubst(x_104, x_106, x_5, x_6, x_7, x_8, x_9, x_101);
-x_108 = lean_ctor_get(x_107, 1);
-lean_inc(x_108);
-lean_dec(x_107);
-x_109 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_109, 0, x_96);
-lean_ctor_set(x_109, 1, x_103);
-x_110 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_110, 0, x_109);
-x_14 = x_110;
-x_15 = x_108;
+x_181 = lean_ctor_get(x_176, 0);
+lean_inc(x_181);
+lean_dec(x_176);
+x_182 = lean_st_ref_get(x_9, x_177);
+x_183 = lean_ctor_get(x_182, 1);
+lean_inc(x_183);
+lean_dec(x_182);
+x_184 = lean_st_ref_take(x_6, x_183);
+x_185 = lean_ctor_get(x_184, 0);
+lean_inc(x_185);
+x_186 = lean_ctor_get(x_184, 1);
+lean_inc(x_186);
+lean_dec(x_184);
+x_187 = lean_ctor_get(x_185, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_185, 1);
+lean_inc(x_188);
+x_189 = lean_ctor_get(x_185, 2);
+lean_inc(x_189);
+x_190 = lean_ctor_get_uint8(x_185, sizeof(void*)*6);
+x_191 = lean_ctor_get(x_185, 3);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_185, 4);
+lean_inc(x_192);
+x_193 = lean_ctor_get(x_185, 5);
+lean_inc(x_193);
+if (lean_is_exclusive(x_185)) {
+ lean_ctor_release(x_185, 0);
+ lean_ctor_release(x_185, 1);
+ lean_ctor_release(x_185, 2);
+ lean_ctor_release(x_185, 3);
+ lean_ctor_release(x_185, 4);
+ lean_ctor_release(x_185, 5);
+ x_194 = x_185;
+} else {
+ lean_dec_ref(x_185);
+ x_194 = lean_box(0);
+}
+x_195 = l_Lean_Expr_fvar___override(x_181);
+x_196 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_187, x_180, x_195);
+if (lean_is_scalar(x_194)) {
+ x_197 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_197 = x_194;
+}
+lean_ctor_set(x_197, 0, x_196);
+lean_ctor_set(x_197, 1, x_188);
+lean_ctor_set(x_197, 2, x_189);
+lean_ctor_set(x_197, 3, x_191);
+lean_ctor_set(x_197, 4, x_192);
+lean_ctor_set(x_197, 5, x_193);
+lean_ctor_set_uint8(x_197, sizeof(void*)*6, x_190);
+x_198 = lean_st_ref_set(x_6, x_197, x_186);
+x_199 = lean_ctor_get(x_198, 1);
+lean_inc(x_199);
+lean_dec(x_198);
+x_200 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_200, 0, x_172);
+lean_ctor_set(x_200, 1, x_179);
+x_201 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_201, 0, x_200);
+x_14 = x_201;
+x_15 = x_199;
 goto block_22;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-lean_dec(x_96);
-lean_dec(x_85);
+lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; 
+lean_dec(x_172);
+lean_dec(x_161);
 lean_dec(x_13);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
-x_111 = lean_ctor_get(x_99, 0);
-lean_inc(x_111);
-x_112 = lean_ctor_get(x_99, 1);
-lean_inc(x_112);
-if (lean_is_exclusive(x_99)) {
- lean_ctor_release(x_99, 0);
- lean_ctor_release(x_99, 1);
- x_113 = x_99;
+x_202 = lean_ctor_get(x_175, 0);
+lean_inc(x_202);
+x_203 = lean_ctor_get(x_175, 1);
+lean_inc(x_203);
+if (lean_is_exclusive(x_175)) {
+ lean_ctor_release(x_175, 0);
+ lean_ctor_release(x_175, 1);
+ x_204 = x_175;
 } else {
- lean_dec_ref(x_99);
- x_113 = lean_box(0);
+ lean_dec_ref(x_175);
+ x_204 = lean_box(0);
 }
-if (lean_is_scalar(x_113)) {
- x_114 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_204)) {
+ x_205 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_114 = x_113;
+ x_205 = x_204;
 }
-lean_ctor_set(x_114, 0, x_111);
-lean_ctor_set(x_114, 1, x_112);
-return x_114;
+lean_ctor_set(x_205, 0, x_202);
+lean_ctor_set(x_205, 1, x_203);
+return x_205;
 }
 }
 else
 {
-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_13, 0);
-lean_inc(x_115);
+lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; uint8_t x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; 
+x_206 = lean_ctor_get(x_13, 0);
+lean_inc(x_206);
 lean_dec(x_13);
-x_116 = l_Lean_Compiler_LCNF_Simp_addSubst(x_115, x_93, x_5, x_6, x_7, x_8, x_9, x_10);
-x_117 = lean_ctor_get(x_116, 1);
-lean_inc(x_117);
-lean_dec(x_116);
-x_118 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_118, 0, x_96);
-lean_ctor_set(x_118, 1, x_85);
-x_119 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_119, 0, x_118);
-x_14 = x_119;
-x_15 = x_117;
+x_207 = l_Lean_Expr_fvarId_x21(x_169);
+x_208 = lean_st_ref_get(x_9, x_10);
+x_209 = lean_ctor_get(x_208, 1);
+lean_inc(x_209);
+lean_dec(x_208);
+x_210 = lean_st_ref_take(x_6, x_209);
+x_211 = lean_ctor_get(x_210, 0);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_210, 1);
+lean_inc(x_212);
+lean_dec(x_210);
+x_213 = lean_ctor_get(x_211, 0);
+lean_inc(x_213);
+x_214 = lean_ctor_get(x_211, 1);
+lean_inc(x_214);
+x_215 = lean_ctor_get(x_211, 2);
+lean_inc(x_215);
+x_216 = lean_ctor_get_uint8(x_211, sizeof(void*)*6);
+x_217 = lean_ctor_get(x_211, 3);
+lean_inc(x_217);
+x_218 = lean_ctor_get(x_211, 4);
+lean_inc(x_218);
+x_219 = lean_ctor_get(x_211, 5);
+lean_inc(x_219);
+if (lean_is_exclusive(x_211)) {
+ lean_ctor_release(x_211, 0);
+ lean_ctor_release(x_211, 1);
+ lean_ctor_release(x_211, 2);
+ lean_ctor_release(x_211, 3);
+ lean_ctor_release(x_211, 4);
+ lean_ctor_release(x_211, 5);
+ x_220 = x_211;
+} else {
+ lean_dec_ref(x_211);
+ x_220 = lean_box(0);
+}
+x_221 = l_Lean_Expr_fvar___override(x_207);
+x_222 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_213, x_206, x_221);
+if (lean_is_scalar(x_220)) {
+ x_223 = lean_alloc_ctor(0, 6, 1);
+} else {
+ x_223 = x_220;
+}
+lean_ctor_set(x_223, 0, x_222);
+lean_ctor_set(x_223, 1, x_214);
+lean_ctor_set(x_223, 2, x_215);
+lean_ctor_set(x_223, 3, x_217);
+lean_ctor_set(x_223, 4, x_218);
+lean_ctor_set(x_223, 5, x_219);
+lean_ctor_set_uint8(x_223, sizeof(void*)*6, x_216);
+x_224 = lean_st_ref_set(x_6, x_223, x_212);
+x_225 = lean_ctor_get(x_224, 1);
+lean_inc(x_225);
+lean_dec(x_224);
+x_226 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_226, 0, x_172);
+lean_ctor_set(x_226, 1, x_161);
+x_227 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_227, 0, x_226);
+x_14 = x_227;
+x_15 = x_225;
 goto block_22;
 }
 }
@@ -28931,7 +29377,7 @@ goto _start;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_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) {
 _start:
 {
-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_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+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; uint8_t 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; uint8_t x_22; 
 x_8 = lean_ctor_get(x_1, 2);
 lean_inc(x_8);
 x_9 = lean_st_ref_get(x_6, x_7);
@@ -28947,518 +29393,519 @@ lean_dec(x_11);
 x_14 = lean_ctor_get(x_12, 0);
 lean_inc(x_14);
 lean_dec(x_12);
-x_15 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_14, x_8);
-x_16 = l_Lean_Expr_fvar___override(x_15);
-x_17 = l_Lean_Compiler_LCNF_Simp_findCtor(x_16, x_2, x_3, x_4, x_5, x_6, x_13);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+x_15 = 0;
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normFVarImp(x_14, x_8, x_15);
+x_17 = l_Lean_Expr_fvar___override(x_16);
+x_18 = l_Lean_Compiler_LCNF_Simp_findCtor(x_17, x_2, x_3, x_4, x_5, x_6, x_13);
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = lean_st_ref_get(x_6, x_19);
-x_21 = !lean_is_exclusive(x_20);
-if (x_21 == 0)
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = lean_st_ref_get(x_6, x_20);
+x_22 = !lean_is_exclusive(x_21);
+if (x_22 == 0)
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; 
-x_22 = lean_ctor_get(x_20, 0);
-x_23 = lean_ctor_get(x_20, 1);
-x_24 = lean_ctor_get(x_22, 0);
-lean_inc(x_24);
-lean_dec(x_22);
-x_25 = 1;
-x_26 = l_Lean_Expr_constructorApp_x3f(x_24, x_18, x_25);
-if (lean_obj_tag(x_26) == 0)
+lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; lean_object* x_27; 
+x_23 = lean_ctor_get(x_21, 0);
+x_24 = lean_ctor_get(x_21, 1);
+x_25 = lean_ctor_get(x_23, 0);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = 1;
+x_27 = l_Lean_Expr_constructorApp_x3f(x_25, x_19, x_26);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_27; 
+lean_object* x_28; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_27 = lean_box(0);
-lean_ctor_set(x_20, 0, x_27);
-return x_20;
+x_28 = lean_box(0);
+lean_ctor_set(x_21, 0, x_28);
+return x_21;
 }
 else
 {
-uint8_t x_28; 
-lean_free_object(x_20);
-x_28 = !lean_is_exclusive(x_26);
-if (x_28 == 0)
+uint8_t x_29; 
+lean_free_object(x_21);
+x_29 = !lean_is_exclusive(x_27);
+if (x_29 == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_29 = lean_ctor_get(x_26, 0);
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_30 = lean_ctor_get(x_27, 0);
+x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
-lean_dec(x_29);
-x_32 = lean_ctor_get(x_30, 0);
+x_32 = lean_ctor_get(x_30, 1);
 lean_inc(x_32);
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-lean_dec(x_32);
-x_34 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_33);
-x_35 = lean_ctor_get(x_34, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
-lean_inc(x_36);
-lean_dec(x_34);
-x_37 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_37, 0, x_36);
-x_38 = l_Lean_Compiler_LCNF_eraseCode(x_37, x_4, x_5, x_6, x_23);
-x_39 = lean_ctor_get(x_38, 1);
-lean_inc(x_39);
-lean_dec(x_38);
-x_40 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_39);
-if (lean_obj_tag(x_35) == 0)
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; size_t x_50; size_t x_51; lean_object* x_52; 
-x_41 = lean_ctor_get(x_40, 1);
-lean_inc(x_41);
-lean_dec(x_40);
-x_42 = lean_ctor_get(x_35, 1);
-lean_inc(x_42);
-x_43 = lean_ctor_get(x_35, 2);
-lean_inc(x_43);
-lean_dec(x_35);
-x_44 = lean_ctor_get(x_30, 3);
-lean_inc(x_44);
 lean_dec(x_30);
-x_45 = lean_array_get_size(x_31);
-x_46 = l_Array_toSubarray___rarg(x_31, x_44, x_45);
-x_47 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-x_49 = lean_array_get_size(x_42);
-x_50 = lean_usize_of_nat(x_49);
-lean_dec(x_49);
-x_51 = 0;
+x_33 = lean_ctor_get(x_31, 0);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_33, 0);
+lean_inc(x_34);
+lean_dec(x_33);
+x_35 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_34);
+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_37);
+x_39 = l_Lean_Compiler_LCNF_eraseCode(x_38, x_4, x_5, x_6, x_24);
+x_40 = lean_ctor_get(x_39, 1);
+lean_inc(x_40);
+lean_dec(x_39);
+x_41 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_40);
+if (lean_obj_tag(x_36) == 0)
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; size_t x_51; size_t x_52; lean_object* x_53; 
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+lean_dec(x_41);
+x_43 = lean_ctor_get(x_36, 1);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_36, 2);
+lean_inc(x_44);
+lean_dec(x_36);
+x_45 = lean_ctor_get(x_31, 3);
+lean_inc(x_45);
+lean_dec(x_31);
+x_46 = lean_array_get_size(x_32);
+x_47 = l_Array_toSubarray___rarg(x_32, x_45, x_46);
+x_48 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+x_50 = lean_array_get_size(x_43);
+x_51 = lean_usize_of_nat(x_50);
+lean_dec(x_50);
+x_52 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_52 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_42, x_50, x_51, x_48, x_2, x_3, x_4, x_5, x_6, x_41);
-if (lean_obj_tag(x_52) == 0)
+x_53 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_43, x_51, x_52, x_49, x_2, x_3, x_4, x_5, x_6, x_42);
+if (lean_obj_tag(x_53) == 0)
 {
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_53 = lean_ctor_get(x_52, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 1);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_54 = lean_ctor_get(x_53, 0);
 lean_inc(x_54);
-lean_dec(x_52);
 x_55 = lean_ctor_get(x_53, 1);
 lean_inc(x_55);
 lean_dec(x_53);
+x_56 = lean_ctor_get(x_54, 1);
+lean_inc(x_56);
+lean_dec(x_54);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_56 = l_Lean_Compiler_LCNF_Simp_simp(x_43, x_2, x_3, x_4, x_5, x_6, x_54);
-if (lean_obj_tag(x_56) == 0)
+x_57 = l_Lean_Compiler_LCNF_Simp_simp(x_44, x_2, x_3, x_4, x_5, x_6, x_55);
+if (lean_obj_tag(x_57) == 0)
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; 
-x_57 = lean_ctor_get(x_56, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_56, 1);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
-lean_dec(x_56);
-x_59 = l_Lean_Compiler_LCNF_eraseParams(x_42, x_4, x_5, x_6, x_58);
-lean_dec(x_42);
-x_60 = lean_ctor_get(x_59, 1);
-lean_inc(x_60);
-lean_dec(x_59);
-x_61 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_55, x_57, x_2, x_3, x_4, x_5, x_6, x_60);
-lean_dec(x_55);
-x_62 = !lean_is_exclusive(x_61);
-if (x_62 == 0)
-{
-lean_object* x_63; 
-x_63 = lean_ctor_get(x_61, 0);
-lean_ctor_set(x_26, 0, x_63);
-lean_ctor_set(x_61, 0, x_26);
-return x_61;
-}
-else
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_61, 0);
-x_65 = lean_ctor_get(x_61, 1);
-lean_inc(x_65);
-lean_inc(x_64);
-lean_dec(x_61);
-lean_ctor_set(x_26, 0, x_64);
-x_66 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_66, 0, x_26);
-lean_ctor_set(x_66, 1, x_65);
-return x_66;
-}
-}
-else
-{
-uint8_t x_67; 
-lean_dec(x_55);
-lean_dec(x_42);
-lean_free_object(x_26);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_67 = !lean_is_exclusive(x_56);
-if (x_67 == 0)
-{
-return x_56;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_ctor_get(x_56, 0);
-x_69 = lean_ctor_get(x_56, 1);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_dec(x_56);
-x_70 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_70, 0, x_68);
-lean_ctor_set(x_70, 1, x_69);
-return x_70;
-}
-}
-}
-else
-{
-uint8_t x_71; 
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+x_60 = l_Lean_Compiler_LCNF_eraseParams(x_43, x_4, x_5, x_6, x_59);
 lean_dec(x_43);
-lean_dec(x_42);
-lean_free_object(x_26);
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+lean_dec(x_60);
+x_62 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_56, x_58, x_2, x_3, x_4, x_5, x_6, x_61);
+lean_dec(x_56);
+x_63 = !lean_is_exclusive(x_62);
+if (x_63 == 0)
+{
+lean_object* x_64; 
+x_64 = lean_ctor_get(x_62, 0);
+lean_ctor_set(x_27, 0, x_64);
+lean_ctor_set(x_62, 0, x_27);
+return x_62;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_62, 0);
+x_66 = lean_ctor_get(x_62, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_62);
+lean_ctor_set(x_27, 0, x_65);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_27);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
+}
+}
+else
+{
+uint8_t x_68; 
+lean_dec(x_56);
+lean_dec(x_43);
+lean_free_object(x_27);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_71 = !lean_is_exclusive(x_52);
-if (x_71 == 0)
+x_68 = !lean_is_exclusive(x_57);
+if (x_68 == 0)
 {
-return x_52;
+return x_57;
 }
 else
 {
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_52, 0);
-x_73 = lean_ctor_get(x_52, 1);
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_57, 0);
+x_70 = lean_ctor_get(x_57, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_57);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+}
+else
+{
+uint8_t x_72; 
+lean_dec(x_44);
+lean_dec(x_43);
+lean_free_object(x_27);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_72 = !lean_is_exclusive(x_53);
+if (x_72 == 0)
+{
+return x_53;
+}
+else
+{
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_53, 0);
+x_74 = lean_ctor_get(x_53, 1);
+lean_inc(x_74);
 lean_inc(x_73);
-lean_inc(x_72);
-lean_dec(x_52);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
+lean_dec(x_53);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
 }
 }
 else
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+lean_dec(x_32);
 lean_dec(x_31);
-lean_dec(x_30);
-x_75 = lean_ctor_get(x_40, 1);
-lean_inc(x_75);
-lean_dec(x_40);
-x_76 = lean_ctor_get(x_35, 0);
+x_76 = lean_ctor_get(x_41, 1);
 lean_inc(x_76);
-lean_dec(x_35);
-x_77 = l_Lean_Compiler_LCNF_Simp_simp(x_76, x_2, x_3, x_4, x_5, x_6, x_75);
-if (lean_obj_tag(x_77) == 0)
+lean_dec(x_41);
+x_77 = lean_ctor_get(x_36, 0);
+lean_inc(x_77);
+lean_dec(x_36);
+x_78 = l_Lean_Compiler_LCNF_Simp_simp(x_77, x_2, x_3, x_4, x_5, x_6, x_76);
+if (lean_obj_tag(x_78) == 0)
 {
-uint8_t x_78; 
-x_78 = !lean_is_exclusive(x_77);
-if (x_78 == 0)
+uint8_t x_79; 
+x_79 = !lean_is_exclusive(x_78);
+if (x_79 == 0)
 {
-lean_object* x_79; 
-x_79 = lean_ctor_get(x_77, 0);
-lean_ctor_set(x_26, 0, x_79);
-lean_ctor_set(x_77, 0, x_26);
-return x_77;
+lean_object* x_80; 
+x_80 = lean_ctor_get(x_78, 0);
+lean_ctor_set(x_27, 0, x_80);
+lean_ctor_set(x_78, 0, x_27);
+return x_78;
 }
 else
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_77, 0);
-x_81 = lean_ctor_get(x_77, 1);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_78, 0);
+x_82 = lean_ctor_get(x_78, 1);
+lean_inc(x_82);
 lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_77);
-lean_ctor_set(x_26, 0, x_80);
-x_82 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_82, 0, x_26);
-lean_ctor_set(x_82, 1, x_81);
-return x_82;
+lean_dec(x_78);
+lean_ctor_set(x_27, 0, x_81);
+x_83 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_83, 0, x_27);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 else
 {
-uint8_t x_83; 
-lean_free_object(x_26);
-x_83 = !lean_is_exclusive(x_77);
-if (x_83 == 0)
+uint8_t x_84; 
+lean_free_object(x_27);
+x_84 = !lean_is_exclusive(x_78);
+if (x_84 == 0)
 {
-return x_77;
+return x_78;
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_84 = lean_ctor_get(x_77, 0);
-x_85 = lean_ctor_get(x_77, 1);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+x_85 = lean_ctor_get(x_78, 0);
+x_86 = lean_ctor_get(x_78, 1);
+lean_inc(x_86);
 lean_inc(x_85);
-lean_inc(x_84);
-lean_dec(x_77);
-x_86 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_86, 0, x_84);
-lean_ctor_set(x_86, 1, x_85);
-return x_86;
+lean_dec(x_78);
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_85);
+lean_ctor_set(x_87, 1, x_86);
+return x_87;
 }
 }
 }
 }
 else
 {
-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; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_87 = lean_ctor_get(x_26, 0);
-lean_inc(x_87);
-lean_dec(x_26);
-x_88 = lean_ctor_get(x_87, 0);
+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; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+x_88 = lean_ctor_get(x_27, 0);
 lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
+lean_dec(x_27);
+x_89 = lean_ctor_get(x_88, 0);
 lean_inc(x_89);
-lean_dec(x_87);
-x_90 = lean_ctor_get(x_88, 0);
+x_90 = lean_ctor_get(x_88, 1);
 lean_inc(x_90);
-x_91 = lean_ctor_get(x_90, 0);
-lean_inc(x_91);
-lean_dec(x_90);
-x_92 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_91);
-x_93 = lean_ctor_get(x_92, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_92, 1);
-lean_inc(x_94);
-lean_dec(x_92);
-x_95 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_95, 0, x_94);
-x_96 = l_Lean_Compiler_LCNF_eraseCode(x_95, x_4, x_5, x_6, x_23);
-x_97 = lean_ctor_get(x_96, 1);
-lean_inc(x_97);
-lean_dec(x_96);
-x_98 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_97);
-if (lean_obj_tag(x_93) == 0)
-{
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; size_t x_108; size_t x_109; lean_object* x_110; 
-x_99 = lean_ctor_get(x_98, 1);
-lean_inc(x_99);
-lean_dec(x_98);
-x_100 = lean_ctor_get(x_93, 1);
-lean_inc(x_100);
-x_101 = lean_ctor_get(x_93, 2);
-lean_inc(x_101);
-lean_dec(x_93);
-x_102 = lean_ctor_get(x_88, 3);
-lean_inc(x_102);
 lean_dec(x_88);
-x_103 = lean_array_get_size(x_89);
-x_104 = l_Array_toSubarray___rarg(x_89, x_102, x_103);
-x_105 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
-x_106 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_106, 0, x_104);
-lean_ctor_set(x_106, 1, x_105);
-x_107 = lean_array_get_size(x_100);
-x_108 = lean_usize_of_nat(x_107);
-lean_dec(x_107);
-x_109 = 0;
+x_91 = lean_ctor_get(x_89, 0);
+lean_inc(x_91);
+x_92 = lean_ctor_get(x_91, 0);
+lean_inc(x_92);
+lean_dec(x_91);
+x_93 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_92);
+x_94 = lean_ctor_get(x_93, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_93, 1);
+lean_inc(x_95);
+lean_dec(x_93);
+x_96 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_96, 0, x_95);
+x_97 = l_Lean_Compiler_LCNF_eraseCode(x_96, x_4, x_5, x_6, x_24);
+x_98 = lean_ctor_get(x_97, 1);
+lean_inc(x_98);
+lean_dec(x_97);
+x_99 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_98);
+if (lean_obj_tag(x_94) == 0)
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; size_t x_109; size_t x_110; lean_object* x_111; 
+x_100 = lean_ctor_get(x_99, 1);
+lean_inc(x_100);
+lean_dec(x_99);
+x_101 = lean_ctor_get(x_94, 1);
+lean_inc(x_101);
+x_102 = lean_ctor_get(x_94, 2);
+lean_inc(x_102);
+lean_dec(x_94);
+x_103 = lean_ctor_get(x_89, 3);
+lean_inc(x_103);
+lean_dec(x_89);
+x_104 = lean_array_get_size(x_90);
+x_105 = l_Array_toSubarray___rarg(x_90, x_103, x_104);
+x_106 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_105);
+lean_ctor_set(x_107, 1, x_106);
+x_108 = lean_array_get_size(x_101);
+x_109 = lean_usize_of_nat(x_108);
+lean_dec(x_108);
+x_110 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_110 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_100, x_108, x_109, x_106, x_2, x_3, x_4, x_5, x_6, x_99);
-if (lean_obj_tag(x_110) == 0)
+x_111 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_101, x_109, x_110, x_107, x_2, x_3, x_4, x_5, x_6, x_100);
+if (lean_obj_tag(x_111) == 0)
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_111 = lean_ctor_get(x_110, 0);
-lean_inc(x_111);
-x_112 = lean_ctor_get(x_110, 1);
+lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_112 = lean_ctor_get(x_111, 0);
 lean_inc(x_112);
-lean_dec(x_110);
 x_113 = lean_ctor_get(x_111, 1);
 lean_inc(x_113);
 lean_dec(x_111);
+x_114 = lean_ctor_get(x_112, 1);
+lean_inc(x_114);
+lean_dec(x_112);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_114 = l_Lean_Compiler_LCNF_Simp_simp(x_101, x_2, x_3, x_4, x_5, x_6, x_112);
-if (lean_obj_tag(x_114) == 0)
+x_115 = l_Lean_Compiler_LCNF_Simp_simp(x_102, x_2, x_3, x_4, x_5, x_6, x_113);
+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; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
-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; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_116 = lean_ctor_get(x_115, 0);
 lean_inc(x_116);
-lean_dec(x_114);
-x_117 = l_Lean_Compiler_LCNF_eraseParams(x_100, x_4, x_5, x_6, x_116);
-lean_dec(x_100);
-x_118 = lean_ctor_get(x_117, 1);
-lean_inc(x_118);
-lean_dec(x_117);
-x_119 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_113, x_115, x_2, x_3, x_4, x_5, x_6, x_118);
-lean_dec(x_113);
-x_120 = lean_ctor_get(x_119, 0);
-lean_inc(x_120);
-x_121 = lean_ctor_get(x_119, 1);
-lean_inc(x_121);
-if (lean_is_exclusive(x_119)) {
- lean_ctor_release(x_119, 0);
- lean_ctor_release(x_119, 1);
- x_122 = x_119;
-} else {
- lean_dec_ref(x_119);
- x_122 = lean_box(0);
-}
-x_123 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_123, 0, x_120);
-if (lean_is_scalar(x_122)) {
- x_124 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_124 = x_122;
-}
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_121);
-return x_124;
-}
-else
-{
-lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; 
-lean_dec(x_113);
-lean_dec(x_100);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_125 = lean_ctor_get(x_114, 0);
-lean_inc(x_125);
-x_126 = lean_ctor_get(x_114, 1);
-lean_inc(x_126);
-if (lean_is_exclusive(x_114)) {
- lean_ctor_release(x_114, 0);
- lean_ctor_release(x_114, 1);
- x_127 = x_114;
-} else {
- lean_dec_ref(x_114);
- x_127 = lean_box(0);
-}
-if (lean_is_scalar(x_127)) {
- x_128 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_128 = x_127;
-}
-lean_ctor_set(x_128, 0, x_125);
-lean_ctor_set(x_128, 1, x_126);
-return x_128;
-}
-}
-else
-{
-lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+lean_dec(x_115);
+x_118 = l_Lean_Compiler_LCNF_eraseParams(x_101, x_4, x_5, x_6, x_117);
+lean_dec(x_101);
+x_119 = lean_ctor_get(x_118, 1);
+lean_inc(x_119);
+lean_dec(x_118);
+x_120 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_114, x_116, x_2, x_3, x_4, x_5, x_6, x_119);
+lean_dec(x_114);
+x_121 = lean_ctor_get(x_120, 0);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_120, 1);
+lean_inc(x_122);
+if (lean_is_exclusive(x_120)) {
+ lean_ctor_release(x_120, 0);
+ lean_ctor_release(x_120, 1);
+ x_123 = x_120;
+} else {
+ lean_dec_ref(x_120);
+ x_123 = lean_box(0);
+}
+x_124 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_124, 0, x_121);
+if (lean_is_scalar(x_123)) {
+ x_125 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_125 = x_123;
+}
+lean_ctor_set(x_125, 0, x_124);
+lean_ctor_set(x_125, 1, x_122);
+return x_125;
+}
+else
+{
+lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+lean_dec(x_114);
 lean_dec(x_101);
-lean_dec(x_100);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_129 = lean_ctor_get(x_110, 0);
-lean_inc(x_129);
-x_130 = lean_ctor_get(x_110, 1);
+x_126 = lean_ctor_get(x_115, 0);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_115, 1);
+lean_inc(x_127);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_128 = x_115;
+} else {
+ lean_dec_ref(x_115);
+ x_128 = lean_box(0);
+}
+if (lean_is_scalar(x_128)) {
+ x_129 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_129 = x_128;
+}
+lean_ctor_set(x_129, 0, x_126);
+lean_ctor_set(x_129, 1, x_127);
+return x_129;
+}
+}
+else
+{
+lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
+lean_dec(x_102);
+lean_dec(x_101);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_130 = lean_ctor_get(x_111, 0);
 lean_inc(x_130);
-if (lean_is_exclusive(x_110)) {
- lean_ctor_release(x_110, 0);
- lean_ctor_release(x_110, 1);
- x_131 = x_110;
+x_131 = lean_ctor_get(x_111, 1);
+lean_inc(x_131);
+if (lean_is_exclusive(x_111)) {
+ lean_ctor_release(x_111, 0);
+ lean_ctor_release(x_111, 1);
+ x_132 = x_111;
 } else {
- lean_dec_ref(x_110);
- x_131 = lean_box(0);
+ lean_dec_ref(x_111);
+ x_132 = lean_box(0);
 }
-if (lean_is_scalar(x_131)) {
- x_132 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_132)) {
+ x_133 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_132 = x_131;
+ x_133 = x_132;
 }
-lean_ctor_set(x_132, 0, x_129);
-lean_ctor_set(x_132, 1, x_130);
-return x_132;
+lean_ctor_set(x_133, 0, x_130);
+lean_ctor_set(x_133, 1, x_131);
+return x_133;
 }
 }
 else
 {
-lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+lean_object* x_134; lean_object* x_135; lean_object* x_136; 
+lean_dec(x_90);
 lean_dec(x_89);
-lean_dec(x_88);
-x_133 = lean_ctor_get(x_98, 1);
-lean_inc(x_133);
-lean_dec(x_98);
-x_134 = lean_ctor_get(x_93, 0);
+x_134 = lean_ctor_get(x_99, 1);
 lean_inc(x_134);
-lean_dec(x_93);
-x_135 = l_Lean_Compiler_LCNF_Simp_simp(x_134, x_2, x_3, x_4, x_5, x_6, x_133);
-if (lean_obj_tag(x_135) == 0)
+lean_dec(x_99);
+x_135 = lean_ctor_get(x_94, 0);
+lean_inc(x_135);
+lean_dec(x_94);
+x_136 = l_Lean_Compiler_LCNF_Simp_simp(x_135, x_2, x_3, x_4, x_5, x_6, x_134);
+if (lean_obj_tag(x_136) == 0)
 {
-lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_136 = lean_ctor_get(x_135, 0);
-lean_inc(x_136);
-x_137 = lean_ctor_get(x_135, 1);
+lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_137 = lean_ctor_get(x_136, 0);
 lean_inc(x_137);
-if (lean_is_exclusive(x_135)) {
- lean_ctor_release(x_135, 0);
- lean_ctor_release(x_135, 1);
- x_138 = x_135;
+x_138 = lean_ctor_get(x_136, 1);
+lean_inc(x_138);
+if (lean_is_exclusive(x_136)) {
+ lean_ctor_release(x_136, 0);
+ lean_ctor_release(x_136, 1);
+ x_139 = x_136;
 } else {
- lean_dec_ref(x_135);
- x_138 = lean_box(0);
+ lean_dec_ref(x_136);
+ x_139 = lean_box(0);
 }
-x_139 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_139, 0, x_136);
-if (lean_is_scalar(x_138)) {
- x_140 = lean_alloc_ctor(0, 2, 0);
+x_140 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_140, 0, x_137);
+if (lean_is_scalar(x_139)) {
+ x_141 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_140 = x_138;
+ x_141 = x_139;
 }
-lean_ctor_set(x_140, 0, x_139);
-lean_ctor_set(x_140, 1, x_137);
-return x_140;
+lean_ctor_set(x_141, 0, x_140);
+lean_ctor_set(x_141, 1, x_138);
+return x_141;
 }
 else
 {
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_141 = lean_ctor_get(x_135, 0);
-lean_inc(x_141);
-x_142 = lean_ctor_get(x_135, 1);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+x_142 = lean_ctor_get(x_136, 0);
 lean_inc(x_142);
-if (lean_is_exclusive(x_135)) {
- lean_ctor_release(x_135, 0);
- lean_ctor_release(x_135, 1);
- x_143 = x_135;
+x_143 = lean_ctor_get(x_136, 1);
+lean_inc(x_143);
+if (lean_is_exclusive(x_136)) {
+ lean_ctor_release(x_136, 0);
+ lean_ctor_release(x_136, 1);
+ x_144 = x_136;
 } else {
- lean_dec_ref(x_135);
- x_143 = lean_box(0);
+ lean_dec_ref(x_136);
+ x_144 = lean_box(0);
 }
-if (lean_is_scalar(x_143)) {
- x_144 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_144)) {
+ x_145 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_144 = x_143;
+ x_145 = x_144;
 }
-lean_ctor_set(x_144, 0, x_141);
-lean_ctor_set(x_144, 1, x_142);
-return x_144;
+lean_ctor_set(x_145, 0, x_142);
+lean_ctor_set(x_145, 1, x_143);
+return x_145;
 }
 }
 }
@@ -29466,297 +29913,562 @@ return x_144;
 }
 else
 {
-lean_object* x_145; lean_object* x_146; lean_object* x_147; uint8_t x_148; lean_object* x_149; 
-x_145 = lean_ctor_get(x_20, 0);
-x_146 = lean_ctor_get(x_20, 1);
-lean_inc(x_146);
-lean_inc(x_145);
-lean_dec(x_20);
-x_147 = lean_ctor_get(x_145, 0);
+lean_object* x_146; lean_object* x_147; lean_object* x_148; uint8_t x_149; lean_object* x_150; 
+x_146 = lean_ctor_get(x_21, 0);
+x_147 = lean_ctor_get(x_21, 1);
 lean_inc(x_147);
-lean_dec(x_145);
-x_148 = 1;
-x_149 = l_Lean_Expr_constructorApp_x3f(x_147, x_18, x_148);
-if (lean_obj_tag(x_149) == 0)
+lean_inc(x_146);
+lean_dec(x_21);
+x_148 = lean_ctor_get(x_146, 0);
+lean_inc(x_148);
+lean_dec(x_146);
+x_149 = 1;
+x_150 = l_Lean_Expr_constructorApp_x3f(x_148, x_19, x_149);
+if (lean_obj_tag(x_150) == 0)
 {
-lean_object* x_150; lean_object* x_151; 
+lean_object* x_151; lean_object* x_152; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_150 = lean_box(0);
-x_151 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_151, 0, x_150);
-lean_ctor_set(x_151, 1, x_146);
-return x_151;
+x_151 = lean_box(0);
+x_152 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_152, 0, x_151);
+lean_ctor_set(x_152, 1, x_147);
+return x_152;
 }
 else
 {
-lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-x_152 = lean_ctor_get(x_149, 0);
-lean_inc(x_152);
-if (lean_is_exclusive(x_149)) {
- lean_ctor_release(x_149, 0);
- x_153 = x_149;
+lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
+x_153 = lean_ctor_get(x_150, 0);
+lean_inc(x_153);
+if (lean_is_exclusive(x_150)) {
+ lean_ctor_release(x_150, 0);
+ x_154 = x_150;
 } else {
- lean_dec_ref(x_149);
- x_153 = lean_box(0);
+ lean_dec_ref(x_150);
+ x_154 = lean_box(0);
 }
-x_154 = lean_ctor_get(x_152, 0);
-lean_inc(x_154);
-x_155 = lean_ctor_get(x_152, 1);
+x_155 = lean_ctor_get(x_153, 0);
 lean_inc(x_155);
-lean_dec(x_152);
-x_156 = lean_ctor_get(x_154, 0);
+x_156 = lean_ctor_get(x_153, 1);
 lean_inc(x_156);
-x_157 = lean_ctor_get(x_156, 0);
+lean_dec(x_153);
+x_157 = lean_ctor_get(x_155, 0);
 lean_inc(x_157);
-lean_dec(x_156);
-x_158 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_157);
-x_159 = lean_ctor_get(x_158, 0);
-lean_inc(x_159);
-x_160 = lean_ctor_get(x_158, 1);
+x_158 = lean_ctor_get(x_157, 0);
+lean_inc(x_158);
+lean_dec(x_157);
+x_159 = l_Lean_Compiler_LCNF_CasesCore_extractAlt_x21(x_1, x_158);
+x_160 = lean_ctor_get(x_159, 0);
 lean_inc(x_160);
-lean_dec(x_158);
-x_161 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_161, 0, x_160);
-x_162 = l_Lean_Compiler_LCNF_eraseCode(x_161, x_4, x_5, x_6, x_146);
-x_163 = lean_ctor_get(x_162, 1);
-lean_inc(x_163);
-lean_dec(x_162);
-x_164 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_163);
-if (lean_obj_tag(x_159) == 0)
-{
-lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; size_t x_174; size_t x_175; lean_object* x_176; 
-x_165 = lean_ctor_get(x_164, 1);
-lean_inc(x_165);
-lean_dec(x_164);
-x_166 = lean_ctor_get(x_159, 1);
-lean_inc(x_166);
-x_167 = lean_ctor_get(x_159, 2);
-lean_inc(x_167);
+x_161 = lean_ctor_get(x_159, 1);
+lean_inc(x_161);
 lean_dec(x_159);
-x_168 = lean_ctor_get(x_154, 3);
+x_162 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_162, 0, x_161);
+x_163 = l_Lean_Compiler_LCNF_eraseCode(x_162, x_4, x_5, x_6, x_147);
+x_164 = lean_ctor_get(x_163, 1);
+lean_inc(x_164);
+lean_dec(x_163);
+x_165 = l_Lean_Compiler_LCNF_Simp_markSimplified___rarg(x_3, x_4, x_5, x_6, x_164);
+if (lean_obj_tag(x_160) == 0)
+{
+lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; size_t x_175; size_t x_176; lean_object* x_177; 
+x_166 = lean_ctor_get(x_165, 1);
+lean_inc(x_166);
+lean_dec(x_165);
+x_167 = lean_ctor_get(x_160, 1);
+lean_inc(x_167);
+x_168 = lean_ctor_get(x_160, 2);
 lean_inc(x_168);
-lean_dec(x_154);
-x_169 = lean_array_get_size(x_155);
-x_170 = l_Array_toSubarray___rarg(x_155, x_168, x_169);
-x_171 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
-x_172 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_172, 0, x_170);
-lean_ctor_set(x_172, 1, x_171);
-x_173 = lean_array_get_size(x_166);
-x_174 = lean_usize_of_nat(x_173);
-lean_dec(x_173);
-x_175 = 0;
+lean_dec(x_160);
+x_169 = lean_ctor_get(x_155, 3);
+lean_inc(x_169);
+lean_dec(x_155);
+x_170 = lean_array_get_size(x_156);
+x_171 = l_Array_toSubarray___rarg(x_156, x_169, x_170);
+x_172 = l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1;
+x_173 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_173, 0, x_171);
+lean_ctor_set(x_173, 1, x_172);
+x_174 = lean_array_get_size(x_167);
+x_175 = lean_usize_of_nat(x_174);
+lean_dec(x_174);
+x_176 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_176 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_166, x_174, x_175, x_172, x_2, x_3, x_4, x_5, x_6, x_165);
-if (lean_obj_tag(x_176) == 0)
+x_177 = l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Simp_simpCasesOnCtor_x3f___spec__1(x_167, x_175, x_176, x_173, x_2, x_3, x_4, x_5, x_6, x_166);
+if (lean_obj_tag(x_177) == 0)
 {
-lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_177 = lean_ctor_get(x_176, 0);
-lean_inc(x_177);
-x_178 = lean_ctor_get(x_176, 1);
+lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; 
+x_178 = lean_ctor_get(x_177, 0);
 lean_inc(x_178);
-lean_dec(x_176);
 x_179 = lean_ctor_get(x_177, 1);
 lean_inc(x_179);
 lean_dec(x_177);
+x_180 = lean_ctor_get(x_178, 1);
+lean_inc(x_180);
+lean_dec(x_178);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_180 = l_Lean_Compiler_LCNF_Simp_simp(x_167, x_2, x_3, x_4, x_5, x_6, x_178);
-if (lean_obj_tag(x_180) == 0)
+x_181 = l_Lean_Compiler_LCNF_Simp_simp(x_168, x_2, x_3, x_4, x_5, x_6, x_179);
+if (lean_obj_tag(x_181) == 0)
 {
-lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; 
-x_181 = lean_ctor_get(x_180, 0);
-lean_inc(x_181);
-x_182 = lean_ctor_get(x_180, 1);
+lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+x_182 = lean_ctor_get(x_181, 0);
 lean_inc(x_182);
-lean_dec(x_180);
-x_183 = l_Lean_Compiler_LCNF_eraseParams(x_166, x_4, x_5, x_6, x_182);
-lean_dec(x_166);
-x_184 = lean_ctor_get(x_183, 1);
-lean_inc(x_184);
-lean_dec(x_183);
-x_185 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_179, x_181, x_2, x_3, x_4, x_5, x_6, x_184);
-lean_dec(x_179);
-x_186 = lean_ctor_get(x_185, 0);
-lean_inc(x_186);
-x_187 = lean_ctor_get(x_185, 1);
-lean_inc(x_187);
-if (lean_is_exclusive(x_185)) {
- lean_ctor_release(x_185, 0);
- lean_ctor_release(x_185, 1);
- x_188 = x_185;
-} else {
- lean_dec_ref(x_185);
- x_188 = lean_box(0);
-}
-if (lean_is_scalar(x_153)) {
- x_189 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_189 = x_153;
-}
-lean_ctor_set(x_189, 0, x_186);
-if (lean_is_scalar(x_188)) {
- x_190 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_190 = x_188;
-}
-lean_ctor_set(x_190, 0, x_189);
-lean_ctor_set(x_190, 1, x_187);
-return x_190;
-}
-else
-{
-lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-lean_dec(x_179);
-lean_dec(x_166);
-lean_dec(x_153);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_191 = lean_ctor_get(x_180, 0);
-lean_inc(x_191);
-x_192 = lean_ctor_get(x_180, 1);
-lean_inc(x_192);
-if (lean_is_exclusive(x_180)) {
- lean_ctor_release(x_180, 0);
- lean_ctor_release(x_180, 1);
- x_193 = x_180;
-} else {
- lean_dec_ref(x_180);
- x_193 = lean_box(0);
-}
-if (lean_is_scalar(x_193)) {
- x_194 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_194 = x_193;
-}
-lean_ctor_set(x_194, 0, x_191);
-lean_ctor_set(x_194, 1, x_192);
-return x_194;
-}
-}
-else
-{
-lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+x_183 = lean_ctor_get(x_181, 1);
+lean_inc(x_183);
+lean_dec(x_181);
+x_184 = l_Lean_Compiler_LCNF_eraseParams(x_167, x_4, x_5, x_6, x_183);
 lean_dec(x_167);
-lean_dec(x_166);
-lean_dec(x_153);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_195 = lean_ctor_get(x_176, 0);
-lean_inc(x_195);
-x_196 = lean_ctor_get(x_176, 1);
-lean_inc(x_196);
-if (lean_is_exclusive(x_176)) {
- lean_ctor_release(x_176, 0);
- lean_ctor_release(x_176, 1);
- x_197 = x_176;
+x_185 = lean_ctor_get(x_184, 1);
+lean_inc(x_185);
+lean_dec(x_184);
+x_186 = l_Lean_Compiler_LCNF_Simp_attachCodeDecls(x_180, x_182, x_2, x_3, x_4, x_5, x_6, x_185);
+lean_dec(x_180);
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+if (lean_is_exclusive(x_186)) {
+ lean_ctor_release(x_186, 0);
+ lean_ctor_release(x_186, 1);
+ x_189 = x_186;
 } else {
- lean_dec_ref(x_176);
- x_197 = lean_box(0);
+ lean_dec_ref(x_186);
+ x_189 = lean_box(0);
 }
-if (lean_is_scalar(x_197)) {
- x_198 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_154)) {
+ x_190 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_198 = x_197;
+ x_190 = x_154;
 }
-lean_ctor_set(x_198, 0, x_195);
-lean_ctor_set(x_198, 1, x_196);
-return x_198;
+lean_ctor_set(x_190, 0, x_187);
+if (lean_is_scalar(x_189)) {
+ x_191 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_191 = x_189;
 }
+lean_ctor_set(x_191, 0, x_190);
+lean_ctor_set(x_191, 1, x_188);
+return x_191;
 }
 else
 {
-lean_object* x_199; lean_object* x_200; lean_object* x_201; 
-lean_dec(x_155);
+lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; 
+lean_dec(x_180);
+lean_dec(x_167);
 lean_dec(x_154);
-x_199 = lean_ctor_get(x_164, 1);
-lean_inc(x_199);
-lean_dec(x_164);
-x_200 = lean_ctor_get(x_159, 0);
-lean_inc(x_200);
-lean_dec(x_159);
-x_201 = l_Lean_Compiler_LCNF_Simp_simp(x_200, x_2, x_3, x_4, x_5, x_6, x_199);
-if (lean_obj_tag(x_201) == 0)
-{
-lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
-x_202 = lean_ctor_get(x_201, 0);
-lean_inc(x_202);
-x_203 = lean_ctor_get(x_201, 1);
-lean_inc(x_203);
-if (lean_is_exclusive(x_201)) {
- lean_ctor_release(x_201, 0);
- lean_ctor_release(x_201, 1);
- x_204 = x_201;
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_192 = lean_ctor_get(x_181, 0);
+lean_inc(x_192);
+x_193 = lean_ctor_get(x_181, 1);
+lean_inc(x_193);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_194 = x_181;
 } else {
- lean_dec_ref(x_201);
- x_204 = lean_box(0);
+ lean_dec_ref(x_181);
+ x_194 = lean_box(0);
 }
-if (lean_is_scalar(x_153)) {
- x_205 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_194)) {
+ x_195 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_205 = x_153;
+ x_195 = x_194;
 }
-lean_ctor_set(x_205, 0, x_202);
-if (lean_is_scalar(x_204)) {
- x_206 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_206 = x_204;
+lean_ctor_set(x_195, 0, x_192);
+lean_ctor_set(x_195, 1, x_193);
+return x_195;
 }
-lean_ctor_set(x_206, 0, x_205);
-lean_ctor_set(x_206, 1, x_203);
-return x_206;
 }
 else
 {
-lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
-lean_dec(x_153);
-x_207 = lean_ctor_get(x_201, 0);
-lean_inc(x_207);
-x_208 = lean_ctor_get(x_201, 1);
+lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
+lean_dec(x_168);
+lean_dec(x_167);
+lean_dec(x_154);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_196 = lean_ctor_get(x_177, 0);
+lean_inc(x_196);
+x_197 = lean_ctor_get(x_177, 1);
+lean_inc(x_197);
+if (lean_is_exclusive(x_177)) {
+ lean_ctor_release(x_177, 0);
+ lean_ctor_release(x_177, 1);
+ x_198 = x_177;
+} else {
+ lean_dec_ref(x_177);
+ x_198 = lean_box(0);
+}
+if (lean_is_scalar(x_198)) {
+ x_199 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_199 = x_198;
+}
+lean_ctor_set(x_199, 0, x_196);
+lean_ctor_set(x_199, 1, x_197);
+return x_199;
+}
+}
+else
+{
+lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+lean_dec(x_156);
+lean_dec(x_155);
+x_200 = lean_ctor_get(x_165, 1);
+lean_inc(x_200);
+lean_dec(x_165);
+x_201 = lean_ctor_get(x_160, 0);
+lean_inc(x_201);
+lean_dec(x_160);
+x_202 = l_Lean_Compiler_LCNF_Simp_simp(x_201, x_2, x_3, x_4, x_5, x_6, x_200);
+if (lean_obj_tag(x_202) == 0)
+{
+lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; 
+x_203 = lean_ctor_get(x_202, 0);
+lean_inc(x_203);
+x_204 = lean_ctor_get(x_202, 1);
+lean_inc(x_204);
+if (lean_is_exclusive(x_202)) {
+ lean_ctor_release(x_202, 0);
+ lean_ctor_release(x_202, 1);
+ x_205 = x_202;
+} else {
+ lean_dec_ref(x_202);
+ x_205 = lean_box(0);
+}
+if (lean_is_scalar(x_154)) {
+ x_206 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_206 = x_154;
+}
+lean_ctor_set(x_206, 0, x_203);
+if (lean_is_scalar(x_205)) {
+ x_207 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_207 = x_205;
+}
+lean_ctor_set(x_207, 0, x_206);
+lean_ctor_set(x_207, 1, x_204);
+return x_207;
+}
+else
+{
+lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; 
+lean_dec(x_154);
+x_208 = lean_ctor_get(x_202, 0);
 lean_inc(x_208);
-if (lean_is_exclusive(x_201)) {
- lean_ctor_release(x_201, 0);
- lean_ctor_release(x_201, 1);
- x_209 = x_201;
+x_209 = lean_ctor_get(x_202, 1);
+lean_inc(x_209);
+if (lean_is_exclusive(x_202)) {
+ lean_ctor_release(x_202, 0);
+ lean_ctor_release(x_202, 1);
+ x_210 = x_202;
 } else {
- lean_dec_ref(x_201);
- x_209 = lean_box(0);
+ lean_dec_ref(x_202);
+ x_210 = lean_box(0);
 }
-if (lean_is_scalar(x_209)) {
- x_210 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_210)) {
+ x_211 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_210 = x_209;
+ x_211 = x_210;
 }
-lean_ctor_set(x_210, 0, x_207);
-lean_ctor_set(x_210, 1, x_208);
-return x_210;
+lean_ctor_set(x_211, 0, x_208);
+lean_ctor_set(x_211, 1, x_209);
+return x_211;
 }
 }
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, 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; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_9 = lean_ctor_get(x_2, 2);
+lean_inc(x_9);
+x_10 = lean_st_ref_get(x_7, x_8);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_st_ref_get(x_4, x_11);
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = lean_ctor_get(x_13, 0);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_15, x_1, x_9);
+x_17 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateParamImp(x_2, x_16, x_5, x_6, x_7, x_14);
+return x_17;
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_array_get_size(x_3);
+x_11 = lean_nat_dec_lt(x_2, x_10);
+lean_dec(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_3);
+lean_ctor_set(x_12, 1, x_9);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_array_fget(x_3, x_2);
+lean_inc(x_1);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_13);
+x_14 = lean_apply_7(x_1, x_13, x_4, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; size_t x_17; size_t x_18; uint8_t x_19; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_ptr_addr(x_13);
+lean_dec(x_13);
+x_18 = lean_ptr_addr(x_15);
+x_19 = lean_usize_dec_eq(x_17, x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_unsigned_to_nat(1u);
+x_21 = lean_nat_add(x_2, x_20);
+x_22 = lean_array_fset(x_3, x_2, x_15);
+lean_dec(x_2);
+x_2 = x_21;
+x_3 = x_22;
+x_9 = x_16;
+goto _start;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; 
+lean_dec(x_15);
+x_24 = lean_unsigned_to_nat(1u);
+x_25 = lean_nat_add(x_2, x_24);
+lean_dec(x_2);
+x_2 = x_25;
+x_9 = x_16;
+goto _start;
+}
+}
+else
+{
+uint8_t x_27; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_27 = !lean_is_exclusive(x_14);
+if (x_27 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_14, 0);
+x_29 = lean_ctor_get(x_14, 1);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_14);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
+}
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp_go___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__4(x_2, x_9, x_1, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_9 = lean_box(x_1);
+x_10 = lean_alloc_closure((void*)(l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed), 8, 1);
+lean_closure_set(x_10, 0, x_9);
+x_11 = l___private_Init_Data_Array_BasicAux_0__mapMonoMImp___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__3(x_2, x_10, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_11;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_simpFunDecl(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_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_8 = lean_ctor_get(x_1, 3);
+lean_inc(x_8);
+x_9 = lean_st_ref_get(x_6, x_7);
+x_10 = lean_ctor_get(x_9, 1);
+lean_inc(x_10);
+lean_dec(x_9);
+x_11 = lean_st_ref_get(x_3, x_10);
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_11, 1);
+lean_inc(x_13);
+lean_dec(x_11);
+x_14 = lean_ctor_get(x_12, 0);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = 0;
+x_16 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_14, x_15, x_8);
+x_17 = lean_ctor_get(x_1, 2);
+lean_inc(x_17);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+x_18 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(x_15, x_17, x_2, x_3, x_4, x_5, x_6, x_13);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+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_ctor_get(x_1, 4);
+lean_inc(x_21);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_22 = l_Lean_Compiler_LCNF_Simp_simp(x_21, x_2, x_3, x_4, x_5, x_6, x_20);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+x_24 = lean_ctor_get(x_22, 1);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_updateFunDeclImp(x_1, x_16, x_19, x_23, x_4, x_5, x_6, x_24);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_25;
+}
+else
+{
+uint8_t x_26; 
+lean_dec(x_19);
+lean_dec(x_16);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_26 = !lean_is_exclusive(x_22);
+if (x_26 == 0)
+{
+return x_22;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_22, 0);
+x_28 = lean_ctor_get(x_22, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_22);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
+}
+}
+}
+else
+{
+uint8_t x_30; 
+lean_dec(x_16);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_30 = !lean_is_exclusive(x_18);
+if (x_30 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_18, 0);
+x_32 = lean_ctor_get(x_18, 1);
+lean_inc(x_32);
+lean_inc(x_31);
+lean_dec(x_18);
+x_33 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+return x_33;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -29765,30 +30477,79 @@ lean_dec(x_2);
 return x_8;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_8; 
-x_8 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_object* x_9; 
+x_9 = l_Lean_addTrace___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__2(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);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
+return x_9;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___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_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+return x_8;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Simp_inlineApp_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) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l_Lean_Compiler_LCNF_normLetDecl___at_Lean_Compiler_LCNF_Simp_simp___spec__1(x_9, 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);
 lean_dec(x_4);
 lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___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_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l_Lean_Compiler_LCNF_normExpr___at_Lean_Compiler_LCNF_Simp_simp___spec__3(x_9, 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);
+lean_dec(x_4);
+lean_dec(x_3);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
 }
 }
 LEAN_EXPORT lean_object* l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__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) {
@@ -29915,6 +30676,31 @@ lean_dec(x_1);
 return x_13;
 }
 }
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l_Lean_Compiler_LCNF_normParam___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__2(x_9, 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);
+lean_dec(x_4);
+lean_dec(x_3);
+return x_10;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; lean_object* x_10; 
+x_9 = lean_unbox(x_1);
+lean_dec(x_1);
+x_10 = l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
 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, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
@@ -30254,7 +31040,7 @@ lean_dec(x_81);
 lean_inc(x_3);
 x_84 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_84, 0, x_3);
-x_85 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8;
+x_85 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8;
 x_86 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_86, 0, x_85);
 lean_ctor_set(x_86, 1, x_84);
@@ -30359,7 +31145,7 @@ lean_dec(x_31);
 lean_inc(x_3);
 x_38 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_38, 0, x_3);
-x_39 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8;
+x_39 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8;
 x_40 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
@@ -30489,7 +31275,7 @@ static lean_object* _init_l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5;
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5;
 x_2 = l_Lean_Compiler_LCNF_Decl_simp_x3f___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -30552,7 +31338,7 @@ lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23;
 x_20 = lean_ctor_get(x_17, 1);
 lean_inc(x_20);
 lean_dec(x_17);
-x_21 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
+x_21 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 x_22 = lean_box(0);
 x_23 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_21, x_12, x_8, x_9, x_10, x_11, x_1, x_22, x_2, x_3, x_4, x_5, x_6, x_20);
 return x_23;
@@ -30588,7 +31374,7 @@ lean_dec(x_31);
 lean_inc(x_8);
 x_34 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_34, 0, x_8);
-x_35 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8;
+x_35 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8;
 x_36 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
@@ -30614,7 +31400,7 @@ lean_inc(x_45);
 x_46 = lean_ctor_get(x_44, 1);
 lean_inc(x_46);
 lean_dec(x_44);
-x_47 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
+x_47 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 x_48 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2(x_47, x_12, x_8, x_9, x_10, x_11, x_1, x_45, x_2, x_3, x_4, x_5, x_6, x_46);
 return x_48;
 }
@@ -30921,7 +31707,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3;
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -30938,41 +31724,41 @@ 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_12074____closed__1() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 x_2 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__3;
 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_Simp___hyg_12074____closed__2() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
+x_1 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 x_2 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___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_Simp___hyg_12074____closed__3() {
+static lean_object* _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2;
+x_1 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2;
 x_2 = l_Lean_Compiler_LCNF_Decl_simp_x3f___lambda__2___closed__2;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4;
+x_2 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4;
 x_3 = 1;
 x_4 = l_Lean_registerTraceClass(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)
@@ -30981,7 +31767,7 @@ lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8;
 x_5 = lean_ctor_get(x_4, 1);
 lean_inc(x_5);
 lean_dec(x_4);
-x_6 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5;
+x_6 = l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5;
 x_7 = 0;
 x_8 = l_Lean_registerTraceClass(x_6, x_7, x_5);
 if (lean_obj_tag(x_8) == 0)
@@ -30990,7 +31776,7 @@ lean_object* x_9; lean_object* x_10; lean_object* x_11;
 x_9 = lean_ctor_get(x_8, 1);
 lean_inc(x_9);
 lean_dec(x_8);
-x_10 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__1;
+x_10 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__1;
 x_11 = l_Lean_registerTraceClass(x_10, x_7, x_9);
 if (lean_obj_tag(x_11) == 0)
 {
@@ -30998,7 +31784,7 @@ lean_object* x_12; lean_object* x_13; lean_object* x_14;
 x_12 = lean_ctor_get(x_11, 1);
 lean_inc(x_12);
 lean_dec(x_11);
-x_13 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2;
+x_13 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2;
 x_14 = l_Lean_registerTraceClass(x_13, x_7, x_12);
 if (lean_obj_tag(x_14) == 0)
 {
@@ -31006,7 +31792,7 @@ lean_object* x_15; lean_object* x_16; lean_object* x_17;
 x_15 = lean_ctor_get(x_14, 1);
 lean_inc(x_15);
 lean_dec(x_14);
-x_16 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__3;
+x_16 = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3;
 x_17 = l_Lean_registerTraceClass(x_16, x_7, x_15);
 return x_17;
 }
@@ -31255,12 +32041,12 @@ l_Lean_Compiler_LCNF_Simp_State_inline___default = _init_l_Lean_Compiler_LCNF_Si
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_State_inline___default);
 l_Lean_Compiler_LCNF_Simp_State_inlineLocal___default = _init_l_Lean_Compiler_LCNF_Simp_State_inlineLocal___default();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_State_inlineLocal___default);
-l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__1);
-l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM___closed__2);
-l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpM);
+l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__1);
+l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse___closed__2);
+l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse = _init_l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_instMonadFVarSubstSimpMFalse);
 l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__1 = _init_l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__1();
 lean_mark_persistent(l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__1);
 l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__2 = _init_l_Lean_throwError___at_Lean_Compiler_LCNF_Simp_withDiscrCtor___spec__3___closed__2();
@@ -31293,48 +32079,20 @@ 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___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1 = _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1();
+lean_mark_persistent(l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__1);
+l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2 = _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2();
+lean_mark_persistent(l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__2);
+l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3 = _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3();
+lean_mark_persistent(l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__3);
+l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4 = _init_l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4();
+lean_mark_persistent(l___private_Lean_Compiler_LCNF_Simp_0__Lean_Compiler_LCNF_Simp_oneExitPointQuick_go___closed__4);
 l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__1);
 l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__2();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__2);
 l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_specializePartialApp___closed__3);
-l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1 = _init_l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1();
-lean_mark_persistent(l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__1);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__3___closed__2);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__1);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__2);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__3);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__4);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__5);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__6);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__7);
-l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__5___closed__8);
-l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__1);
-l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__2);
-l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__3);
-l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4 = _init_l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4();
-lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_attachCodeDecls_go___closed__4);
 l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__1 = _init_l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__1();
 lean_mark_persistent(l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__1);
 l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__2 = _init_l_panic___at_Lean_Compiler_LCNF_Simp_inlineProjInst_x3f_visit___spec__1___closed__2();
@@ -31375,10 +32133,34 @@ l_Lean_Compiler_LCNF_Simp_simpAppApp_x3f___closed__1 = _init_l_Lean_Compiler_LCN
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_simpAppApp_x3f___closed__1);
 l_Lean_Compiler_LCNF_Simp_applyImplementedBy_x3f___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_applyImplementedBy_x3f___closed__1();
 lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_applyImplementedBy_x3f___closed__1);
-l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1 = _init_l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normParams___at_Lean_Compiler_LCNF_Simp_simpFunDecl___spec__1___closed__1);
-l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1 = _init_l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_normExprs___at_Lean_Compiler_LCNF_Simp_simp___spec__2___closed__1);
+l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__1);
+l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_etaPolyApp_x3f___closed__2);
+l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1 = _init_l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1();
+lean_mark_persistent(l_Lean_isTracingEnabledFor___at_Lean_Compiler_LCNF_Simp_inlineApp_x3f___spec__1___closed__1);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__1);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__2);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___lambda__2___closed__3);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__1);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__2);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__3);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__4);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__5);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__6);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__7);
+l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8 = _init_l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8();
+lean_mark_persistent(l_Lean_Compiler_LCNF_Simp_inlineApp_x3f___closed__8);
 l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__1 = _init_l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__1();
 lean_mark_persistent(l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__1);
 l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__2 = _init_l_Lean_throwMaxRecDepthAt___at_Lean_Compiler_LCNF_Simp_simp___spec__8___closed__2();
@@ -31423,13 +32205,13 @@ l_Lean_Compiler_LCNF_Decl_simp_go___closed__1 = _init_l_Lean_Compiler_LCNF_Decl_
 lean_mark_persistent(l_Lean_Compiler_LCNF_Decl_simp_go___closed__1);
 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_12074____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__1();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__1);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__2);
-l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__3();
-lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074____closed__3);
-res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12074_(lean_io_mk_world());
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__1 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__1();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__1);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__2);
+l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3 = _init_l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3();
+lean_mark_persistent(l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182____closed__3);
+res = l_Lean_Compiler_LCNF_initFn____x40_Lean_Compiler_LCNF_Simp___hyg_12182_(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/SpecInfo.c b/stage0/stdlib/Lean/Compiler/LCNF/SpecInfo.c
index d78623607e..9ed348b45f 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/SpecInfo.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/SpecInfo.c
@@ -2810,6 +2810,7 @@ x_64 = l___private_Lean_Compiler_LCNF_SpecInfo_0__Lean_Compiler_LCNF_isNoSpecTyp
 if (x_64 == 0)
 {
 uint8_t x_65; 
+lean_inc(x_41);
 x_65 = l_Lean_Compiler_LCNF_isTypeFormerType(x_41);
 if (x_65 == 0)
 {
@@ -2878,6 +2879,7 @@ x_78 = l___private_Lean_Compiler_LCNF_SpecInfo_0__Lean_Compiler_LCNF_isNoSpecTyp
 if (x_78 == 0)
 {
 uint8_t x_79; 
+lean_inc(x_41);
 x_79 = l_Lean_Compiler_LCNF_isTypeFormerType(x_41);
 if (x_79 == 0)
 {
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c b/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
index d882ee3fa2..70bfeff6fa 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Specialize.c
@@ -143,6 +143,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lam
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_Collector_State_decls___default;
 static lean_object* l_Lean_Compiler_LCNF_Specialize_Collector_collectFVar___closed__2;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_specialize___closed__3;
 lean_object* l_List_mapTRAux___at_Lean_Compiler_LCNF_saveSpecParamInfo___spec__10(lean_object*, lean_object*);
 static lean_object* l_panic___at_Lean_Compiler_LCNF_Specialize_Collector_collectFVar___spec__1___closed__5;
@@ -243,7 +244,6 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lam
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Compiler_LCNF_Specialize_Collector_collectCode___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*);
 static lean_object* l_Lean_Compiler_LCNF_Specialize_initFn____x40_Lean_Compiler_LCNF_Specialize___hyg_10____closed__3;
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___lambda__5___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_mkSpecDecl___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_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_withFVar___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -275,7 +275,7 @@ lean_object* l_Lean_SMap_find_x3f___at_Lean_Compiler_LCNF_getSpecParamInfoCore_x
 lean_object* l_ReaderT_instMonadReaderT___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_Specialize_Context_scope___default;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Compiler_LCNF_Specialize_expandCodeDecls___spec__1(size_t, size_t, lean_object*);
-lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, lean_object*);
+lean_object* l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Compiler_LCNF_Specialize_shouldSpecialize___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_addTrace___at_Lean_Compiler_LCNF_Specialize_specializeApp_x3f___spec__7___closed__1;
 static lean_object* l_Lean_Compiler_LCNF_Specialize_mkSpecDecl___closed__1;
@@ -7190,7 +7190,7 @@ goto block_23;
 }
 else
 {
-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_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t 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_60 = lean_ctor_get(x_36, 0);
 lean_inc(x_60);
 lean_dec(x_36);
@@ -7200,125 +7200,127 @@ lean_inc(x_62);
 x_63 = lean_ctor_get(x_61, 1);
 lean_inc(x_63);
 lean_dec(x_61);
-x_64 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_62, x_60);
-x_65 = lean_st_ref_get(x_10, x_63);
-x_66 = lean_ctor_get(x_65, 1);
-lean_inc(x_66);
-lean_dec(x_65);
-x_67 = lean_st_ref_take(x_7, x_66);
-x_68 = lean_ctor_get(x_67, 0);
-lean_inc(x_68);
-x_69 = lean_ctor_get(x_67, 1);
+x_64 = 1;
+x_65 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_62, x_64, x_60);
+x_66 = lean_st_ref_get(x_10, x_63);
+x_67 = lean_ctor_get(x_66, 1);
+lean_inc(x_67);
+lean_dec(x_66);
+x_68 = lean_st_ref_take(x_7, x_67);
+x_69 = lean_ctor_get(x_68, 0);
 lean_inc(x_69);
-lean_dec(x_67);
-x_70 = lean_ctor_get(x_14, 0);
+x_70 = lean_ctor_get(x_68, 1);
 lean_inc(x_70);
+lean_dec(x_68);
+x_71 = lean_ctor_get(x_14, 0);
+lean_inc(x_71);
 lean_dec(x_14);
-x_71 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_68, x_70, x_64);
-x_72 = lean_st_ref_set(x_7, x_71, x_69);
-x_73 = lean_ctor_get(x_72, 1);
-lean_inc(x_73);
-lean_dec(x_72);
-x_74 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_74, 0, x_6);
-x_15 = x_74;
-x_16 = x_73;
+x_72 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_69, x_71, x_65);
+x_73 = lean_st_ref_set(x_7, x_72, x_70);
+x_74 = lean_ctor_get(x_73, 1);
+lean_inc(x_74);
+lean_dec(x_73);
+x_75 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_75, 0, x_6);
+x_15 = x_75;
+x_16 = x_74;
 goto block_23;
 }
 }
 else
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
 lean_dec(x_25);
-x_75 = lean_array_fget(x_27, x_28);
-x_76 = lean_unsigned_to_nat(1u);
-x_77 = lean_nat_add(x_28, x_76);
+x_76 = lean_array_fget(x_27, x_28);
+x_77 = lean_unsigned_to_nat(1u);
+x_78 = lean_nat_add(x_28, x_77);
 lean_dec(x_28);
-x_78 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_78, 0, x_27);
-lean_ctor_set(x_78, 1, x_77);
-lean_ctor_set(x_78, 2, x_29);
-if (lean_obj_tag(x_75) == 0)
+x_79 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_79, 0, x_27);
+lean_ctor_set(x_79, 1, x_78);
+lean_ctor_set(x_79, 2, x_29);
+if (lean_obj_tag(x_76) == 0)
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; uint8_t x_82; 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; 
-x_79 = lean_ctor_get(x_14, 0);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_14, 1);
+lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t 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; 
+x_80 = lean_ctor_get(x_14, 0);
 lean_inc(x_80);
-x_81 = lean_ctor_get(x_14, 2);
+x_81 = lean_ctor_get(x_14, 1);
 lean_inc(x_81);
-x_82 = lean_ctor_get_uint8(x_14, sizeof(void*)*3);
+x_82 = lean_ctor_get(x_14, 2);
+lean_inc(x_82);
+x_83 = lean_ctor_get_uint8(x_14, sizeof(void*)*3);
 if (lean_is_exclusive(x_14)) {
  lean_ctor_release(x_14, 0);
  lean_ctor_release(x_14, 1);
  lean_ctor_release(x_14, 2);
- x_83 = x_14;
+ x_84 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_83 = lean_box(0);
+ x_84 = lean_box(0);
 }
-x_84 = lean_ctor_get(x_1, 1);
-x_85 = l_Lean_Expr_instantiateLevelParamsCore_visit___at_Lean_Expr_instantiateLevelParams___spec__1(x_84, x_2, x_81);
-if (lean_is_scalar(x_83)) {
- x_86 = lean_alloc_ctor(0, 3, 1);
+x_85 = lean_ctor_get(x_1, 1);
+x_86 = l_Lean_Expr_instantiateLevelParamsCore_visit___at_Lean_Expr_instantiateLevelParams___spec__1(x_85, x_2, x_82);
+if (lean_is_scalar(x_84)) {
+ x_87 = lean_alloc_ctor(0, 3, 1);
 } else {
- x_86 = x_83;
+ x_87 = x_84;
 }
-lean_ctor_set(x_86, 0, x_79);
-lean_ctor_set(x_86, 1, x_80);
-lean_ctor_set(x_86, 2, x_85);
-lean_ctor_set_uint8(x_86, sizeof(void*)*3, x_82);
-x_87 = l_Lean_Compiler_LCNF_Internalize_internalizeParam(x_86, x_7, x_8, x_9, x_10, x_11);
-x_88 = lean_ctor_get(x_87, 0);
-lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
+lean_ctor_set(x_87, 0, x_80);
+lean_ctor_set(x_87, 1, x_81);
+lean_ctor_set(x_87, 2, x_86);
+lean_ctor_set_uint8(x_87, sizeof(void*)*3, x_83);
+x_88 = l_Lean_Compiler_LCNF_Internalize_internalizeParam(x_87, x_7, x_8, x_9, x_10, x_11);
+x_89 = lean_ctor_get(x_88, 0);
 lean_inc(x_89);
-lean_dec(x_87);
-x_90 = lean_array_push(x_26, x_88);
-lean_ctor_set(x_6, 1, x_90);
-lean_ctor_set(x_6, 0, x_78);
-x_91 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_91, 0, x_6);
-x_15 = x_91;
-x_16 = x_89;
+x_90 = lean_ctor_get(x_88, 1);
+lean_inc(x_90);
+lean_dec(x_88);
+x_91 = lean_array_push(x_26, x_89);
+lean_ctor_set(x_6, 1, x_91);
+lean_ctor_set(x_6, 0, x_79);
+x_92 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_92, 0, x_6);
+x_15 = x_92;
+x_16 = x_90;
 goto block_23;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
-x_92 = lean_ctor_get(x_75, 0);
-lean_inc(x_92);
-lean_dec(x_75);
-x_93 = lean_st_ref_get(x_7, x_11);
-x_94 = lean_ctor_get(x_93, 0);
-lean_inc(x_94);
-x_95 = lean_ctor_get(x_93, 1);
+lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; uint8_t x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
+x_93 = lean_ctor_get(x_76, 0);
+lean_inc(x_93);
+lean_dec(x_76);
+x_94 = lean_st_ref_get(x_7, x_11);
+x_95 = lean_ctor_get(x_94, 0);
 lean_inc(x_95);
-lean_dec(x_93);
-x_96 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_94, x_92);
-x_97 = lean_st_ref_get(x_10, x_95);
-x_98 = lean_ctor_get(x_97, 1);
-lean_inc(x_98);
-lean_dec(x_97);
-x_99 = lean_st_ref_take(x_7, x_98);
-x_100 = lean_ctor_get(x_99, 0);
+x_96 = lean_ctor_get(x_94, 1);
+lean_inc(x_96);
+lean_dec(x_94);
+x_97 = 1;
+x_98 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_95, x_97, x_93);
+x_99 = lean_st_ref_get(x_10, x_96);
+x_100 = lean_ctor_get(x_99, 1);
 lean_inc(x_100);
-x_101 = lean_ctor_get(x_99, 1);
-lean_inc(x_101);
 lean_dec(x_99);
-x_102 = lean_ctor_get(x_14, 0);
+x_101 = lean_st_ref_take(x_7, x_100);
+x_102 = lean_ctor_get(x_101, 0);
 lean_inc(x_102);
+x_103 = lean_ctor_get(x_101, 1);
+lean_inc(x_103);
+lean_dec(x_101);
+x_104 = lean_ctor_get(x_14, 0);
+lean_inc(x_104);
 lean_dec(x_14);
-x_103 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_100, x_102, x_96);
-x_104 = lean_st_ref_set(x_7, x_103, x_101);
-x_105 = lean_ctor_get(x_104, 1);
-lean_inc(x_105);
-lean_dec(x_104);
-lean_ctor_set(x_6, 0, x_78);
-x_106 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_106, 0, x_6);
-x_15 = x_106;
-x_16 = x_105;
+x_105 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_102, x_104, x_98);
+x_106 = lean_st_ref_set(x_7, x_105, x_103);
+x_107 = lean_ctor_get(x_106, 1);
+lean_inc(x_107);
+lean_dec(x_106);
+lean_ctor_set(x_6, 0, x_79);
+x_108 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_108, 0, x_6);
+x_15 = x_108;
+x_16 = x_107;
 goto block_23;
 }
 }
@@ -7326,143 +7328,144 @@ goto block_23;
 }
 else
 {
-lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_112; 
-x_107 = lean_ctor_get(x_6, 0);
-x_108 = lean_ctor_get(x_6, 1);
-lean_inc(x_108);
-lean_inc(x_107);
-lean_dec(x_6);
-x_109 = lean_ctor_get(x_107, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_107, 1);
+lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; uint8_t x_114; 
+x_109 = lean_ctor_get(x_6, 0);
+x_110 = lean_ctor_get(x_6, 1);
 lean_inc(x_110);
-x_111 = lean_ctor_get(x_107, 2);
+lean_inc(x_109);
+lean_dec(x_6);
+x_111 = lean_ctor_get(x_109, 0);
 lean_inc(x_111);
-x_112 = lean_nat_dec_lt(x_110, x_111);
-if (x_112 == 0)
+x_112 = lean_ctor_get(x_109, 1);
+lean_inc(x_112);
+x_113 = lean_ctor_get(x_109, 2);
+lean_inc(x_113);
+x_114 = lean_nat_dec_lt(x_112, x_113);
+if (x_114 == 0)
 {
-lean_object* x_113; lean_object* x_114; 
+lean_object* x_115; lean_object* x_116; 
+lean_dec(x_113);
+lean_dec(x_112);
 lean_dec(x_111);
-lean_dec(x_110);
-lean_dec(x_109);
 lean_dec(x_14);
-x_113 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_113, 0, x_107);
-lean_ctor_set(x_113, 1, x_108);
-x_114 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_114, 0, x_113);
-x_15 = x_114;
+x_115 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_115, 0, x_109);
+lean_ctor_set(x_115, 1, x_110);
+x_116 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_116, 0, x_115);
+x_15 = x_116;
 x_16 = x_11;
 goto block_23;
 }
 else
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-if (lean_is_exclusive(x_107)) {
- lean_ctor_release(x_107, 0);
- lean_ctor_release(x_107, 1);
- lean_ctor_release(x_107, 2);
- x_115 = x_107;
+lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+if (lean_is_exclusive(x_109)) {
+ lean_ctor_release(x_109, 0);
+ lean_ctor_release(x_109, 1);
+ lean_ctor_release(x_109, 2);
+ x_117 = x_109;
 } else {
- lean_dec_ref(x_107);
- x_115 = lean_box(0);
+ lean_dec_ref(x_109);
+ x_117 = lean_box(0);
 }
-x_116 = lean_array_fget(x_109, x_110);
-x_117 = lean_unsigned_to_nat(1u);
-x_118 = lean_nat_add(x_110, x_117);
-lean_dec(x_110);
-if (lean_is_scalar(x_115)) {
- x_119 = lean_alloc_ctor(0, 3, 0);
+x_118 = lean_array_fget(x_111, x_112);
+x_119 = lean_unsigned_to_nat(1u);
+x_120 = lean_nat_add(x_112, x_119);
+lean_dec(x_112);
+if (lean_is_scalar(x_117)) {
+ x_121 = lean_alloc_ctor(0, 3, 0);
 } else {
- x_119 = x_115;
+ x_121 = x_117;
 }
-lean_ctor_set(x_119, 0, x_109);
-lean_ctor_set(x_119, 1, x_118);
-lean_ctor_set(x_119, 2, x_111);
-if (lean_obj_tag(x_116) == 0)
+lean_ctor_set(x_121, 0, x_111);
+lean_ctor_set(x_121, 1, x_120);
+lean_ctor_set(x_121, 2, x_113);
+if (lean_obj_tag(x_118) == 0)
 {
-lean_object* x_120; lean_object* x_121; lean_object* x_122; uint8_t x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_120 = lean_ctor_get(x_14, 0);
-lean_inc(x_120);
-x_121 = lean_ctor_get(x_14, 1);
-lean_inc(x_121);
-x_122 = lean_ctor_get(x_14, 2);
+lean_object* x_122; lean_object* x_123; lean_object* x_124; uint8_t x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
+x_122 = lean_ctor_get(x_14, 0);
 lean_inc(x_122);
-x_123 = lean_ctor_get_uint8(x_14, sizeof(void*)*3);
+x_123 = lean_ctor_get(x_14, 1);
+lean_inc(x_123);
+x_124 = lean_ctor_get(x_14, 2);
+lean_inc(x_124);
+x_125 = lean_ctor_get_uint8(x_14, sizeof(void*)*3);
 if (lean_is_exclusive(x_14)) {
  lean_ctor_release(x_14, 0);
  lean_ctor_release(x_14, 1);
  lean_ctor_release(x_14, 2);
- x_124 = x_14;
+ x_126 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_124 = lean_box(0);
+ x_126 = lean_box(0);
 }
-x_125 = lean_ctor_get(x_1, 1);
-x_126 = l_Lean_Expr_instantiateLevelParamsCore_visit___at_Lean_Expr_instantiateLevelParams___spec__1(x_125, x_2, x_122);
-if (lean_is_scalar(x_124)) {
- x_127 = lean_alloc_ctor(0, 3, 1);
+x_127 = lean_ctor_get(x_1, 1);
+x_128 = l_Lean_Expr_instantiateLevelParamsCore_visit___at_Lean_Expr_instantiateLevelParams___spec__1(x_127, x_2, x_124);
+if (lean_is_scalar(x_126)) {
+ x_129 = lean_alloc_ctor(0, 3, 1);
 } else {
- x_127 = x_124;
+ x_129 = x_126;
 }
-lean_ctor_set(x_127, 0, x_120);
-lean_ctor_set(x_127, 1, x_121);
-lean_ctor_set(x_127, 2, x_126);
-lean_ctor_set_uint8(x_127, sizeof(void*)*3, x_123);
-x_128 = l_Lean_Compiler_LCNF_Internalize_internalizeParam(x_127, x_7, x_8, x_9, x_10, x_11);
-x_129 = lean_ctor_get(x_128, 0);
-lean_inc(x_129);
-x_130 = lean_ctor_get(x_128, 1);
-lean_inc(x_130);
-lean_dec(x_128);
-x_131 = lean_array_push(x_108, x_129);
-x_132 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_132, 0, x_119);
-lean_ctor_set(x_132, 1, x_131);
-x_133 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_133, 0, x_132);
-x_15 = x_133;
-x_16 = x_130;
+lean_ctor_set(x_129, 0, x_122);
+lean_ctor_set(x_129, 1, x_123);
+lean_ctor_set(x_129, 2, x_128);
+lean_ctor_set_uint8(x_129, sizeof(void*)*3, x_125);
+x_130 = l_Lean_Compiler_LCNF_Internalize_internalizeParam(x_129, x_7, x_8, x_9, x_10, x_11);
+x_131 = lean_ctor_get(x_130, 0);
+lean_inc(x_131);
+x_132 = lean_ctor_get(x_130, 1);
+lean_inc(x_132);
+lean_dec(x_130);
+x_133 = lean_array_push(x_110, x_131);
+x_134 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_134, 0, x_121);
+lean_ctor_set(x_134, 1, x_133);
+x_135 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_135, 0, x_134);
+x_15 = x_135;
+x_16 = x_132;
 goto block_23;
 }
 else
 {
-lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; 
-x_134 = lean_ctor_get(x_116, 0);
-lean_inc(x_134);
-lean_dec(x_116);
-x_135 = lean_st_ref_get(x_7, x_11);
-x_136 = lean_ctor_get(x_135, 0);
+lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; uint8_t x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; 
+x_136 = lean_ctor_get(x_118, 0);
 lean_inc(x_136);
-x_137 = lean_ctor_get(x_135, 1);
-lean_inc(x_137);
-lean_dec(x_135);
-x_138 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_136, x_134);
-x_139 = lean_st_ref_get(x_10, x_137);
-x_140 = lean_ctor_get(x_139, 1);
-lean_inc(x_140);
-lean_dec(x_139);
-x_141 = lean_st_ref_take(x_7, x_140);
-x_142 = lean_ctor_get(x_141, 0);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_141, 1);
+lean_dec(x_118);
+x_137 = lean_st_ref_get(x_7, x_11);
+x_138 = lean_ctor_get(x_137, 0);
+lean_inc(x_138);
+x_139 = lean_ctor_get(x_137, 1);
+lean_inc(x_139);
+lean_dec(x_137);
+x_140 = 1;
+x_141 = l___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_normExprImp_go(x_138, x_140, x_136);
+x_142 = lean_st_ref_get(x_10, x_139);
+x_143 = lean_ctor_get(x_142, 1);
 lean_inc(x_143);
-lean_dec(x_141);
-x_144 = lean_ctor_get(x_14, 0);
-lean_inc(x_144);
-lean_dec(x_14);
-x_145 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_142, x_144, x_138);
-x_146 = lean_st_ref_set(x_7, x_145, x_143);
-x_147 = lean_ctor_get(x_146, 1);
+lean_dec(x_142);
+x_144 = lean_st_ref_take(x_7, x_143);
+x_145 = lean_ctor_get(x_144, 0);
+lean_inc(x_145);
+x_146 = lean_ctor_get(x_144, 1);
+lean_inc(x_146);
+lean_dec(x_144);
+x_147 = lean_ctor_get(x_14, 0);
 lean_inc(x_147);
-lean_dec(x_146);
-x_148 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_148, 0, x_119);
-lean_ctor_set(x_148, 1, x_108);
-x_149 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_149, 0, x_148);
-x_15 = x_149;
-x_16 = x_147;
+lean_dec(x_14);
+x_148 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_145, x_147, x_141);
+x_149 = lean_st_ref_set(x_7, x_148, x_146);
+x_150 = lean_ctor_get(x_149, 1);
+lean_inc(x_150);
+lean_dec(x_149);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_121);
+lean_ctor_set(x_151, 1, x_110);
+x_152 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_152, 0, x_151);
+x_15 = x_152;
+x_16 = x_150;
 goto block_23;
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/ToLCNF.c b/stage0/stdlib/Lean/Compiler/LCNF/ToLCNF.c
index 613278ba3d..5f880761c4 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/ToLCNF.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/ToLCNF.c
@@ -180,7 +180,7 @@ LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ToLCNF_State_isTypeFormerTypeCache
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visit___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static size_t l_Std_PersistentHashMap_insertAux___at_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitCore___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_ToLCNF_0__Lean_Compiler_LCNF_ToLCNF_isTypeFormerType___spec__1(lean_object*, lean_object*, uint8_t);
-lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Compiler_LCNF_replaceExprFVars(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_ToLCNF_bindCases_go___closed__11;
 LEAN_EXPORT lean_object* l_Lean_Meta_forallBoundedTelescope___at_Lean_Compiler_LCNF_ToLCNF_etaExpandN___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedProjectionFunctionInfo;
@@ -200,6 +200,7 @@ lean_object* l_Std_RBNode_appendTrees___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ToLCNF_State_typeCache___default;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ToLCNF_mkAuxLetDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panic___at_Lean_Expr_getRevArg_x21___spec__1(lean_object*);
+lean_object* l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_balRight___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_ToLCNF_toLCNF_visitApp___closed__9;
 LEAN_EXPORT lean_object* l_Lean_Compiler_LCNF_ToLCNF_toCode___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -373,7 +374,6 @@ lean_object* lean_nat_mul(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_contains___at___private_Lean_Compiler_LCNF_ToLCNF_0__Lean_Compiler_LCNF_ToLCNF_isTypeFormerType___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_getPrefix(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
 static lean_object* l_Lean_Compiler_LCNF_ToLCNF_instInhabitedElement___closed__5;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
@@ -975,7 +975,7 @@ return x_11;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; size_t x_34; size_t x_35; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; 
 x_12 = lean_ctor_get(x_1, 0);
 x_13 = lean_array_uget(x_12, x_3);
 x_14 = lean_ctor_get(x_4, 0);
@@ -990,43 +990,44 @@ lean_inc(x_17);
 lean_dec(x_15);
 x_18 = lean_ctor_get(x_13, 2);
 lean_inc(x_18);
+x_19 = 1;
 lean_inc(x_17);
-x_19 = l_Lean_Compiler_LCNF_replaceExprFVars(x_18, x_17, x_6, x_7, x_8, x_9);
-x_20 = lean_ctor_get(x_19, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 1);
+x_20 = l_Lean_Compiler_LCNF_replaceExprFVars(x_18, x_17, x_19, x_6, x_7, x_8, x_9);
+x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
-lean_dec(x_19);
-x_22 = 0;
-x_23 = l_Lean_Compiler_LCNF_mkAuxParam(x_20, x_22, x_6, x_7, x_8, x_21);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_23, 1);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = 0;
+x_24 = l_Lean_Compiler_LCNF_mkAuxParam(x_21, x_23, x_6, x_7, x_8, x_22);
+x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
-lean_dec(x_23);
-lean_inc(x_24);
-x_26 = lean_array_push(x_16, x_24);
-x_27 = lean_ctor_get(x_24, 0);
-lean_inc(x_27);
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
 lean_dec(x_24);
-x_28 = l_Lean_Expr_fvar___override(x_27);
-x_29 = lean_ctor_get(x_13, 0);
-lean_inc(x_29);
-lean_dec(x_13);
+lean_inc(x_25);
+x_27 = lean_array_push(x_16, x_25);
+x_28 = lean_ctor_get(x_25, 0);
 lean_inc(x_28);
-x_30 = l_Std_HashMap_insert___at___private_Lean_Compiler_LCNF_CompilerM_0__Lean_Compiler_LCNF_Internalize_mkNewFVarId___spec__3(x_17, x_29, x_28);
-x_31 = lean_array_push(x_14, x_28);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_26);
-lean_ctor_set(x_32, 1, x_30);
+lean_dec(x_25);
+x_29 = l_Lean_Expr_fvar___override(x_28);
+x_30 = lean_ctor_get(x_13, 0);
+lean_inc(x_30);
+lean_dec(x_13);
+lean_inc(x_29);
+x_31 = l_Std_HashMap_insert___at_Lean_Compiler_LCNF_addFVarSubst___spec__1(x_17, x_30, x_29);
+x_32 = lean_array_push(x_14, x_29);
 x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-x_34 = 1;
-x_35 = lean_usize_add(x_3, x_34);
-x_3 = x_35;
-x_4 = x_33;
-x_9 = x_25;
+lean_ctor_set(x_33, 0, x_27);
+lean_ctor_set(x_33, 1, x_31);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+x_35 = 1;
+x_36 = lean_usize_add(x_3, x_35);
+x_3 = x_36;
+x_4 = x_34;
+x_9 = x_26;
 goto _start;
 }
 }
diff --git a/stage0/stdlib/Lean/Compiler/LCNF/Types.c b/stage0/stdlib/Lean/Compiler/LCNF/Types.c
index ceb222c5f2..c6aba5de39 100644
--- a/stage0/stdlib/Lean/Compiler/LCNF/Types.c
+++ b/stage0/stdlib/Lean/Compiler/LCNF/Types.c
@@ -4264,25 +4264,31 @@ return x_81;
 LEAN_EXPORT uint8_t l_Lean_Compiler_LCNF_isTypeFormerType(lean_object* x_1) {
 _start:
 {
-switch (lean_obj_tag(x_1)) {
+lean_object* x_2; 
+x_2 = l_Lean_Expr_headBeta(x_1);
+switch (lean_obj_tag(x_2)) {
 case 3:
 {
-uint8_t x_2; 
-x_2 = 1;
-return x_2;
+uint8_t x_3; 
+lean_dec(x_2);
+x_3 = 1;
+return x_3;
 }
 case 7:
 {
-lean_object* x_3; 
-x_3 = lean_ctor_get(x_1, 2);
-x_1 = x_3;
+lean_object* x_4; 
+x_4 = lean_ctor_get(x_2, 2);
+lean_inc(x_4);
+lean_dec(x_2);
+x_1 = x_4;
 goto _start;
 }
 default: 
 {
-uint8_t x_5; 
-x_5 = 0;
-return x_5;
+uint8_t x_6; 
+lean_dec(x_2);
+x_6 = 0;
+return x_6;
 }
 }
 }
@@ -4292,7 +4298,6 @@ _start:
 {
 uint8_t x_2; lean_object* x_3; 
 x_2 = l_Lean_Compiler_LCNF_isTypeFormerType(x_1);
-lean_dec(x_1);
 x_3 = lean_box(x_2);
 return x_3;
 }
diff --git a/stage0/stdlib/Lean/CoreM.c b/stage0/stdlib/Lean/CoreM.c
index fd83f34557..62e66ded09 100644
--- a/stage0/stdlib/Lean/CoreM.c
+++ b/stage0/stdlib/Lean/CoreM.c
@@ -229,6 +229,7 @@ LEAN_EXPORT lean_object* l_Lean_Core_instMonadCoreM___lambda__1(lean_object*, le
 LEAN_EXPORT lean_object* l_Lean_Core_instMetaEvalCoreM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Core_instMonadQuotationCoreM;
 size_t lean_usize_of_nat(lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT lean_object* l_Lean_Core_withCurrHeartbeats(lean_object*, lean_object*);
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Core_instantiateTypeLevelParams___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -735,17 +736,19 @@ return x_5;
 static lean_object* _init_l_Lean_Core_instInhabitedState___closed__6() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Core_instInhabitedState___closed__1;
 x_2 = l_Lean_Core_instInhabitedState___closed__2;
 x_3 = l_Lean_Core_instInhabitedState___closed__3;
-x_4 = l_Lean_Core_instInhabitedState___closed__5;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Core_instInhabitedState___closed__5;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Core_instInhabitedState___closed__7() {
diff --git a/stage0/stdlib/Lean/Deprecated.c b/stage0/stdlib/Lean/Deprecated.c
index c209d7bc01..2a5a4f6a4e 100644
--- a/stage0/stdlib/Lean/Deprecated.c
+++ b/stage0/stdlib/Lean/Deprecated.c
@@ -21,7 +21,6 @@ lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Deprecated___hyg_4____lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterTRAux___at_Lean_resolveGlobalConstCore___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_deprecatedAttr;
 static lean_object* l_Lean_initFn____x40_Lean_Deprecated___hyg_4____closed__6;
@@ -134,6 +133,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_L
 lean_object* l_Lean_Syntax_formatStxAux(lean_object*, uint8_t, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Deprecated___hyg_4____lambda__2___closed__2;
 LEAN_EXPORT uint8_t l_Lean_isDeprecated(lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_initFn____x40_Lean_Deprecated___hyg_4____spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -372,7 +372,7 @@ x_10 = l_Lean_throwUnknownConstant___at_Lean_initFn____x40_Lean_Deprecated___hyg
 x_11 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_11, 0, x_9);
 lean_ctor_set(x_11, 1, x_10);
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_2, x_3, x_4);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_2, x_3, x_4);
 return x_12;
 }
 }
diff --git a/stage0/stdlib/Lean/Elab/Command.c b/stage0/stdlib/Lean/Elab/Command.c
index 796a18fc23..c112f2fef2 100644
--- a/stage0/stdlib/Lean/Elab/Command.c
+++ b/stage0/stdlib/Lean/Elab/Command.c
@@ -464,6 +464,7 @@ extern lean_object* l_Lean_warningAsError;
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Command_withMacroExpansion(lean_object*);
 lean_object* l_Lean_InternalExceptionId_getName(lean_object*, lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_Lean_Elab_expandDeclIdCore(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_profileitM___at_Lean_Elab_Command_runLinters___spec__5(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_mkDeclName___at_Lean_Elab_Command_expandDeclId___spec__2___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1146,17 +1147,19 @@ return x_5;
 static lean_object* _init_l_Lean_Elab_Command_instInhabitedState___closed__6() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Command_instInhabitedState___closed__1;
 x_2 = l_Lean_Elab_Command_instInhabitedState___closed__3;
 x_3 = l_Lean_Elab_Command_Scope_varDecls___default___closed__1;
-x_4 = l_Lean_Elab_Command_instInhabitedState___closed__5;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Elab_Command_instInhabitedState___closed__5;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Elab_Command_instInhabitedState___closed__7() {
diff --git a/stage0/stdlib/Lean/Elab/InfoTree/Types.c b/stage0/stdlib/Lean/Elab/InfoTree/Types.c
index 3d378a5552..dc61a616c7 100644
--- a/stage0/stdlib/Lean/Elab/InfoTree/Types.c
+++ b/stage0/stdlib/Lean/Elab/InfoTree/Types.c
@@ -53,6 +53,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_ContextInfo_openDecls___default;
 static lean_object* l_Lean_Elab_instInhabitedTermInfo___closed__5;
 static lean_object* l_Lean_Elab_instInhabitedElabInfo___closed__1;
 lean_object* l_Lean_Expr_bvar___override(lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT lean_object* l_Lean_Elab_ContextInfo_currNamespace___default;
 static lean_object* l_Lean_Elab_InfoState_trees___default___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_instInhabitedCustomInfo;
@@ -251,17 +252,19 @@ return x_5;
 static lean_object* _init_l_Lean_Elab_instInhabitedContextInfo___closed__6() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_instInhabitedContextInfo___closed__1;
 x_2 = l_Lean_Elab_instInhabitedContextInfo___closed__2;
 x_3 = l_Lean_Elab_instInhabitedContextInfo___closed__3;
-x_4 = l_Lean_Elab_instInhabitedContextInfo___closed__5;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Elab_instInhabitedContextInfo___closed__5;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Elab_instInhabitedContextInfo___closed__7() {
diff --git a/stage0/stdlib/Lean/Elab/InheritDoc.c b/stage0/stdlib/Lean/Elab/InheritDoc.c
index 70264bf8ea..195e38cfc2 100644
--- a/stage0/stdlib/Lean/Elab/InheritDoc.c
+++ b/stage0/stdlib/Lean/Elab/InheritDoc.c
@@ -20,7 +20,6 @@ LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____la
 static lean_object* l_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____lambda__2___closed__4;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterTRAux___at_Lean_resolveGlobalConstCore___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_logAt___at_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____spec__17___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_logAt___at_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____spec__17___closed__1;
@@ -158,6 +157,7 @@ static lean_object* l_Lean_resolveGlobalConstNoOverload___at_Lean_initFn____x40_
 LEAN_EXPORT lean_object* l_Lean_Elab_pushInfoTree___at_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____spec__16(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____lambda__1___closed__1;
 static lean_object* l_Lean_addDocString___at_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____spec__18___closed__5;
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -358,7 +358,7 @@ x_10 = l_Lean_throwUnknownConstant___at_Lean_initFn____x40_Lean_Elab_InheritDoc_
 x_11 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_11, 0, x_9);
 lean_ctor_set(x_11, 1, x_10);
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_2, x_3, x_4);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_2, x_3, x_4);
 return x_12;
 }
 }
@@ -3066,7 +3066,7 @@ lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 x_11 = l_Lean_initFn____x40_Lean_Elab_InheritDoc___hyg_4____lambda__4___closed__2;
-x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_11, x_6, x_7, x_8);
+x_12 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_11, x_6, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 x_13 = !lean_is_exclusive(x_12);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c b/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
index b284fcb188..f6fd39ef7f 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/BuiltinTactic.c
@@ -29,6 +29,7 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDone_declRange___closed_
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTacticSeqBracketed_declRange___closed__7;
 size_t lean_usize_add(size_t, size_t);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRotateRight___closed__4;
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toString___at_Lean_OpenDecl_instToStringOpenDecl___spec__2(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__6;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessibles(lean_object*);
@@ -61,7 +62,7 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip_declRange___closed_
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Tactic_evalOpen___spec__19(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___regBuiltin_Lean_Elab_Tactic_evalIntros_declRange___closed__2;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(size_t, size_t, lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalRotateRight(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
@@ -107,7 +108,6 @@ lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange___closed__1;
 static lean_object* l_Lean_Elab_Tactic_evalFailIfSuccess___lambda__1___closed__1;
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__13;
-LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___rarg(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace___closed__1;
 lean_object* l_List_mapTRAux___at_Lean_resolveGlobalConstCore___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_ContextInfo_saveNoFileMap___at_Lean_Elab_Tactic_renameInaccessibles___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -141,6 +141,7 @@ static lean_object* l_Lean_Elab_Tactic_evalContradiction___rarg___lambda__1___cl
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTraceMessage___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_elabSetOption_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRevert_declRange___closed__2;
+static lean_object* l_Lean_Elab_Tactic_evalCase_x27___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalUnknown_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSeq1_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTraceState___closed__5;
@@ -154,7 +155,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalUnknown(lean_object*, lean_objec
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__22(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRotateRight_declRange___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase_x27___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MVarId_revert(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDone___closed__5;
 static lean_object* l_Lean_Elab_Tactic_evalCase___closed__1;
@@ -228,14 +228,14 @@ static lean_object* l_Lean_Elab_Tactic_evalRenameInaccessibles___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__1;
 static lean_object* l_Lean_Elab_nestedExceptionToMessageData___at_Lean_Elab_Tactic_evalOpen___spec__27___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalParen_declRange___closed__3;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessibles_declRange___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_renameInaccessibles___spec__14___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___regBuiltin_Lean_Elab_Tactic_evalDone_declRange___closed__7;
 lean_object* lean_string_append(lean_object*, lean_object*);
-static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5;
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__8;
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalContradiction___closed__4;
 lean_object* l_List_rotateLeft___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__36(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*, lean_object*);
@@ -255,7 +255,7 @@ static lean_object* l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Tactic_eval
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalDone___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MVarId_withContext___at_Lean_Elab_Tactic_withMainContext___spec__1___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___regBuiltin_Lean_Elab_Tactic_evalTacticSeq1Indented(lean_object*);
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_addOpenDecl___at_Lean_Elab_Tactic_evalOpen___spec__21___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___regBuiltin_Lean_Elab_Tactic_evalParen___closed__4;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessibles___closed__3;
@@ -268,7 +268,7 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFail_declRange___closed__1;
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__16;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_renameInaccessibles___spec__10___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_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___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_Elab_Tactic_evalSubstVars___boxed(lean_object*);
 static lean_object* l_Lean_Elab_Tactic_elabSetOption___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRotateLeft___closed__4;
@@ -282,7 +282,6 @@ static lean_object* l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tact
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalTraceState___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_Elab_Tactic_evalContradiction___boxed(lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalAllGoals_declRange(lean_object*);
-static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4;
 static lean_object* l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Tactic_evalOpen___spec__3___closed__1;
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_evalAnyGoals___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTraceState_declRange(lean_object*);
@@ -306,9 +305,11 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalSubstVars___rarg(lean_object*, l
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__38___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_List_forIn_loop___at_Lean_Elab_Tactic_evalAllGoals___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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalIntros___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState_declRange___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalAssumption___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip_declRange___closed__3;
+static lean_object* l_Lean_Elab_Tactic_evalCase_x27___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubstVars_declRange___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubst_declRange___closed__7;
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -341,7 +342,6 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalClear(lean_object*)
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalOpen_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntros___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTacticSeq_declRange___closed__7;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalParen___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRotateLeft_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFocus_declRange___closed__7;
@@ -362,7 +362,6 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip_declRange___closed_
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalChoice___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_findTag_x3f___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___regBuiltin_Lean_Elab_Tactic_evalAssumption(lean_object*);
-static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1;
 static lean_object* l_Lean_Elab_Tactic_evalDbgTrace___closed__1;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__2___closed__6;
 static lean_object* l_Lean_Elab_Tactic_evalFail___closed__7;
@@ -384,7 +383,6 @@ uint8_t l_Lean_Name_hasMacroScopes(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDone___closed__1;
 lean_object* l_List_mapTRAux___at_Lean_MessageData_instCoeListExprMessageData___spec__1(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalOpen_declRange___closed__2;
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___boxed(lean_object**);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalAnyGoals___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFocus___closed__5;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__2___closed__11;
@@ -593,6 +591,7 @@ lean_object* l_Lean_addBuiltinDeclarationRanges(lean_object*, lean_object*, lean
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalUnknown___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntros___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalTacticSeqBracketed___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_Elab_Tactic_evalCase___lambda__1___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubst_declRange___closed__3;
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__12;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRefl___closed__4;
@@ -629,13 +628,13 @@ static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_evalSeq1___spec
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__2;
 lean_object* l_Lean_Elab_getResetInfoTrees___at_Lean_Elab_Tactic_withTacticInfoContext___spec__2___rarg(lean_object*, lean_object*);
 lean_object* lean_expr_dbg_to_string(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(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___regBuiltin_Lean_Elab_Tactic_elabSetOption_declRange___closed__6;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntros_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalContradiction_declRange___closed__6;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTacticSeqBracketed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_elabSetOption_setOption___at_Lean_Elab_Tactic_elabSetOption___spec__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_Lean_Elab_Tactic_evalChoice(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_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Tactic_evalOpen___spec__15(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___regBuiltin_Lean_Elab_Tactic_evalIntros(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalTraceState(lean_object*);
@@ -652,7 +651,6 @@ LEAN_EXPORT lean_object* l_Std_PersistentArray_mapMAux___at_Lean_Elab_Tactic_ren
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Tactic_evalOpen___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_reverse___rarg(lean_object*);
-static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5;
 LEAN_EXPORT lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Tactic_evalIntro___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___closed__3;
@@ -681,10 +679,10 @@ lean_object* l_Lean_ResolveName_resolveGlobalName(lean_object*, lean_object*, le
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSeq1___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Elab_elabSetOption_setOption___at_Lean_Elab_Tactic_elabSetOption___spec__6___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1___boxed(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubstVars___closed__5;
 LEAN_EXPORT lean_object* l_List_erase___at___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___spec__1(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntroMatch_declRange___closed__5;
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRevert_declRange___closed__7;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__36___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___regBuiltin_Lean_Elab_Tactic_evalSkip___closed__5;
@@ -778,6 +776,7 @@ lean_object* l_Std_PersistentArray_push___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSleep(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalUnknown___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSeq1_declRange___closed__2;
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3(size_t, size_t, lean_object*);
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__6;
 static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__2___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalContradiction(lean_object*);
@@ -823,6 +822,7 @@ lean_object* l_List_rotateRight___rarg(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSeq1_declRange___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFailIfSuccess___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubst___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalIntro_introStep___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_Meta_withPPShowLetValues___at_Lean_Elab_Tactic_evalTraceState___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Tactic_evalTacticSeqBracketed___closed__1;
@@ -865,6 +865,7 @@ static lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___sp
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___spec__2(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___regBuiltin_Lean_Elab_Tactic_evalRotateLeft_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState_declRange___closed__1;
+static lean_object* l_Lean_Elab_Tactic_evalCase___closed__2;
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__17;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTraceState___closed__2;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubst_declRange(lean_object*);
@@ -873,6 +874,7 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalUnknown_declRange___clos
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___closed__2;
 lean_object* l_Lean_Elab_Tactic_setGoals(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___closed__1;
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__6___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_Elab_Tactic_evalIntro___closed__27;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalOpen___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip___closed__2;
@@ -902,7 +904,7 @@ static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__9;
 LEAN_EXPORT lean_object* l_Lean_activateScoped___at_Lean_Elab_Tactic_evalOpen___spec__31(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_withInfoTreeContext___at_Lean_Elab_Tactic_evalTactic_eval___spec__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_Elab_Tactic_evalFailIfSuccess(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_Lean_Elab_Tactic_evalCase_x27___spec__1___boxed(lean_object**);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_evalOpen___spec__35___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_Elab_Tactic_evalWithAnnotateState___closed__7;
 lean_object* l_Array_ofSubarray___rarg(lean_object*);
@@ -918,7 +920,6 @@ static lean_object* l_Lean_Elab_elabSetOption___at_Lean_Elab_Tactic_elabSetOptio
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__33;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange___closed__5;
 static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__5;
-static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalAllGoals___closed__2;
 static lean_object* l_Lean_Elab_Tactic_evalFail___closed__2;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalOpen___spec__34___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*);
@@ -1013,6 +1014,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tacti
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__7;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFailIfSuccess_declRange(lean_object*);
 static lean_object* l_Lean_throwUnknownConstant___at_Lean_Elab_Tactic_evalOpen___spec__16___closed__2;
+LEAN_EXPORT lean_object* l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalOpen___spec__4___rarg___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalAllGoals___closed__5;
 lean_object* l_Lean_Elab_Tactic_replaceMainGoal(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1065,7 +1067,6 @@ static lean_object* l_Lean_Elab_Tactic_evalIntro___closed__14;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFailIfSuccess___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRefl_declRange___closed__7;
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_resolveNameUsingNamespacesCore___spec__2(size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalOpen___closed__3;
@@ -1110,7 +1111,6 @@ LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Tactic_addCheckpo
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip_declRange(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_addCompletionInfo___at_Lean_Elab_Tactic_elabSetOption___spec__2(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___regBuiltin_Lean_Elab_Tactic_evalCase(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___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_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRevert___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTacticSeqBracketed_declRange___closed__3;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRefl_declRange(lean_object*);
@@ -1133,11 +1133,13 @@ LEAN_EXPORT lean_object* l_Lean_Elab_throwIllFormedSyntax___at_Lean_Elab_Tactic_
 LEAN_EXPORT lean_object* l_Lean_Elab_pushInfoLeaf___at_Lean_Elab_Tactic_elabSetOption___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState_declRange___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntroMatch_declRange___closed__7;
+static lean_object* l_Lean_Elab_Tactic_evalCase_x27___closed__2;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFocus_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntroMatch___closed__3;
 LEAN_EXPORT lean_object* l_List_findM_x3f___at___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_findTag_x3f___spec__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_Elab_Tactic_addCheckpoints___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*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalAllGoals_declRange___closed__7;
+LEAN_EXPORT lean_object* l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_appendTR___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntro_declRange(lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_activateScoped___rarg(lean_object*, lean_object*, lean_object*);
@@ -1147,7 +1149,6 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalChoice_declRange___close
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFailIfSuccess___closed__5;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalContradiction(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalTacticSeq_declRange___closed__3;
-LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__3;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRefl___closed__2;
@@ -25692,26 +25693,141 @@ lean_dec(x_3);
 return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___rarg(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalOpen___spec__4___rarg___closed__2;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
+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);
+lean_dec(x_3);
+lean_dec(x_2);
+x_8 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_8, 0, x_5);
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_unsigned_to_nat(0u);
+x_10 = lean_nat_dec_eq(x_3, x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_sub(x_3, x_11);
+lean_dec(x_3);
+x_13 = lean_array_fget(x_1, x_4);
+lean_inc(x_2);
+x_14 = lean_apply_1(x_2, x_13);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; 
+lean_dec(x_12);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+x_15 = lean_box(0);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_14, 0);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_nat_add(x_4, x_11);
+lean_dec(x_4);
+x_18 = lean_array_push(x_5, x_16);
+x_3 = x_12;
+x_4 = x_17;
+x_5 = x_18;
+goto _start;
+}
+}
+else
+{
+lean_object* x_20; 
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_20, 0, x_5);
+return x_20;
+}
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1(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; 
+x_3 = lean_array_get_size(x_1);
+x_4 = lean_mk_empty_array_with_capacity(x_3);
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2(x_1, x_2, x_3, x_5, x_4);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3(size_t x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
 return x_3;
 }
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = 1;
+x_9 = lean_usize_add(x_2, x_8);
+x_10 = lean_ctor_get(x_5, 1);
+lean_inc(x_10);
+lean_dec(x_5);
+x_11 = lean_array_uset(x_7, x_2, x_10);
+x_2 = x_9;
+x_3 = x_11;
+goto _start;
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(size_t x_1, size_t x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_9; 
-x_9 = lean_alloc_closure((void*)(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___rarg), 1, 0);
-return x_9;
+uint8_t x_4; 
+x_4 = lean_usize_dec_lt(x_2, x_1);
+if (x_4 == 0)
+{
+return x_3;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; lean_object* x_11; 
+x_5 = lean_array_uget(x_3, x_2);
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = lean_array_uset(x_3, x_2, x_6);
+x_8 = 1;
+x_9 = lean_usize_add(x_2, x_8);
+x_10 = lean_ctor_get(x_5, 0);
+lean_inc(x_10);
+lean_dec(x_5);
+x_11 = lean_array_uset(x_7, x_2, x_10);
+x_2 = x_9;
+x_3 = x_11;
+goto _start;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+}
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
@@ -25782,7 +25898,527 @@ return x_36;
 }
 }
 }
-static lean_object* _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1() {
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, size_t x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+uint8_t x_17; 
+x_17 = lean_usize_dec_lt(x_6, x_5);
+if (x_17 == 0)
+{
+lean_object* 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_8);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_7);
+lean_ctor_set(x_18, 1, x_16);
+return x_18;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
+x_19 = lean_array_uget(x_4, x_6);
+x_29 = lean_ctor_get(x_7, 0);
+lean_inc(x_29);
+x_30 = lean_ctor_get(x_7, 1);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_7, 2);
+lean_inc(x_31);
+x_32 = lean_nat_dec_lt(x_30, x_31);
+if (x_32 == 0)
+{
+lean_object* x_33; 
+lean_dec(x_31);
+lean_dec(x_30);
+lean_dec(x_29);
+lean_dec(x_19);
+x_33 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_33, 0, x_7);
+x_20 = x_33;
+x_21 = x_16;
+goto block_28;
+}
+else
+{
+uint8_t x_34; 
+x_34 = !lean_is_exclusive(x_7);
+if (x_34 == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_35 = lean_ctor_get(x_7, 2);
+lean_dec(x_35);
+x_36 = lean_ctor_get(x_7, 1);
+lean_dec(x_36);
+x_37 = lean_ctor_get(x_7, 0);
+lean_dec(x_37);
+x_38 = lean_array_fget(x_29, x_30);
+x_39 = lean_unsigned_to_nat(1u);
+x_40 = lean_nat_add(x_30, x_39);
+lean_dec(x_30);
+lean_ctor_set(x_7, 1, x_40);
+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);
+lean_inc(x_8);
+x_41 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_41) == 0)
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_42 = lean_ctor_get(x_41, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = lean_ctor_get(x_42, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_42, 1);
+lean_inc(x_45);
+lean_dec(x_42);
+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);
+lean_inc(x_8);
+x_46 = l_Lean_Elab_Tactic_renameInaccessibles(x_44, x_38, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_43);
+if (lean_obj_tag(x_46) == 0)
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
+lean_inc(x_48);
+lean_dec(x_46);
+x_49 = lean_box(0);
+lean_inc(x_47);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_47);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = l_Lean_Elab_Tactic_setGoals(x_50, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_48);
+x_52 = lean_ctor_get(x_51, 1);
+lean_inc(x_52);
+lean_dec(x_51);
+x_53 = lean_box(0);
+x_54 = l_Lean_MVarId_setTag(x_47, x_53, x_12, x_13, x_14, x_15, x_52);
+x_55 = lean_ctor_get(x_54, 1);
+lean_inc(x_55);
+lean_dec(x_54);
+lean_inc(x_3);
+x_56 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
+lean_closure_set(x_56, 0, x_3);
+lean_inc(x_1);
+x_57 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_withTacticInfoContext___rarg), 11, 2);
+lean_closure_set(x_57, 0, x_1);
+lean_closure_set(x_57, 1, x_56);
+x_58 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_closeUsingOrAdmit), 10, 1);
+lean_closure_set(x_58, 0, x_57);
+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);
+lean_inc(x_8);
+lean_inc(x_3);
+lean_inc(x_2);
+x_59 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(x_2, x_3, x_58, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_55);
+if (lean_obj_tag(x_59) == 0)
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_60 = lean_ctor_get(x_59, 1);
+lean_inc(x_60);
+lean_dec(x_59);
+x_61 = l_Lean_Elab_Tactic_setGoals(x_45, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_60);
+x_62 = lean_ctor_get(x_61, 1);
+lean_inc(x_62);
+lean_dec(x_61);
+x_63 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_63, 0, x_7);
+x_20 = x_63;
+x_21 = x_62;
+goto block_28;
+}
+else
+{
+uint8_t x_64; 
+lean_dec(x_45);
+lean_dec(x_7);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_64 = !lean_is_exclusive(x_59);
+if (x_64 == 0)
+{
+return x_59;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_59, 0);
+x_66 = lean_ctor_get(x_59, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_59);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
+}
+}
+}
+else
+{
+uint8_t x_68; 
+lean_dec(x_45);
+lean_dec(x_7);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_68 = !lean_is_exclusive(x_46);
+if (x_68 == 0)
+{
+return x_46;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_46, 0);
+x_70 = lean_ctor_get(x_46, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_46);
+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_7);
+lean_dec(x_38);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_72 = !lean_is_exclusive(x_41);
+if (x_72 == 0)
+{
+return x_41;
+}
+else
+{
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_41, 0);
+x_74 = lean_ctor_get(x_41, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_41);
+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_7);
+x_76 = lean_array_fget(x_29, x_30);
+x_77 = lean_unsigned_to_nat(1u);
+x_78 = lean_nat_add(x_30, x_77);
+lean_dec(x_30);
+x_79 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_79, 0, x_29);
+lean_ctor_set(x_79, 1, x_78);
+lean_ctor_set(x_79, 2, x_31);
+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);
+lean_inc(x_8);
+x_80 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_80) == 0)
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_80, 1);
+lean_inc(x_82);
+lean_dec(x_80);
+x_83 = lean_ctor_get(x_81, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_81, 1);
+lean_inc(x_84);
+lean_dec(x_81);
+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);
+lean_inc(x_8);
+x_85 = l_Lean_Elab_Tactic_renameInaccessibles(x_83, x_76, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_82);
+if (lean_obj_tag(x_85) == 0)
+{
+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; lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_86 = lean_ctor_get(x_85, 0);
+lean_inc(x_86);
+x_87 = lean_ctor_get(x_85, 1);
+lean_inc(x_87);
+lean_dec(x_85);
+x_88 = lean_box(0);
+lean_inc(x_86);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_86);
+lean_ctor_set(x_89, 1, x_88);
+x_90 = l_Lean_Elab_Tactic_setGoals(x_89, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_87);
+x_91 = lean_ctor_get(x_90, 1);
+lean_inc(x_91);
+lean_dec(x_90);
+x_92 = lean_box(0);
+x_93 = l_Lean_MVarId_setTag(x_86, x_92, x_12, x_13, x_14, x_15, x_91);
+x_94 = lean_ctor_get(x_93, 1);
+lean_inc(x_94);
+lean_dec(x_93);
+lean_inc(x_3);
+x_95 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
+lean_closure_set(x_95, 0, x_3);
+lean_inc(x_1);
+x_96 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_withTacticInfoContext___rarg), 11, 2);
+lean_closure_set(x_96, 0, x_1);
+lean_closure_set(x_96, 1, x_95);
+x_97 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_closeUsingOrAdmit), 10, 1);
+lean_closure_set(x_97, 0, x_96);
+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);
+lean_inc(x_8);
+lean_inc(x_3);
+lean_inc(x_2);
+x_98 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(x_2, x_3, x_97, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_94);
+if (lean_obj_tag(x_98) == 0)
+{
+lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_99 = lean_ctor_get(x_98, 1);
+lean_inc(x_99);
+lean_dec(x_98);
+x_100 = l_Lean_Elab_Tactic_setGoals(x_84, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_99);
+x_101 = lean_ctor_get(x_100, 1);
+lean_inc(x_101);
+lean_dec(x_100);
+x_102 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_102, 0, x_79);
+x_20 = x_102;
+x_21 = x_101;
+goto block_28;
+}
+else
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+lean_dec(x_84);
+lean_dec(x_79);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_103 = lean_ctor_get(x_98, 0);
+lean_inc(x_103);
+x_104 = lean_ctor_get(x_98, 1);
+lean_inc(x_104);
+if (lean_is_exclusive(x_98)) {
+ lean_ctor_release(x_98, 0);
+ lean_ctor_release(x_98, 1);
+ x_105 = x_98;
+} else {
+ lean_dec_ref(x_98);
+ x_105 = lean_box(0);
+}
+if (lean_is_scalar(x_105)) {
+ x_106 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_106 = x_105;
+}
+lean_ctor_set(x_106, 0, x_103);
+lean_ctor_set(x_106, 1, x_104);
+return x_106;
+}
+}
+else
+{
+lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+lean_dec(x_84);
+lean_dec(x_79);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_107 = lean_ctor_get(x_85, 0);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_85, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_85)) {
+ lean_ctor_release(x_85, 0);
+ lean_ctor_release(x_85, 1);
+ x_109 = x_85;
+} else {
+ lean_dec_ref(x_85);
+ x_109 = lean_box(0);
+}
+if (lean_is_scalar(x_109)) {
+ x_110 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_110 = x_109;
+}
+lean_ctor_set(x_110, 0, x_107);
+lean_ctor_set(x_110, 1, x_108);
+return x_110;
+}
+}
+else
+{
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+lean_dec(x_79);
+lean_dec(x_76);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_111 = lean_ctor_get(x_80, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_80, 1);
+lean_inc(x_112);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_113 = x_80;
+} else {
+ lean_dec_ref(x_80);
+ x_113 = lean_box(0);
+}
+if (lean_is_scalar(x_113)) {
+ x_114 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_114 = x_113;
+}
+lean_ctor_set(x_114, 0, x_111);
+lean_ctor_set(x_114, 1, x_112);
+return x_114;
+}
+}
+}
+block_28:
+{
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_22 = lean_ctor_get(x_20, 0);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_21);
+return x_23;
+}
+else
+{
+lean_object* x_24; size_t x_25; size_t x_26; 
+x_24 = lean_ctor_get(x_20, 0);
+lean_inc(x_24);
+lean_dec(x_20);
+x_25 = 1;
+x_26 = lean_usize_add(x_6, x_25);
+x_6 = x_26;
+x_7 = x_24;
+x_16 = x_21;
+goto _start;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_evalCase___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -25790,542 +26426,311 @@ x_1 = lean_mk_string_from_bytes("caseArg", 7);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, size_t x_7, size_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_object* x_17, lean_object* x_18) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase___lambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-uint8_t x_19; 
-x_19 = lean_usize_dec_lt(x_8, x_7);
-if (x_19 == 0)
-{
-lean_object* x_20; 
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_9);
-lean_ctor_set(x_20, 1, x_18);
-return x_20;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-lean_dec(x_9);
-x_21 = lean_array_uget(x_6, x_8);
-x_29 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__3;
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = l_Lean_Elab_Tactic_evalCase___lambda__1___closed__1;
+x_4 = l_Lean_Name_str___override(x_1, x_3);
 lean_inc(x_2);
-x_30 = l_Lean_Name_str___override(x_2, x_29);
-x_31 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__5;
-x_32 = l_Lean_Name_str___override(x_30, x_31);
-x_33 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1;
-x_34 = l_Lean_Name_str___override(x_32, x_33);
-lean_inc(x_21);
-x_35 = l_Lean_Syntax_isOfKind(x_21, x_34);
-lean_dec(x_34);
-if (x_35 == 0)
-{
-lean_object* x_36; uint8_t x_37; 
-lean_dec(x_21);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_5);
+x_5 = l_Lean_Syntax_isOfKind(x_2, x_4);
 lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_36 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___rarg(x_18);
-x_37 = !lean_is_exclusive(x_36);
-if (x_37 == 0)
-{
-return x_36;
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_36, 0);
-x_39 = lean_ctor_get(x_36, 1);
-lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_36);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
-}
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_41 = lean_unsigned_to_nat(0u);
-x_42 = l_Lean_Syntax_getArg(x_21, x_41);
-x_43 = lean_unsigned_to_nat(1u);
-x_44 = l_Lean_Syntax_getArg(x_21, x_43);
-lean_dec(x_21);
-x_45 = l_Lean_Syntax_getArgs(x_44);
-lean_dec(x_44);
-lean_inc(x_17);
-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);
-x_46 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_42, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-if (lean_obj_tag(x_46) == 0)
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_46, 1);
-lean_inc(x_48);
-lean_dec(x_46);
-x_49 = lean_ctor_get(x_47, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_47, 1);
-lean_inc(x_50);
-lean_dec(x_47);
-lean_inc(x_17);
-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);
-x_51 = l_Lean_Elab_Tactic_renameInaccessibles(x_49, x_45, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_48);
-if (lean_obj_tag(x_51) == 0)
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_52 = lean_ctor_get(x_51, 0);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_51, 1);
-lean_inc(x_53);
-lean_dec(x_51);
-x_54 = lean_box(0);
-lean_inc(x_52);
-x_55 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_55, 0, x_52);
-lean_ctor_set(x_55, 1, x_54);
-x_56 = l_Lean_Elab_Tactic_setGoals(x_55, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_53);
-x_57 = lean_ctor_get(x_56, 1);
-lean_inc(x_57);
-lean_dec(x_56);
-x_58 = lean_box(0);
-x_59 = l_Lean_MVarId_setTag(x_52, x_58, x_14, x_15, x_16, x_17, x_57);
-x_60 = lean_ctor_get(x_59, 1);
-lean_inc(x_60);
-lean_dec(x_59);
-lean_inc(x_5);
-x_61 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
-lean_closure_set(x_61, 0, x_5);
-lean_inc(x_1);
-x_62 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_withTacticInfoContext___rarg), 11, 2);
-lean_closure_set(x_62, 0, x_1);
-lean_closure_set(x_62, 1, x_61);
-x_63 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_closeUsingOrAdmit), 10, 1);
-lean_closure_set(x_63, 0, x_62);
-lean_inc(x_17);
-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);
-lean_inc(x_4);
-x_64 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__2(x_4, x_5, x_63, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_60);
-if (lean_obj_tag(x_64) == 0)
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_65 = lean_ctor_get(x_64, 1);
-lean_inc(x_65);
-lean_dec(x_64);
-x_66 = l_Lean_Elab_Tactic_setGoals(x_50, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_65);
-x_67 = lean_ctor_get(x_66, 1);
-lean_inc(x_67);
-lean_dec(x_66);
-x_68 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_evalSeq1___spec__1___closed__5;
-x_22 = x_68;
-x_23 = x_67;
-goto block_28;
-}
-else
-{
-uint8_t x_69; 
-lean_dec(x_50);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_69 = !lean_is_exclusive(x_64);
-if (x_69 == 0)
-{
-return x_64;
-}
-else
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_64, 0);
-x_71 = lean_ctor_get(x_64, 1);
-lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_64);
-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_73; 
-lean_dec(x_50);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_73 = !lean_is_exclusive(x_51);
-if (x_73 == 0)
-{
-return x_51;
-}
-else
-{
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_51, 0);
-x_75 = lean_ctor_get(x_51, 1);
-lean_inc(x_75);
-lean_inc(x_74);
-lean_dec(x_51);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
-}
-}
-}
-else
-{
-uint8_t x_77; 
-lean_dec(x_45);
-lean_dec(x_17);
-lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_14);
-lean_dec(x_13);
-lean_dec(x_12);
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_77 = !lean_is_exclusive(x_46);
-if (x_77 == 0)
-{
-return x_46;
-}
-else
-{
-lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_78 = lean_ctor_get(x_46, 0);
-x_79 = lean_ctor_get(x_46, 1);
-lean_inc(x_79);
-lean_inc(x_78);
-lean_dec(x_46);
-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;
-}
-}
-}
-block_28:
-{
-lean_object* x_24; size_t x_25; size_t x_26; 
-x_24 = lean_ctor_get(x_22, 0);
-lean_inc(x_24);
-lean_dec(x_22);
-x_25 = 1;
-x_26 = lean_usize_add(x_8, x_25);
-x_8 = x_26;
-x_9 = x_24;
-x_18 = x_23;
-goto _start;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; 
-x_5 = lean_usize_dec_lt(x_3, x_2);
 if (x_5 == 0)
 {
-return x_4;
+lean_object* x_6; 
+lean_dec(x_2);
+x_6 = lean_box(0);
+return x_6;
 }
 else
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; 
-x_6 = lean_array_uget(x_4, x_3);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = lean_array_uset(x_4, x_3, x_7);
-x_9 = 1;
-x_10 = lean_usize_add(x_3, x_9);
-x_11 = lean_array_uset(x_8, x_3, x_6);
-x_3 = x_10;
-x_4 = x_11;
-goto _start;
+x_8 = l_Lean_Syntax_getArg(x_2, x_7);
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = l_Lean_Syntax_getArg(x_2, x_9);
+lean_dec(x_2);
+x_11 = l_Lean_Syntax_getArgs(x_10);
+lean_dec(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_8);
+lean_ctor_set(x_12, 1, x_11);
+x_13 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+return x_13;
 }
 }
 }
 static lean_object* _init_l_Lean_Elab_Tactic_evalCase___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
-x_2 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_33; uint8_t x_34; 
-x_11 = lean_unsigned_to_nat(1u);
-x_12 = l_Lean_Syntax_getArg(x_1, x_11);
-x_33 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_renameInaccessibles___spec__1___closed__2;
-lean_inc(x_12);
-x_34 = l_Lean_Syntax_isOfKind(x_12, x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; size_t x_37; size_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_35 = l_Lean_Syntax_getArgs(x_12);
-lean_dec(x_12);
-x_36 = lean_array_get_size(x_35);
-x_37 = lean_usize_of_nat(x_36);
-lean_dec(x_36);
-x_38 = 0;
-x_39 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__2;
-x_40 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(x_39, x_37, x_38, x_35);
-x_41 = lean_unsigned_to_nat(2u);
-x_42 = l_Lean_Syntax_getArg(x_1, x_41);
-x_43 = lean_unsigned_to_nat(3u);
-x_44 = l_Lean_Syntax_getArg(x_1, x_43);
-x_45 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_45, 0, x_42);
-lean_ctor_set(x_45, 1, x_44);
-x_13 = x_40;
-x_14 = x_45;
-goto block_32;
-}
-else
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_46 = lean_unsigned_to_nat(2u);
-x_47 = l_Lean_Syntax_getArg(x_1, x_46);
-x_48 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__10;
-x_49 = lean_array_push(x_48, x_12);
-x_50 = lean_array_push(x_49, x_47);
-x_51 = lean_box(2);
-x_52 = l_Lean_Elab_Tactic_evalCase___closed__1;
-x_53 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_53, 0, x_51);
-lean_ctor_set(x_53, 1, x_52);
-lean_ctor_set(x_53, 2, x_50);
-x_54 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__9;
-x_55 = lean_array_push(x_54, x_53);
-x_56 = lean_unsigned_to_nat(3u);
-x_57 = l_Lean_Syntax_getArg(x_1, x_56);
-x_58 = lean_unsigned_to_nat(4u);
-x_59 = l_Lean_Syntax_getArg(x_1, x_58);
-x_60 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_60, 0, x_57);
-lean_ctor_set(x_60, 1, x_59);
-x_13 = x_55;
-x_14 = x_60;
-goto block_32;
-}
-block_32:
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_array_get_size(x_13);
-x_18 = lean_usize_of_nat(x_17);
-lean_dec(x_17);
-x_19 = 0;
-x_20 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__2;
-x_21 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_renameInaccessibles___spec__1___closed__2;
-x_22 = lean_box(0);
-x_23 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3(x_1, x_20, x_21, x_15, x_16, x_13, x_18, x_19, x_22, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_13);
-if (lean_obj_tag(x_23) == 0)
-{
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
-{
-lean_object* x_25; 
-x_25 = lean_ctor_get(x_23, 0);
-lean_dec(x_25);
-lean_ctor_set(x_23, 0, x_22);
-return x_23;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; 
-x_26 = lean_ctor_get(x_23, 1);
-lean_inc(x_26);
-lean_dec(x_23);
-x_27 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_27, 0, x_22);
-lean_ctor_set(x_27, 1, x_26);
-return x_27;
-}
-}
-else
-{
-uint8_t x_28; 
-x_28 = !lean_is_exclusive(x_23);
-if (x_28 == 0)
-{
-return x_23;
-}
-else
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_23, 0);
-x_30 = lean_ctor_get(x_23, 1);
-lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_23);
-x_31 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-return x_31;
-}
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_9;
-}
-}
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___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];
-lean_object* x_18 = _args[17];
-_start:
-{
-size_t x_19; size_t x_20; lean_object* x_21; 
-x_19 = lean_unbox_usize(x_7);
-lean_dec(x_7);
-x_20 = lean_unbox_usize(x_8);
-lean_dec(x_8);
-x_21 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3(x_1, x_2, x_3, x_4, x_5, x_6, x_19, x_20, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17, x_18);
-lean_dec(x_6);
-lean_dec(x_3);
-return x_21;
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-size_t x_5; size_t x_6; lean_object* x_7; 
-x_5 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_6 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_7 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(x_1, x_5, x_6, x_4);
-lean_dec(x_1);
-return x_7;
-}
-}
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string_from_bytes("case", 4);
 return x_1;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2() {
+static lean_object* _init_l_Lean_Elab_Tactic_evalCase___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1;
+x_2 = l_Lean_Elab_Tactic_evalCase___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3() {
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = l_Lean_Elab_Tactic_evalCase___closed__2;
+lean_inc(x_1);
+x_12 = l_Lean_Syntax_isOfKind(x_1, x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_13 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_14 = lean_unsigned_to_nat(1u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+x_16 = l_Lean_Syntax_getArgs(x_15);
+lean_dec(x_15);
+x_17 = lean_array_get_size(x_16);
+x_18 = lean_unsigned_to_nat(0u);
+x_19 = lean_nat_dec_lt(x_18, x_17);
+x_20 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
+x_21 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalCase___lambda__1), 2, 1);
+lean_closure_set(x_21, 0, x_20);
+if (x_19 == 0)
+{
+lean_object* x_54; 
+lean_dec(x_17);
+lean_dec(x_16);
+x_54 = l_Lean_Elab_Tactic_addCheckpoints___lambda__1___closed__1;
+x_22 = x_54;
+goto block_53;
+}
+else
+{
+uint8_t x_55; 
+x_55 = lean_nat_dec_le(x_17, x_17);
+if (x_55 == 0)
+{
+lean_object* x_56; 
+lean_dec(x_17);
+lean_dec(x_16);
+x_56 = l_Lean_Elab_Tactic_addCheckpoints___lambda__1___closed__1;
+x_22 = x_56;
+goto block_53;
+}
+else
+{
+size_t x_57; size_t x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_57 = 0;
+x_58 = lean_usize_of_nat(x_17);
+lean_dec(x_17);
+x_59 = l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Tactic_evalOpen___spec__3___closed__14;
+x_60 = l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(x_16, x_57, x_58, x_59);
+lean_dec(x_16);
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+lean_dec(x_60);
+x_22 = x_61;
+goto block_53;
+}
+}
+block_53:
+{
+lean_object* x_23; 
+x_23 = l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1(x_22, x_21);
+lean_dec(x_22);
+if (lean_obj_tag(x_23) == 0)
+{
+lean_object* x_24; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_24 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_24;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; size_t x_27; size_t x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
+x_25 = lean_ctor_get(x_23, 0);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_array_get_size(x_25);
+x_27 = lean_usize_of_nat(x_26);
+lean_dec(x_26);
+x_28 = 0;
+lean_inc(x_25);
+x_29 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3(x_27, x_28, x_25);
+x_30 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(x_27, x_28, x_25);
+x_31 = lean_unsigned_to_nat(2u);
+x_32 = l_Lean_Syntax_getArg(x_1, x_31);
+x_33 = lean_unsigned_to_nat(3u);
+x_34 = l_Lean_Syntax_getArg(x_1, x_33);
+x_35 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__4;
+lean_inc(x_34);
+x_36 = l_Lean_Syntax_isOfKind(x_34, x_35);
+if (x_36 == 0)
+{
+lean_object* x_37; 
+lean_dec(x_34);
+lean_dec(x_32);
+lean_dec(x_30);
+lean_dec(x_29);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_37 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_37;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; size_t x_41; lean_object* x_42; 
+x_38 = lean_array_get_size(x_29);
+x_39 = l_Array_toSubarray___rarg(x_29, x_18, x_38);
+x_40 = lean_array_get_size(x_30);
+x_41 = lean_usize_of_nat(x_40);
+lean_dec(x_40);
+x_42 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__6(x_1, x_32, x_34, x_30, x_41, x_28, x_39, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_30);
+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; lean_object* x_45; 
+x_44 = lean_ctor_get(x_42, 0);
+lean_dec(x_44);
+x_45 = lean_box(0);
+lean_ctor_set(x_42, 0, x_45);
+return x_42;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_42, 1);
+lean_inc(x_46);
+lean_dec(x_42);
+x_47 = lean_box(0);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_46);
+return x_48;
+}
+}
+else
+{
+uint8_t x_49; 
+x_49 = !lean_is_exclusive(x_42);
+if (x_49 == 0)
+{
+return x_42;
+}
+else
+{
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_42, 0);
+x_51 = lean_ctor_get(x_42, 1);
+lean_inc(x_51);
+lean_inc(x_50);
+lean_dec(x_42);
+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_EXPORT lean_object* l_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2___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_Array_sequenceMap_loop___at_Lean_Elab_Tactic_evalCase___spec__2(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_1);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; size_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3(x_4, x_5, x_3);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; size_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_5 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_6 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(x_4, x_5, x_3);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___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_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:
+{
+size_t x_17; size_t x_18; lean_object* x_19; 
+x_17 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_18 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_19 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__6(x_1, x_2, x_3, x_4, x_17, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_4);
+return x_19;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -26333,17 +26738,17 @@ x_1 = lean_mk_string_from_bytes("evalCase", 8);
 return x_1;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4() {
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__3;
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3;
+x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5() {
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -26356,9 +26761,9 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_2 = l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
-x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2;
-x_4 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4;
-x_5 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5;
+x_3 = l_Lean_Elab_Tactic_evalCase___closed__2;
+x_4 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2;
+x_5 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3;
 x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
 return x_6;
 }
@@ -26379,8 +26784,8 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(370u);
-x_2 = lean_unsigned_to_nat(35u);
+x_1 = lean_unsigned_to_nat(363u);
+x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -26394,7 +26799,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_obj
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange___closed__1;
 x_2 = lean_unsigned_to_nat(24u);
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange___closed__2;
-x_4 = lean_unsigned_to_nat(35u);
+x_4 = lean_unsigned_to_nat(31u);
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -26459,652 +26864,1148 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange(lean
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4;
+x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2;
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange___closed__7;
 x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
 _start:
 {
-lean_object* x_13; lean_object* x_14; uint8_t x_15; 
-x_13 = l_List_appendTR___rarg(x_1, x_2);
-x_14 = l_Lean_Elab_Tactic_setGoals(x_13, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
-x_15 = !lean_is_exclusive(x_14);
-if (x_15 == 0)
-{
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_ctor_get(x_14, 0);
-lean_dec(x_16);
-x_17 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_evalSeq1___spec__1___closed__5;
-lean_ctor_set(x_14, 0, x_17);
-return x_14;
-}
-else
+lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_15 = l_List_foldl___at_Array_appendList___spec__1___rarg(x_4, x_1);
+x_16 = l_Lean_Elab_Tactic_setGoals(x_2, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
 {
 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 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_evalSeq1___spec__1___closed__5;
-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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, size_t x_6, size_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, lean_object* x_17) {
-_start:
-{
-uint8_t x_18; 
-x_18 = lean_usize_dec_lt(x_7, x_6);
-if (x_18 == 0)
-{
-lean_object* x_19; 
-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_4);
-lean_dec(x_3);
-lean_dec(x_1);
+x_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
 x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_8);
-lean_ctor_set(x_19, 1, x_17);
-return x_19;
+lean_ctor_set(x_19, 0, x_3);
+lean_ctor_set(x_19, 1, x_15);
+x_20 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_16, 0, x_20);
+return x_16;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_28; 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_dec(x_8);
-x_20 = lean_array_uget(x_5, x_7);
-x_28 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__3;
-lean_inc(x_1);
-x_29 = l_Lean_Name_str___override(x_1, x_28);
-x_30 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__5;
-x_31 = l_Lean_Name_str___override(x_29, x_30);
-x_32 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1;
-x_33 = l_Lean_Name_str___override(x_31, x_32);
-lean_inc(x_20);
-x_34 = l_Lean_Syntax_isOfKind(x_20, x_33);
-lean_dec(x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; uint8_t x_36; 
-lean_dec(x_20);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_21 = lean_ctor_get(x_16, 1);
+lean_inc(x_21);
 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_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_35 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalCase___spec__1___rarg(x_17);
-x_36 = !lean_is_exclusive(x_35);
-if (x_36 == 0)
-{
-return x_35;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_35, 0);
-x_38 = lean_ctor_get(x_35, 1);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_35);
-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;
-}
-}
-else
-{
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_40 = lean_unsigned_to_nat(0u);
-x_41 = l_Lean_Syntax_getArg(x_20, x_40);
-x_42 = lean_unsigned_to_nat(1u);
-x_43 = l_Lean_Syntax_getArg(x_20, x_42);
-lean_dec(x_20);
-x_44 = l_Lean_Syntax_getArgs(x_43);
-lean_dec(x_43);
-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_9);
-x_45 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_41, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
-if (lean_obj_tag(x_45) == 0)
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-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 = lean_ctor_get(x_46, 0);
-lean_inc(x_48);
-x_49 = lean_ctor_get(x_46, 1);
-lean_inc(x_49);
-lean_dec(x_46);
-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_9);
-x_50 = l_Lean_Elab_Tactic_renameInaccessibles(x_48, x_44, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_47);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_50, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_50, 1);
-lean_inc(x_52);
-lean_dec(x_50);
-lean_inc(x_51);
-x_53 = l_Lean_MVarId_getTag(x_51, x_13, x_14, x_15, x_16, x_52);
-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; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-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 = lean_box(0);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_51);
-lean_ctor_set(x_57, 1, x_56);
-x_58 = l_Lean_Elab_Tactic_setGoals(x_57, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_55);
-x_59 = lean_ctor_get(x_58, 1);
-lean_inc(x_59);
-lean_dec(x_58);
-lean_inc(x_4);
-x_60 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
-lean_closure_set(x_60, 0, x_4);
-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_9);
-lean_inc(x_4);
-lean_inc(x_3);
-x_61 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__2(x_3, x_4, x_60, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_59);
-if (lean_obj_tag(x_61) == 0)
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_61, 1);
-lean_inc(x_62);
-lean_dec(x_61);
-x_63 = l_Lean_Elab_Tactic_getUnsolvedGoals(x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_62);
-x_64 = lean_ctor_get(x_63, 0);
-lean_inc(x_64);
-if (lean_obj_tag(x_64) == 0)
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-lean_dec(x_54);
-x_65 = lean_ctor_get(x_63, 1);
-lean_inc(x_65);
-lean_dec(x_63);
-x_66 = lean_box(0);
-x_67 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_64, x_49, x_66, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_65);
-x_68 = lean_ctor_get(x_67, 0);
-lean_inc(x_68);
-x_69 = lean_ctor_get(x_67, 1);
-lean_inc(x_69);
-lean_dec(x_67);
-x_21 = x_68;
-x_22 = x_69;
-goto block_27;
-}
-else
-{
-lean_object* x_70; 
-x_70 = lean_ctor_get(x_64, 1);
-lean_inc(x_70);
-if (lean_obj_tag(x_70) == 0)
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_71 = lean_ctor_get(x_63, 1);
-lean_inc(x_71);
-lean_dec(x_63);
-x_72 = lean_ctor_get(x_64, 0);
-lean_inc(x_72);
-x_73 = l_Lean_MVarId_setTag(x_72, x_54, x_13, x_14, x_15, x_16, x_71);
-x_74 = lean_ctor_get(x_73, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
-lean_inc(x_75);
-lean_dec(x_73);
-x_76 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_64, x_49, x_74, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_75);
-lean_dec(x_74);
-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_21 = x_77;
-x_22 = x_78;
-goto block_27;
-}
-else
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-lean_dec(x_70);
-lean_dec(x_54);
-x_79 = lean_ctor_get(x_63, 1);
-lean_inc(x_79);
-lean_dec(x_63);
-x_80 = lean_box(0);
-x_81 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_64, x_49, x_80, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_79);
-x_82 = lean_ctor_get(x_81, 0);
-lean_inc(x_82);
-x_83 = lean_ctor_get(x_81, 1);
-lean_inc(x_83);
-lean_dec(x_81);
-x_21 = x_82;
-x_22 = x_83;
-goto block_27;
-}
-}
-}
-else
-{
-uint8_t x_84; 
-lean_dec(x_54);
-lean_dec(x_49);
-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_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_84 = !lean_is_exclusive(x_61);
-if (x_84 == 0)
-{
-return x_61;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_61, 0);
-x_86 = lean_ctor_get(x_61, 1);
-lean_inc(x_86);
-lean_inc(x_85);
-lean_dec(x_61);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
-}
-}
-}
-else
-{
-uint8_t x_88; 
-lean_dec(x_51);
-lean_dec(x_49);
-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_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_88 = !lean_is_exclusive(x_53);
-if (x_88 == 0)
-{
-return x_53;
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_53, 0);
-x_90 = lean_ctor_get(x_53, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_53);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
-}
-}
-}
-else
-{
-uint8_t x_92; 
-lean_dec(x_49);
-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_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_92 = !lean_is_exclusive(x_50);
-if (x_92 == 0)
-{
-return x_50;
-}
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_50, 0);
-x_94 = lean_ctor_get(x_50, 1);
-lean_inc(x_94);
-lean_inc(x_93);
-lean_dec(x_50);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_93);
-lean_ctor_set(x_95, 1, x_94);
-return x_95;
-}
-}
-}
-else
-{
-uint8_t x_96; 
-lean_dec(x_44);
-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_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_96 = !lean_is_exclusive(x_45);
-if (x_96 == 0)
-{
-return x_45;
-}
-else
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-x_97 = lean_ctor_get(x_45, 0);
-x_98 = lean_ctor_get(x_45, 1);
-lean_inc(x_98);
-lean_inc(x_97);
-lean_dec(x_45);
-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_27:
-{
-lean_object* x_23; size_t x_24; size_t x_25; 
-x_23 = lean_ctor_get(x_21, 0);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = 1;
-x_25 = lean_usize_add(x_7, x_24);
-x_7 = x_25;
-x_8 = x_23;
-x_17 = x_22;
-goto _start;
-}
-}
-}
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; 
-x_5 = lean_usize_dec_lt(x_3, x_2);
-if (x_5 == 0)
-{
-return x_4;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; size_t x_9; size_t x_10; lean_object* x_11; 
-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);
-x_9 = 1;
-x_10 = lean_usize_add(x_3, x_9);
-x_11 = lean_array_uset(x_8, x_3, x_6);
-x_3 = x_10;
-x_4 = x_11;
-goto _start;
-}
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase_x27(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_33; uint8_t x_34; 
-x_11 = lean_unsigned_to_nat(1u);
-x_12 = l_Lean_Syntax_getArg(x_1, x_11);
-x_33 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_renameInaccessibles___spec__1___closed__2;
-lean_inc(x_12);
-x_34 = l_Lean_Syntax_isOfKind(x_12, x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; size_t x_37; size_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_35 = l_Lean_Syntax_getArgs(x_12);
-lean_dec(x_12);
-x_36 = lean_array_get_size(x_35);
-x_37 = lean_usize_of_nat(x_36);
-lean_dec(x_36);
-x_38 = 0;
-x_39 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__2;
-x_40 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2(x_39, x_37, x_38, x_35);
-x_41 = lean_unsigned_to_nat(2u);
-x_42 = l_Lean_Syntax_getArg(x_1, x_41);
-x_43 = lean_unsigned_to_nat(3u);
-x_44 = l_Lean_Syntax_getArg(x_1, x_43);
-x_45 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_45, 0, x_42);
-lean_ctor_set(x_45, 1, x_44);
-x_13 = x_40;
-x_14 = x_45;
-goto block_32;
-}
-else
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_46 = lean_unsigned_to_nat(2u);
-x_47 = l_Lean_Syntax_getArg(x_1, x_46);
-x_48 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__10;
-x_49 = lean_array_push(x_48, x_12);
-x_50 = lean_array_push(x_49, x_47);
-x_51 = lean_box(2);
-x_52 = l_Lean_Elab_Tactic_evalCase___closed__1;
-x_53 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_53, 0, x_51);
-lean_ctor_set(x_53, 1, x_52);
-lean_ctor_set(x_53, 2, x_50);
-x_54 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__9;
-x_55 = lean_array_push(x_54, x_53);
-x_56 = lean_unsigned_to_nat(3u);
-x_57 = l_Lean_Syntax_getArg(x_1, x_56);
-x_58 = lean_unsigned_to_nat(4u);
-x_59 = l_Lean_Syntax_getArg(x_1, x_58);
-x_60 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_60, 0, x_57);
-lean_ctor_set(x_60, 1, x_59);
-x_13 = x_55;
-x_14 = x_60;
-goto block_32;
-}
-block_32:
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; size_t x_18; size_t x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_array_get_size(x_13);
-x_18 = lean_usize_of_nat(x_17);
-lean_dec(x_17);
-x_19 = 0;
-x_20 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__2;
-x_21 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_renameInaccessibles___spec__1___closed__2;
-x_22 = lean_box(0);
-x_23 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(x_20, x_21, x_15, x_16, x_13, x_18, x_19, x_22, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
-lean_dec(x_13);
-if (lean_obj_tag(x_23) == 0)
-{
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
-{
-lean_object* x_25; 
-x_25 = lean_ctor_get(x_23, 0);
-lean_dec(x_25);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_3);
+lean_ctor_set(x_22, 1, x_15);
+x_23 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_23, 0, x_22);
-return x_23;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; 
-x_26 = lean_ctor_get(x_23, 1);
-lean_inc(x_26);
-lean_dec(x_23);
-x_27 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_27, 0, x_22);
-lean_ctor_set(x_27, 1, x_26);
-return x_27;
-}
-}
-else
-{
-uint8_t x_28; 
-x_28 = !lean_is_exclusive(x_23);
-if (x_28 == 0)
-{
-return x_23;
-}
-else
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_23, 0);
-x_30 = lean_ctor_get(x_23, 1);
-lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_23);
-x_31 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-return x_31;
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_21);
+return x_24;
 }
 }
 }
-}
-}
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___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_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, size_t x_5, size_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
 _start:
 {
-lean_object* x_13; 
-x_13 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+uint8_t x_17; 
+x_17 = lean_usize_dec_lt(x_6, x_5);
+if (x_17 == 0)
+{
+lean_object* 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_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
 lean_dec(x_3);
-return x_13;
-}
-}
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___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:
-{
-size_t x_18; size_t x_19; lean_object* x_20; 
-x_18 = lean_unbox_usize(x_6);
-lean_dec(x_6);
-x_19 = lean_unbox_usize(x_7);
-lean_dec(x_7);
-x_20 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(x_1, x_2, x_3, x_4, x_5, x_18, x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16, x_17);
-lean_dec(x_5);
 lean_dec(x_2);
-return x_20;
+lean_dec(x_1);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_7);
+lean_ctor_set(x_18, 1, x_16);
+return x_18;
 }
-}
-LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
+else
 {
-size_t x_5; size_t x_6; lean_object* x_7; 
-x_5 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_6 = lean_unbox_usize(x_3);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_29; 
+x_19 = lean_array_uget(x_4, x_6);
+x_29 = !lean_is_exclusive(x_7);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
+x_30 = lean_ctor_get(x_7, 0);
+x_31 = lean_ctor_get(x_7, 1);
+x_32 = lean_ctor_get(x_30, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_30, 1);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_30, 2);
+lean_inc(x_34);
+x_35 = lean_nat_dec_lt(x_33, x_34);
+if (x_35 == 0)
+{
+lean_object* x_36; 
+lean_dec(x_34);
+lean_dec(x_33);
+lean_dec(x_32);
+lean_dec(x_19);
+x_36 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_36, 0, x_7);
+x_20 = x_36;
+x_21 = x_16;
+goto block_28;
+}
+else
+{
+uint8_t x_37; 
+lean_free_object(x_7);
+x_37 = !lean_is_exclusive(x_30);
+if (x_37 == 0)
+{
+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; 
+x_38 = lean_ctor_get(x_30, 2);
+lean_dec(x_38);
+x_39 = lean_ctor_get(x_30, 1);
+lean_dec(x_39);
+x_40 = lean_ctor_get(x_30, 0);
+lean_dec(x_40);
+x_41 = lean_array_fget(x_32, x_33);
+x_42 = lean_unsigned_to_nat(1u);
+x_43 = lean_nat_add(x_33, x_42);
+lean_dec(x_33);
+lean_ctor_set(x_30, 1, x_43);
+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);
+lean_inc(x_8);
+x_44 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_44) == 0)
+{
+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);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = lean_ctor_get(x_45, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_45, 1);
+lean_inc(x_48);
+lean_dec(x_45);
+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);
+lean_inc(x_8);
+x_49 = l_Lean_Elab_Tactic_renameInaccessibles(x_47, x_41, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_46);
+if (lean_obj_tag(x_49) == 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_50);
+x_52 = l_Lean_MVarId_getTag(x_50, x_12, x_13, x_14, x_15, x_51);
+if (lean_obj_tag(x_52) == 0)
+{
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_53 = lean_ctor_get(x_52, 0);
+lean_inc(x_53);
+x_54 = lean_ctor_get(x_52, 1);
+lean_inc(x_54);
+lean_dec(x_52);
+lean_inc(x_3);
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_50);
+lean_ctor_set(x_55, 1, x_3);
+x_56 = l_Lean_Elab_Tactic_setGoals(x_55, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_54);
+x_57 = lean_ctor_get(x_56, 1);
+lean_inc(x_57);
+lean_dec(x_56);
+lean_inc(x_2);
+x_58 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
+lean_closure_set(x_58, 0, x_2);
+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);
+lean_inc(x_8);
+lean_inc(x_2);
+lean_inc(x_1);
+x_59 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(x_1, x_2, x_58, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_57);
+if (lean_obj_tag(x_59) == 0)
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_59, 1);
+lean_inc(x_60);
+lean_dec(x_59);
+x_61 = l_Lean_Elab_Tactic_getUnsolvedGoals(x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_60);
+x_62 = lean_ctor_get(x_61, 0);
+lean_inc(x_62);
+if (lean_obj_tag(x_62) == 0)
+{
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+lean_dec(x_53);
+x_63 = lean_ctor_get(x_61, 1);
+lean_inc(x_63);
+lean_dec(x_61);
+x_64 = lean_box(0);
+x_65 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_62, x_48, x_30, x_31, x_64, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_63);
+x_66 = lean_ctor_get(x_65, 0);
+lean_inc(x_66);
+x_67 = lean_ctor_get(x_65, 1);
+lean_inc(x_67);
+lean_dec(x_65);
+x_20 = x_66;
+x_21 = x_67;
+goto block_28;
+}
+else
+{
+lean_object* x_68; 
+x_68 = lean_ctor_get(x_62, 1);
+lean_inc(x_68);
+if (lean_obj_tag(x_68) == 0)
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_69 = lean_ctor_get(x_61, 1);
+lean_inc(x_69);
+lean_dec(x_61);
+x_70 = lean_ctor_get(x_62, 0);
+lean_inc(x_70);
+x_71 = l_Lean_MVarId_setTag(x_70, x_53, x_12, x_13, x_14, x_15, x_69);
+x_72 = lean_ctor_get(x_71, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_71, 1);
+lean_inc(x_73);
+lean_dec(x_71);
+x_74 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_62, x_48, x_30, x_31, x_72, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_73);
+lean_dec(x_72);
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+lean_dec(x_74);
+x_20 = x_75;
+x_21 = x_76;
+goto block_28;
+}
+else
+{
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+lean_dec(x_68);
+lean_dec(x_53);
+x_77 = lean_ctor_get(x_61, 1);
+lean_inc(x_77);
+lean_dec(x_61);
+x_78 = lean_box(0);
+x_79 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_62, x_48, x_30, x_31, x_78, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_77);
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_ctor_get(x_79, 1);
+lean_inc(x_81);
+lean_dec(x_79);
+x_20 = x_80;
+x_21 = x_81;
+goto block_28;
+}
+}
+}
+else
+{
+uint8_t x_82; 
+lean_dec(x_53);
+lean_dec(x_48);
+lean_dec(x_30);
+lean_dec(x_31);
+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_3);
-x_7 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase_x27___spec__2(x_1, x_5, x_6, x_4);
+lean_dec(x_2);
 lean_dec(x_1);
-return x_7;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase_x27___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
-_start:
+x_82 = !lean_is_exclusive(x_59);
+if (x_82 == 0)
 {
-lean_object* x_11; 
-x_11 = l_Lean_Elab_Tactic_evalCase_x27(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_59;
+}
+else
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_59, 0);
+x_84 = lean_ctor_get(x_59, 1);
+lean_inc(x_84);
+lean_inc(x_83);
+lean_dec(x_59);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_83);
+lean_ctor_set(x_85, 1, x_84);
+return x_85;
+}
+}
+}
+else
+{
+uint8_t x_86; 
+lean_dec(x_50);
+lean_dec(x_48);
+lean_dec(x_30);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
 lean_dec(x_1);
-return x_11;
+x_86 = !lean_is_exclusive(x_52);
+if (x_86 == 0)
+{
+return x_52;
+}
+else
+{
+lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_87 = lean_ctor_get(x_52, 0);
+x_88 = lean_ctor_get(x_52, 1);
+lean_inc(x_88);
+lean_inc(x_87);
+lean_dec(x_52);
+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;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1() {
+}
+else
+{
+uint8_t x_90; 
+lean_dec(x_48);
+lean_dec(x_30);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_90 = !lean_is_exclusive(x_49);
+if (x_90 == 0)
+{
+return x_49;
+}
+else
+{
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_49, 0);
+x_92 = lean_ctor_get(x_49, 1);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_dec(x_49);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
+}
+}
+}
+else
+{
+uint8_t x_94; 
+lean_dec(x_30);
+lean_dec(x_41);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_94 = !lean_is_exclusive(x_44);
+if (x_94 == 0)
+{
+return x_44;
+}
+else
+{
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_44, 0);
+x_96 = lean_ctor_get(x_44, 1);
+lean_inc(x_96);
+lean_inc(x_95);
+lean_dec(x_44);
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
+}
+}
+}
+else
+{
+lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+lean_dec(x_30);
+x_98 = lean_array_fget(x_32, x_33);
+x_99 = lean_unsigned_to_nat(1u);
+x_100 = lean_nat_add(x_33, x_99);
+lean_dec(x_33);
+x_101 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_101, 0, x_32);
+lean_ctor_set(x_101, 1, x_100);
+lean_ctor_set(x_101, 2, x_34);
+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);
+lean_inc(x_8);
+x_102 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_102) == 0)
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_103 = lean_ctor_get(x_102, 0);
+lean_inc(x_103);
+x_104 = lean_ctor_get(x_102, 1);
+lean_inc(x_104);
+lean_dec(x_102);
+x_105 = lean_ctor_get(x_103, 0);
+lean_inc(x_105);
+x_106 = lean_ctor_get(x_103, 1);
+lean_inc(x_106);
+lean_dec(x_103);
+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);
+lean_inc(x_8);
+x_107 = l_Lean_Elab_Tactic_renameInaccessibles(x_105, x_98, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_104);
+if (lean_obj_tag(x_107) == 0)
+{
+lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_ctor_get(x_107, 1);
+lean_inc(x_109);
+lean_dec(x_107);
+lean_inc(x_108);
+x_110 = l_Lean_MVarId_getTag(x_108, x_12, x_13, x_14, x_15, x_109);
+if (lean_obj_tag(x_110) == 0)
+{
+lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_110, 1);
+lean_inc(x_112);
+lean_dec(x_110);
+lean_inc(x_3);
+x_113 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_113, 0, x_108);
+lean_ctor_set(x_113, 1, x_3);
+x_114 = l_Lean_Elab_Tactic_setGoals(x_113, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_112);
+x_115 = lean_ctor_get(x_114, 1);
+lean_inc(x_115);
+lean_dec(x_114);
+lean_inc(x_2);
+x_116 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
+lean_closure_set(x_116, 0, x_2);
+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);
+lean_inc(x_8);
+lean_inc(x_2);
+lean_inc(x_1);
+x_117 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(x_1, x_2, x_116, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_115);
+if (lean_obj_tag(x_117) == 0)
+{
+lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_118 = lean_ctor_get(x_117, 1);
+lean_inc(x_118);
+lean_dec(x_117);
+x_119 = l_Lean_Elab_Tactic_getUnsolvedGoals(x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_118);
+x_120 = lean_ctor_get(x_119, 0);
+lean_inc(x_120);
+if (lean_obj_tag(x_120) == 0)
+{
+lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+lean_dec(x_111);
+x_121 = lean_ctor_get(x_119, 1);
+lean_inc(x_121);
+lean_dec(x_119);
+x_122 = lean_box(0);
+x_123 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_120, x_106, x_101, x_31, x_122, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_121);
+x_124 = lean_ctor_get(x_123, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_123, 1);
+lean_inc(x_125);
+lean_dec(x_123);
+x_20 = x_124;
+x_21 = x_125;
+goto block_28;
+}
+else
+{
+lean_object* x_126; 
+x_126 = lean_ctor_get(x_120, 1);
+lean_inc(x_126);
+if (lean_obj_tag(x_126) == 0)
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; 
+x_127 = lean_ctor_get(x_119, 1);
+lean_inc(x_127);
+lean_dec(x_119);
+x_128 = lean_ctor_get(x_120, 0);
+lean_inc(x_128);
+x_129 = l_Lean_MVarId_setTag(x_128, x_111, x_12, x_13, x_14, x_15, x_127);
+x_130 = lean_ctor_get(x_129, 0);
+lean_inc(x_130);
+x_131 = lean_ctor_get(x_129, 1);
+lean_inc(x_131);
+lean_dec(x_129);
+x_132 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_120, x_106, x_101, x_31, x_130, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_131);
+lean_dec(x_130);
+x_133 = lean_ctor_get(x_132, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_132, 1);
+lean_inc(x_134);
+lean_dec(x_132);
+x_20 = x_133;
+x_21 = x_134;
+goto block_28;
+}
+else
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+lean_dec(x_126);
+lean_dec(x_111);
+x_135 = lean_ctor_get(x_119, 1);
+lean_inc(x_135);
+lean_dec(x_119);
+x_136 = lean_box(0);
+x_137 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_120, x_106, x_101, x_31, x_136, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_135);
+x_138 = lean_ctor_get(x_137, 0);
+lean_inc(x_138);
+x_139 = lean_ctor_get(x_137, 1);
+lean_inc(x_139);
+lean_dec(x_137);
+x_20 = x_138;
+x_21 = x_139;
+goto block_28;
+}
+}
+}
+else
+{
+lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
+lean_dec(x_111);
+lean_dec(x_106);
+lean_dec(x_101);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_140 = lean_ctor_get(x_117, 0);
+lean_inc(x_140);
+x_141 = lean_ctor_get(x_117, 1);
+lean_inc(x_141);
+if (lean_is_exclusive(x_117)) {
+ lean_ctor_release(x_117, 0);
+ lean_ctor_release(x_117, 1);
+ x_142 = x_117;
+} else {
+ lean_dec_ref(x_117);
+ x_142 = lean_box(0);
+}
+if (lean_is_scalar(x_142)) {
+ x_143 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_143 = x_142;
+}
+lean_ctor_set(x_143, 0, x_140);
+lean_ctor_set(x_143, 1, x_141);
+return x_143;
+}
+}
+else
+{
+lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_dec(x_108);
+lean_dec(x_106);
+lean_dec(x_101);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_144 = lean_ctor_get(x_110, 0);
+lean_inc(x_144);
+x_145 = lean_ctor_get(x_110, 1);
+lean_inc(x_145);
+if (lean_is_exclusive(x_110)) {
+ lean_ctor_release(x_110, 0);
+ lean_ctor_release(x_110, 1);
+ x_146 = x_110;
+} else {
+ lean_dec_ref(x_110);
+ x_146 = lean_box(0);
+}
+if (lean_is_scalar(x_146)) {
+ x_147 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_147 = x_146;
+}
+lean_ctor_set(x_147, 0, x_144);
+lean_ctor_set(x_147, 1, x_145);
+return x_147;
+}
+}
+else
+{
+lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+lean_dec(x_106);
+lean_dec(x_101);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_148 = lean_ctor_get(x_107, 0);
+lean_inc(x_148);
+x_149 = lean_ctor_get(x_107, 1);
+lean_inc(x_149);
+if (lean_is_exclusive(x_107)) {
+ lean_ctor_release(x_107, 0);
+ lean_ctor_release(x_107, 1);
+ x_150 = x_107;
+} else {
+ lean_dec_ref(x_107);
+ x_150 = lean_box(0);
+}
+if (lean_is_scalar(x_150)) {
+ x_151 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_151 = x_150;
+}
+lean_ctor_set(x_151, 0, x_148);
+lean_ctor_set(x_151, 1, x_149);
+return x_151;
+}
+}
+else
+{
+lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+lean_dec(x_101);
+lean_dec(x_98);
+lean_dec(x_31);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_152 = lean_ctor_get(x_102, 0);
+lean_inc(x_152);
+x_153 = lean_ctor_get(x_102, 1);
+lean_inc(x_153);
+if (lean_is_exclusive(x_102)) {
+ lean_ctor_release(x_102, 0);
+ lean_ctor_release(x_102, 1);
+ x_154 = x_102;
+} else {
+ lean_dec_ref(x_102);
+ x_154 = lean_box(0);
+}
+if (lean_is_scalar(x_154)) {
+ x_155 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_155 = x_154;
+}
+lean_ctor_set(x_155, 0, x_152);
+lean_ctor_set(x_155, 1, x_153);
+return x_155;
+}
+}
+}
+}
+else
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; uint8_t x_161; 
+x_156 = lean_ctor_get(x_7, 0);
+x_157 = lean_ctor_get(x_7, 1);
+lean_inc(x_157);
+lean_inc(x_156);
+lean_dec(x_7);
+x_158 = lean_ctor_get(x_156, 0);
+lean_inc(x_158);
+x_159 = lean_ctor_get(x_156, 1);
+lean_inc(x_159);
+x_160 = lean_ctor_get(x_156, 2);
+lean_inc(x_160);
+x_161 = lean_nat_dec_lt(x_159, x_160);
+if (x_161 == 0)
+{
+lean_object* x_162; lean_object* x_163; 
+lean_dec(x_160);
+lean_dec(x_159);
+lean_dec(x_158);
+lean_dec(x_19);
+x_162 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_162, 0, x_156);
+lean_ctor_set(x_162, 1, x_157);
+x_163 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_163, 0, x_162);
+x_20 = x_163;
+x_21 = x_16;
+goto block_28;
+}
+else
+{
+lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ lean_ctor_release(x_156, 2);
+ x_164 = x_156;
+} else {
+ lean_dec_ref(x_156);
+ x_164 = lean_box(0);
+}
+x_165 = lean_array_fget(x_158, x_159);
+x_166 = lean_unsigned_to_nat(1u);
+x_167 = lean_nat_add(x_159, x_166);
+lean_dec(x_159);
+if (lean_is_scalar(x_164)) {
+ x_168 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_168 = x_164;
+}
+lean_ctor_set(x_168, 0, x_158);
+lean_ctor_set(x_168, 1, x_167);
+lean_ctor_set(x_168, 2, x_160);
+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);
+lean_inc(x_8);
+x_169 = l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals(x_19, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+if (lean_obj_tag(x_169) == 0)
+{
+lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_170 = lean_ctor_get(x_169, 0);
+lean_inc(x_170);
+x_171 = lean_ctor_get(x_169, 1);
+lean_inc(x_171);
+lean_dec(x_169);
+x_172 = lean_ctor_get(x_170, 0);
+lean_inc(x_172);
+x_173 = lean_ctor_get(x_170, 1);
+lean_inc(x_173);
+lean_dec(x_170);
+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);
+lean_inc(x_8);
+x_174 = l_Lean_Elab_Tactic_renameInaccessibles(x_172, x_165, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_171);
+if (lean_obj_tag(x_174) == 0)
+{
+lean_object* x_175; lean_object* x_176; lean_object* x_177; 
+x_175 = lean_ctor_get(x_174, 0);
+lean_inc(x_175);
+x_176 = lean_ctor_get(x_174, 1);
+lean_inc(x_176);
+lean_dec(x_174);
+lean_inc(x_175);
+x_177 = l_Lean_MVarId_getTag(x_175, x_12, x_13, x_14, x_15, x_176);
+if (lean_obj_tag(x_177) == 0)
+{
+lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; 
+x_178 = lean_ctor_get(x_177, 0);
+lean_inc(x_178);
+x_179 = lean_ctor_get(x_177, 1);
+lean_inc(x_179);
+lean_dec(x_177);
+lean_inc(x_3);
+x_180 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_180, 0, x_175);
+lean_ctor_set(x_180, 1, x_3);
+x_181 = l_Lean_Elab_Tactic_setGoals(x_180, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_179);
+x_182 = lean_ctor_get(x_181, 1);
+lean_inc(x_182);
+lean_dec(x_181);
+lean_inc(x_2);
+x_183 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalTactic), 10, 1);
+lean_closure_set(x_183, 0, x_2);
+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);
+lean_inc(x_8);
+lean_inc(x_2);
+lean_inc(x_1);
+x_184 = l_Lean_Elab_Tactic_withCaseRef___at_Lean_Elab_Tactic_evalCase___spec__5(x_1, x_2, x_183, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_182);
+if (lean_obj_tag(x_184) == 0)
+{
+lean_object* x_185; lean_object* x_186; lean_object* x_187; 
+x_185 = lean_ctor_get(x_184, 1);
+lean_inc(x_185);
+lean_dec(x_184);
+x_186 = l_Lean_Elab_Tactic_getUnsolvedGoals(x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_185);
+x_187 = lean_ctor_get(x_186, 0);
+lean_inc(x_187);
+if (lean_obj_tag(x_187) == 0)
+{
+lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; 
+lean_dec(x_178);
+x_188 = lean_ctor_get(x_186, 1);
+lean_inc(x_188);
+lean_dec(x_186);
+x_189 = lean_box(0);
+x_190 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_187, x_173, x_168, x_157, x_189, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_188);
+x_191 = lean_ctor_get(x_190, 0);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_190, 1);
+lean_inc(x_192);
+lean_dec(x_190);
+x_20 = x_191;
+x_21 = x_192;
+goto block_28;
+}
+else
+{
+lean_object* x_193; 
+x_193 = lean_ctor_get(x_187, 1);
+lean_inc(x_193);
+if (lean_obj_tag(x_193) == 0)
+{
+lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; 
+x_194 = lean_ctor_get(x_186, 1);
+lean_inc(x_194);
+lean_dec(x_186);
+x_195 = lean_ctor_get(x_187, 0);
+lean_inc(x_195);
+x_196 = l_Lean_MVarId_setTag(x_195, x_178, x_12, x_13, x_14, x_15, x_194);
+x_197 = lean_ctor_get(x_196, 0);
+lean_inc(x_197);
+x_198 = lean_ctor_get(x_196, 1);
+lean_inc(x_198);
+lean_dec(x_196);
+x_199 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_187, x_173, x_168, x_157, x_197, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_198);
+lean_dec(x_197);
+x_200 = lean_ctor_get(x_199, 0);
+lean_inc(x_200);
+x_201 = lean_ctor_get(x_199, 1);
+lean_inc(x_201);
+lean_dec(x_199);
+x_20 = x_200;
+x_21 = x_201;
+goto block_28;
+}
+else
+{
+lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
+lean_dec(x_193);
+lean_dec(x_178);
+x_202 = lean_ctor_get(x_186, 1);
+lean_inc(x_202);
+lean_dec(x_186);
+x_203 = lean_box(0);
+x_204 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(x_187, x_173, x_168, x_157, x_203, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_202);
+x_205 = lean_ctor_get(x_204, 0);
+lean_inc(x_205);
+x_206 = lean_ctor_get(x_204, 1);
+lean_inc(x_206);
+lean_dec(x_204);
+x_20 = x_205;
+x_21 = x_206;
+goto block_28;
+}
+}
+}
+else
+{
+lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
+lean_dec(x_178);
+lean_dec(x_173);
+lean_dec(x_168);
+lean_dec(x_157);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_207 = lean_ctor_get(x_184, 0);
+lean_inc(x_207);
+x_208 = lean_ctor_get(x_184, 1);
+lean_inc(x_208);
+if (lean_is_exclusive(x_184)) {
+ lean_ctor_release(x_184, 0);
+ lean_ctor_release(x_184, 1);
+ x_209 = x_184;
+} else {
+ lean_dec_ref(x_184);
+ x_209 = lean_box(0);
+}
+if (lean_is_scalar(x_209)) {
+ x_210 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_210 = x_209;
+}
+lean_ctor_set(x_210, 0, x_207);
+lean_ctor_set(x_210, 1, x_208);
+return x_210;
+}
+}
+else
+{
+lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; 
+lean_dec(x_175);
+lean_dec(x_173);
+lean_dec(x_168);
+lean_dec(x_157);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_211 = lean_ctor_get(x_177, 0);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_177, 1);
+lean_inc(x_212);
+if (lean_is_exclusive(x_177)) {
+ lean_ctor_release(x_177, 0);
+ lean_ctor_release(x_177, 1);
+ x_213 = x_177;
+} else {
+ lean_dec_ref(x_177);
+ x_213 = lean_box(0);
+}
+if (lean_is_scalar(x_213)) {
+ x_214 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_214 = x_213;
+}
+lean_ctor_set(x_214, 0, x_211);
+lean_ctor_set(x_214, 1, x_212);
+return x_214;
+}
+}
+else
+{
+lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; 
+lean_dec(x_173);
+lean_dec(x_168);
+lean_dec(x_157);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_215 = lean_ctor_get(x_174, 0);
+lean_inc(x_215);
+x_216 = lean_ctor_get(x_174, 1);
+lean_inc(x_216);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ x_217 = x_174;
+} else {
+ lean_dec_ref(x_174);
+ x_217 = lean_box(0);
+}
+if (lean_is_scalar(x_217)) {
+ x_218 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_218 = x_217;
+}
+lean_ctor_set(x_218, 0, x_215);
+lean_ctor_set(x_218, 1, x_216);
+return x_218;
+}
+}
+else
+{
+lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+lean_dec(x_168);
+lean_dec(x_165);
+lean_dec(x_157);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_219 = lean_ctor_get(x_169, 0);
+lean_inc(x_219);
+x_220 = lean_ctor_get(x_169, 1);
+lean_inc(x_220);
+if (lean_is_exclusive(x_169)) {
+ lean_ctor_release(x_169, 0);
+ lean_ctor_release(x_169, 1);
+ x_221 = x_169;
+} else {
+ lean_dec_ref(x_169);
+ x_221 = lean_box(0);
+}
+if (lean_is_scalar(x_221)) {
+ x_222 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_222 = x_221;
+}
+lean_ctor_set(x_222, 0, x_219);
+lean_ctor_set(x_222, 1, x_220);
+return x_222;
+}
+}
+}
+block_28:
+{
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_22 = lean_ctor_get(x_20, 0);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_21);
+return x_23;
+}
+else
+{
+lean_object* x_24; size_t x_25; size_t x_26; 
+x_24 = lean_ctor_get(x_20, 0);
+lean_inc(x_24);
+lean_dec(x_20);
+x_25 = 1;
+x_26 = lean_usize_add(x_6, x_25);
+x_6 = x_26;
+x_7 = x_24;
+x_16 = x_21;
+goto _start;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_evalCase_x27___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -27112,11 +28013,288 @@ x_1 = lean_mk_string_from_bytes("case'", 5);
 return x_1;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2() {
+static lean_object* _init_l_Lean_Elab_Tactic_evalCase_x27___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
+x_2 = l_Lean_Elab_Tactic_evalCase_x27___closed__1;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_evalCase_x27___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
+x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalCase___lambda__1), 2, 1);
+lean_closure_set(x_2, 0, x_1);
+return x_2;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalCase_x27(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = l_Lean_Elab_Tactic_evalCase_x27___closed__2;
+lean_inc(x_1);
+x_12 = l_Lean_Syntax_isOfKind(x_1, x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_13 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; lean_object* x_20; 
+x_14 = lean_unsigned_to_nat(1u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+x_16 = l_Lean_Syntax_getArgs(x_15);
+lean_dec(x_15);
+x_17 = lean_array_get_size(x_16);
+x_18 = lean_unsigned_to_nat(0u);
+x_19 = lean_nat_dec_lt(x_18, x_17);
+if (x_19 == 0)
+{
+lean_object* x_59; 
+lean_dec(x_17);
+lean_dec(x_16);
+x_59 = l_Lean_Elab_Tactic_addCheckpoints___lambda__1___closed__1;
+x_20 = x_59;
+goto block_58;
+}
+else
+{
+uint8_t x_60; 
+x_60 = lean_nat_dec_le(x_17, x_17);
+if (x_60 == 0)
+{
+lean_object* x_61; 
+lean_dec(x_17);
+lean_dec(x_16);
+x_61 = l_Lean_Elab_Tactic_addCheckpoints___lambda__1___closed__1;
+x_20 = x_61;
+goto block_58;
+}
+else
+{
+size_t x_62; size_t x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_62 = 0;
+x_63 = lean_usize_of_nat(x_17);
+lean_dec(x_17);
+x_64 = l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Tactic_evalOpen___spec__3___closed__14;
+x_65 = l_Array_foldlMUnsafe_fold___at_Lean_Syntax_SepArray_getElems___spec__1(x_16, x_62, x_63, x_64);
+lean_dec(x_16);
+x_66 = lean_ctor_get(x_65, 1);
+lean_inc(x_66);
+lean_dec(x_65);
+x_20 = x_66;
+goto block_58;
+}
+}
+block_58:
+{
+lean_object* x_21; lean_object* x_22; 
+x_21 = l_Lean_Elab_Tactic_evalCase_x27___closed__3;
+x_22 = l_Array_sequenceMap___at_Lean_Elab_Tactic_evalCase___spec__1(x_20, x_21);
+lean_dec(x_20);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_object* x_23; 
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_23 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_23;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; size_t x_26; size_t x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
+x_24 = lean_ctor_get(x_22, 0);
+lean_inc(x_24);
+lean_dec(x_22);
+x_25 = lean_array_get_size(x_24);
+x_26 = lean_usize_of_nat(x_25);
+lean_dec(x_25);
+x_27 = 0;
+lean_inc(x_24);
+x_28 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__3(x_26, x_27, x_24);
+x_29 = l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCase___spec__4(x_26, x_27, x_24);
+x_30 = lean_unsigned_to_nat(2u);
+x_31 = l_Lean_Syntax_getArg(x_1, x_30);
+x_32 = lean_unsigned_to_nat(3u);
+x_33 = l_Lean_Syntax_getArg(x_1, x_32);
+lean_dec(x_1);
+x_34 = l_Std_Range_forIn_loop___at_Lean_Elab_Tactic_addCheckpoints___spec__1___closed__4;
+lean_inc(x_33);
+x_35 = l_Lean_Syntax_isOfKind(x_33, x_34);
+if (x_35 == 0)
+{
+lean_object* x_36; 
+lean_dec(x_33);
+lean_dec(x_31);
+lean_dec(x_29);
+lean_dec(x_28);
+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_3);
+lean_dec(x_2);
+x_36 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalExact___spec__1___rarg(x_10);
+return x_36;
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; size_t x_43; lean_object* x_44; 
+x_37 = lean_box(0);
+x_38 = lean_array_get_size(x_28);
+x_39 = l_Array_toSubarray___rarg(x_28, x_18, x_38);
+x_40 = l_Lean_Elab_Tactic_addCheckpoints___lambda__1___closed__1;
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_39);
+lean_ctor_set(x_41, 1, x_40);
+x_42 = lean_array_get_size(x_29);
+x_43 = lean_usize_of_nat(x_42);
+lean_dec(x_42);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+x_44 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(x_31, x_33, x_37, x_29, x_43, x_27, x_41, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_29);
+if (lean_obj_tag(x_44) == 0)
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = lean_ctor_get(x_45, 1);
+lean_inc(x_47);
+lean_dec(x_45);
+x_48 = l_Lean_Elab_Tactic_getGoals___rarg(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_46);
+x_49 = lean_ctor_get(x_48, 0);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_48, 1);
+lean_inc(x_50);
+lean_dec(x_48);
+x_51 = lean_array_to_list(lean_box(0), x_47);
+x_52 = l_List_appendTR___rarg(x_51, x_49);
+x_53 = l_Lean_Elab_Tactic_setGoals(x_52, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_50);
+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_3);
+lean_dec(x_2);
+return x_53;
+}
+else
+{
+uint8_t x_54; 
+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_3);
+lean_dec(x_2);
+x_54 = !lean_is_exclusive(x_44);
+if (x_54 == 0)
+{
+return x_44;
+}
+else
+{
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_44, 0);
+x_56 = lean_ctor_get(x_44, 1);
+lean_inc(x_56);
+lean_inc(x_55);
+lean_dec(x_44);
+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_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___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) {
+_start:
+{
+lean_object* x_15; 
+x_15 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___lambda__1(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, 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_7);
+lean_dec(x_6);
+lean_dec(x_5);
+return x_15;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14, lean_object* x_15, lean_object* x_16) {
+_start:
+{
+size_t x_17; size_t x_18; lean_object* x_19; 
+x_17 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_18 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_19 = l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase_x27___spec__1(x_1, x_2, x_3, x_4, x_17, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+lean_dec(x_4);
+return x_19;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("evalCase'", 9);
+return x_1;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__3;
 x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
@@ -27126,25 +28304,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed_
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("evalCase'", 9);
-return x_1;
-}
-}
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__3;
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__3;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
-}
-}
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalCase_x27___boxed), 10, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalCase_x27), 10, 0);
 return x_1;
 }
 }
@@ -27153,9 +28313,9 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_2 = l___regBuiltin_Lean_Elab_Tactic_evalWithAnnotateState___closed__6;
-x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2;
-x_4 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4;
-x_5 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5;
+x_3 = l_Lean_Elab_Tactic_evalCase_x27___closed__2;
+x_4 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2;
+x_5 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__3;
 x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
 return x_6;
 }
@@ -27164,7 +28324,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(373u);
+x_1 = lean_unsigned_to_nat(365u);
 x_2 = lean_unsigned_to_nat(25u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27176,8 +28336,8 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(392u);
-x_2 = lean_unsigned_to_nat(35u);
+x_1 = lean_unsigned_to_nat(380u);
+x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -27191,7 +28351,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_obj
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__1;
 x_2 = lean_unsigned_to_nat(25u);
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__2;
-x_4 = lean_unsigned_to_nat(35u);
+x_4 = lean_unsigned_to_nat(31u);
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -27204,7 +28364,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(373u);
+x_1 = lean_unsigned_to_nat(365u);
 x_2 = lean_unsigned_to_nat(29u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27216,7 +28376,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(373u);
+x_1 = lean_unsigned_to_nat(365u);
 x_2 = lean_unsigned_to_nat(38u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27256,7 +28416,7 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange(
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4;
+x_2 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2;
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27_declRange___closed__7;
 x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
@@ -27458,7 +28618,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessible
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(395u);
+x_1 = lean_unsigned_to_nat(382u);
 x_2 = lean_unsigned_to_nat(27u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27470,7 +28630,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessible
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(397u);
+x_1 = lean_unsigned_to_nat(384u);
 x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27498,7 +28658,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessible
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(395u);
+x_1 = lean_unsigned_to_nat(382u);
 x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27510,7 +28670,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalRenameInaccessible
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(395u);
+x_1 = lean_unsigned_to_nat(382u);
 x_2 = lean_unsigned_to_nat(54u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27905,7 +29065,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(399u);
+x_1 = lean_unsigned_to_nat(386u);
 x_2 = lean_unsigned_to_nat(33u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27917,7 +29077,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(408u);
+x_1 = lean_unsigned_to_nat(395u);
 x_2 = lean_unsigned_to_nat(48u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27945,7 +29105,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(399u);
+x_1 = lean_unsigned_to_nat(386u);
 x_2 = lean_unsigned_to_nat(37u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -27957,7 +29117,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFirst_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(399u);
+x_1 = lean_unsigned_to_nat(386u);
 x_2 = lean_unsigned_to_nat(46u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28256,7 +29416,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFail_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(410u);
+x_1 = lean_unsigned_to_nat(397u);
 x_2 = lean_unsigned_to_nat(24u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28268,7 +29428,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFail_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(416u);
+x_1 = lean_unsigned_to_nat(403u);
 x_2 = lean_unsigned_to_nat(31u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28296,7 +29456,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFail_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(410u);
+x_1 = lean_unsigned_to_nat(397u);
 x_2 = lean_unsigned_to_nat(28u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28308,7 +29468,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalFail_declRange___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(410u);
+x_1 = lean_unsigned_to_nat(397u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28494,7 +29654,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(418u);
+x_1 = lean_unsigned_to_nat(405u);
 x_2 = lean_unsigned_to_nat(26u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28506,7 +29666,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(421u);
+x_1 = lean_unsigned_to_nat(408u);
 x_2 = lean_unsigned_to_nat(29u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28534,7 +29694,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(418u);
+x_1 = lean_unsigned_to_nat(405u);
 x_2 = lean_unsigned_to_nat(30u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28546,7 +29706,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalDbgTrace_declRange
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(418u);
+x_1 = lean_unsigned_to_nat(405u);
 x_2 = lean_unsigned_to_nat(42u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28717,7 +29877,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalSleep_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(423u);
+x_1 = lean_unsigned_to_nat(410u);
 x_2 = lean_unsigned_to_nat(23u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28729,7 +29889,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalSleep_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(426u);
+x_1 = lean_unsigned_to_nat(413u);
 x_2 = lean_unsigned_to_nat(35u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28757,7 +29917,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalSleep_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(423u);
+x_1 = lean_unsigned_to_nat(410u);
 x_2 = lean_unsigned_to_nat(27u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -28769,7 +29929,7 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalSleep_declRange___
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(423u);
+x_1 = lean_unsigned_to_nat(410u);
 x_2 = lean_unsigned_to_nat(36u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -30056,20 +31216,18 @@ l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___cl
 lean_mark_persistent(l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___closed__1);
 l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___closed__2 = _init_l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___closed__2();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_BuiltinTactic_0__Lean_Elab_Tactic_getCaseGoals___closed__2);
-l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1 = _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1();
-lean_mark_persistent(l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalCase___spec__3___closed__1);
+l_Lean_Elab_Tactic_evalCase___lambda__1___closed__1 = _init_l_Lean_Elab_Tactic_evalCase___lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalCase___lambda__1___closed__1);
 l_Lean_Elab_Tactic_evalCase___closed__1 = _init_l_Lean_Elab_Tactic_evalCase___closed__1();
 lean_mark_persistent(l_Lean_Elab_Tactic_evalCase___closed__1);
+l_Lean_Elab_Tactic_evalCase___closed__2 = _init_l_Lean_Elab_Tactic_evalCase___closed__2();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalCase___closed__2);
 l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1);
 l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__2);
 l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__3);
-l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4();
-lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__4);
-l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5();
-lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__5);
 res = l___regBuiltin_Lean_Elab_Tactic_evalCase(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
@@ -30090,16 +31248,18 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange___closed
 res = l___regBuiltin_Lean_Elab_Tactic_evalCase_declRange(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Elab_Tactic_evalCase_x27___closed__1 = _init_l_Lean_Elab_Tactic_evalCase_x27___closed__1();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalCase_x27___closed__1);
+l_Lean_Elab_Tactic_evalCase_x27___closed__2 = _init_l_Lean_Elab_Tactic_evalCase_x27___closed__2();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalCase_x27___closed__2);
+l_Lean_Elab_Tactic_evalCase_x27___closed__3 = _init_l_Lean_Elab_Tactic_evalCase_x27___closed__3();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalCase_x27___closed__3);
 l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__1);
 l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__2);
 l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__3 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__3();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__3);
-l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4();
-lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__4);
-l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5 = _init_l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5();
-lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalCase_x27___closed__5);
 res = l___regBuiltin_Lean_Elab_Tactic_evalCase_x27(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Injection.c b/stage0/stdlib/Lean/Elab/Tactic/Injection.c
index ba72f4d18d..ae1dd2324e 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Injection.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Injection.c
@@ -25,16 +25,17 @@ lean_object* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l_Lean_Elab_Tactic_withMainContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__2;
 static lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__2;
+static lean_object* l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__6;
-lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__1;
+static lean_object* l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__7;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__3;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_getInjectionNewIds(lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__5;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__6;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__10;
@@ -42,34 +43,31 @@ static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__14;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__4;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4;
-static lean_object* l_Lean_Elab_Tactic_evalInjections___rarg___closed__1;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2;
 lean_object* l_Lean_addBuiltinDeclarationRanges(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getNameOfIdent_x27(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__5;
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getMainGoal(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_evalInjection___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__12;
+static lean_object* l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjection___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3;
 lean_object* l_List_mapTRAux___at_Lean_Meta_substCore___spec__6(lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__4;
-static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__7;
 extern lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
-static lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__7;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1;
 lean_object* l_Lean_Meta_throwTacticEx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjection(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___rarg(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_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_elabAsFVar(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___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__9;
 uint8_t l_Lean_Syntax_isNone(lean_object*);
-static lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__4;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__8;
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjection___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -79,13 +77,14 @@ lean_object* l_Lean_Elab_Tactic_replaceMainGoal(lean_object*, lean_object*, lean
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__1;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__3;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__11;
 lean_object* l_Lean_Meta_injection(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_List_isEmpty___rarg(lean_object*);
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__3;
 static lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__5;
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___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___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange(lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_getInjectionNewIds___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_getInjectionNewIds___spec__1(lean_object* x_1, lean_object* x_2) {
@@ -169,25 +168,24 @@ static lean_object* _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Ta
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("injection", 9);
+x_1 = lean_mk_string_from_bytes("too many identifiers provided, unused: ", 39);
 return x_1;
 }
 }
 static lean_object* _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__1;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__1;
+x_2 = l_Lean_stringToMessageData(x_1);
+return x_2;
 }
 }
 static lean_object* _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__3() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("too many identifiers provided, unused: ", 39);
+x_1 = lean_mk_string_from_bytes("", 0);
 return x_1;
 }
 }
@@ -200,50 +198,33 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5() {
+LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(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_1; 
-x_1 = lean_mk_string_from_bytes("", 0);
-return x_1;
-}
-}
-static lean_object* _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6() {
-_start:
+uint8_t x_9; 
+x_9 = l_List_isEmpty___rarg(x_3);
+if (x_9 == 0)
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
-_start:
-{
-uint8_t x_8; 
-x_8 = l_List_isEmpty___rarg(x_2);
-if (x_8 == 0)
-{
-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_object* x_17; 
-x_9 = lean_box(0);
-x_10 = l_List_mapTRAux___at_Lean_Meta_substCore___spec__6(x_2, x_9);
-x_11 = l_Lean_MessageData_ofList(x_10);
-lean_dec(x_10);
-x_12 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__4;
-x_13 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_11);
-x_14 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6;
-x_15 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_15, 0, x_13);
-lean_ctor_set(x_15, 1, x_14);
-x_16 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__2;
-x_17 = l_Lean_Meta_throwTacticEx___rarg(x_16, x_1, x_15, x_3, x_4, x_5, x_6, x_7);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_10 = lean_box(0);
+x_11 = l_List_mapTRAux___at_Lean_Meta_substCore___spec__6(x_3, x_10);
+x_12 = l_Lean_MessageData_ofList(x_11);
+lean_dec(x_11);
+x_13 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__2;
+x_14 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_12);
+x_15 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__4;
+x_16 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+x_17 = l_Lean_Meta_throwTacticEx___rarg(x_1, x_2, x_16, x_4, x_5, x_6, x_7, x_8);
 return x_17;
 }
 else
 {
 lean_object* x_18; lean_object* x_19; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -253,11 +234,29 @@ lean_dec(x_1);
 x_18 = lean_box(0);
 x_19 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_7);
+lean_ctor_set(x_19, 1, x_8);
 return x_19;
 }
 }
 }
+static lean_object* _init_l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("injection", 9);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjection___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
@@ -293,75 +292,76 @@ x_16 = lean_ctor_get(x_15, 0);
 lean_inc(x_16);
 if (lean_obj_tag(x_16) == 0)
 {
-lean_object* x_17; lean_object* x_18; 
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
 x_17 = lean_ctor_get(x_15, 1);
 lean_inc(x_17);
 lean_dec(x_15);
+x_18 = l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_18 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_13, x_2, x_7, x_8, x_9, x_10, x_17);
-if (lean_obj_tag(x_18) == 0)
+x_19 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_18, x_13, x_2, x_7, x_8, x_9, x_10, x_17);
+if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_18, 1);
-lean_inc(x_19);
-lean_dec(x_18);
-x_20 = lean_box(0);
-x_21 = l_Lean_Elab_Tactic_replaceMainGoal(x_20, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_19);
-if (lean_obj_tag(x_21) == 0)
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_19, 1);
+lean_inc(x_20);
+lean_dec(x_19);
+x_21 = lean_box(0);
+x_22 = l_Lean_Elab_Tactic_replaceMainGoal(x_21, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_20);
+if (lean_obj_tag(x_22) == 0)
 {
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_21);
-if (x_22 == 0)
+uint8_t x_23; 
+x_23 = !lean_is_exclusive(x_22);
+if (x_23 == 0)
 {
-lean_object* x_23; lean_object* x_24; 
-x_23 = lean_ctor_get(x_21, 0);
-lean_dec(x_23);
-x_24 = lean_box(0);
-lean_ctor_set(x_21, 0, x_24);
-return x_21;
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_ctor_get(x_22, 0);
+lean_dec(x_24);
+x_25 = lean_box(0);
+lean_ctor_set(x_22, 0, x_25);
+return x_22;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_21, 1);
-lean_inc(x_25);
-lean_dec(x_21);
-x_26 = lean_box(0);
-x_27 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_25);
-return x_27;
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_22, 1);
+lean_inc(x_26);
+lean_dec(x_22);
+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_28; 
-x_28 = !lean_is_exclusive(x_21);
-if (x_28 == 0)
+uint8_t x_29; 
+x_29 = !lean_is_exclusive(x_22);
+if (x_29 == 0)
 {
-return x_21;
+return x_22;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_21, 0);
-x_30 = lean_ctor_get(x_21, 1);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_22, 0);
+x_31 = lean_ctor_get(x_22, 1);
+lean_inc(x_31);
 lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_21);
-x_31 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-return x_31;
+lean_dec(x_22);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+return x_32;
 }
 }
 }
 else
 {
-uint8_t x_32; 
+uint8_t x_33; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -370,107 +370,108 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_32 = !lean_is_exclusive(x_18);
-if (x_32 == 0)
+x_33 = !lean_is_exclusive(x_19);
+if (x_33 == 0)
 {
-return x_18;
+return x_19;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_ctor_get(x_18, 0);
-x_34 = lean_ctor_get(x_18, 1);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_19, 0);
+x_35 = lean_ctor_get(x_19, 1);
+lean_inc(x_35);
 lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_18);
-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;
+lean_dec(x_19);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
 }
 }
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
 lean_dec(x_2);
-x_36 = lean_ctor_get(x_15, 1);
-lean_inc(x_36);
-lean_dec(x_15);
-x_37 = lean_ctor_get(x_16, 0);
+x_37 = lean_ctor_get(x_15, 1);
 lean_inc(x_37);
-x_38 = lean_ctor_get(x_16, 2);
+lean_dec(x_15);
+x_38 = lean_ctor_get(x_16, 0);
 lean_inc(x_38);
+x_39 = lean_ctor_get(x_16, 2);
+lean_inc(x_39);
 lean_dec(x_16);
+x_40 = l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2;
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_39 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_13, x_38, x_7, x_8, x_9, x_10, x_36);
-if (lean_obj_tag(x_39) == 0)
+x_41 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_40, x_13, x_39, x_7, x_8, x_9, x_10, x_37);
+if (lean_obj_tag(x_41) == 0)
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_40 = lean_ctor_get(x_39, 1);
-lean_inc(x_40);
-lean_dec(x_39);
-x_41 = lean_box(0);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_37);
-lean_ctor_set(x_42, 1, x_41);
-x_43 = l_Lean_Elab_Tactic_replaceMainGoal(x_42, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_40);
-if (lean_obj_tag(x_43) == 0)
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+lean_dec(x_41);
+x_43 = lean_box(0);
+x_44 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_44, 0, x_38);
+lean_ctor_set(x_44, 1, x_43);
+x_45 = l_Lean_Elab_Tactic_replaceMainGoal(x_44, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
+if (lean_obj_tag(x_45) == 0)
 {
-uint8_t x_44; 
-x_44 = !lean_is_exclusive(x_43);
-if (x_44 == 0)
+uint8_t x_46; 
+x_46 = !lean_is_exclusive(x_45);
+if (x_46 == 0)
 {
-lean_object* x_45; lean_object* x_46; 
-x_45 = lean_ctor_get(x_43, 0);
-lean_dec(x_45);
-x_46 = lean_box(0);
-lean_ctor_set(x_43, 0, x_46);
-return x_43;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_47 = lean_ctor_get(x_43, 1);
-lean_inc(x_47);
-lean_dec(x_43);
+lean_object* x_47; lean_object* x_48; 
+x_47 = lean_ctor_get(x_45, 0);
+lean_dec(x_47);
 x_48 = lean_box(0);
-x_49 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_47);
-return x_49;
+lean_ctor_set(x_45, 0, x_48);
+return x_45;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_45, 1);
+lean_inc(x_49);
+lean_dec(x_45);
+x_50 = lean_box(0);
+x_51 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_51, 0, x_50);
+lean_ctor_set(x_51, 1, x_49);
+return x_51;
 }
 }
 else
 {
-uint8_t x_50; 
-x_50 = !lean_is_exclusive(x_43);
-if (x_50 == 0)
+uint8_t x_52; 
+x_52 = !lean_is_exclusive(x_45);
+if (x_52 == 0)
 {
-return x_43;
+return x_45;
 }
 else
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_51 = lean_ctor_get(x_43, 0);
-x_52 = lean_ctor_get(x_43, 1);
-lean_inc(x_52);
-lean_inc(x_51);
-lean_dec(x_43);
-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;
+lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_53 = lean_ctor_get(x_45, 0);
+x_54 = lean_ctor_get(x_45, 1);
+lean_inc(x_54);
+lean_inc(x_53);
+lean_dec(x_45);
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_53);
+lean_ctor_set(x_55, 1, x_54);
+return x_55;
 }
 }
 }
 else
 {
-uint8_t x_54; 
-lean_dec(x_37);
+uint8_t x_56; 
+lean_dec(x_38);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -479,30 +480,30 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_54 = !lean_is_exclusive(x_39);
-if (x_54 == 0)
+x_56 = !lean_is_exclusive(x_41);
+if (x_56 == 0)
 {
-return x_39;
+return x_41;
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_39, 0);
-x_56 = lean_ctor_get(x_39, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_39);
-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_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_41, 0);
+x_58 = lean_ctor_get(x_41, 1);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_dec(x_41);
+x_59 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+return x_59;
 }
 }
 }
 }
 else
 {
-uint8_t x_58; 
+uint8_t x_60; 
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -513,29 +514,29 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_58 = !lean_is_exclusive(x_15);
-if (x_58 == 0)
+x_60 = !lean_is_exclusive(x_15);
+if (x_60 == 0)
 {
 return x_15;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_15, 0);
-x_60 = lean_ctor_get(x_15, 1);
-lean_inc(x_60);
-lean_inc(x_59);
+lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_61 = lean_ctor_get(x_15, 0);
+x_62 = lean_ctor_get(x_15, 1);
+lean_inc(x_62);
+lean_inc(x_61);
 lean_dec(x_15);
-x_61 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_61, 0, x_59);
-lean_ctor_set(x_61, 1, x_60);
-return x_61;
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+return x_63;
 }
 }
 }
 else
 {
-uint8_t x_62; 
+uint8_t x_64; 
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -546,23 +547,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_62 = !lean_is_exclusive(x_12);
-if (x_62 == 0)
+x_64 = !lean_is_exclusive(x_12);
+if (x_64 == 0)
 {
 return x_12;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_63 = lean_ctor_get(x_12, 0);
-x_64 = lean_ctor_get(x_12, 1);
-lean_inc(x_64);
-lean_inc(x_63);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_12, 0);
+x_66 = lean_ctor_get(x_12, 1);
+lean_inc(x_66);
+lean_inc(x_65);
 lean_dec(x_12);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_64);
-return x_65;
+x_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;
 }
 }
 }
@@ -700,7 +701,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__6;
-x_2 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__1;
+x_2 = l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -796,7 +797,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_unsigned_to_nat(28u);
-x_2 = lean_unsigned_to_nat(107u);
+x_2 = lean_unsigned_to_nat(98u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -810,7 +811,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_obj
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__1;
 x_2 = lean_unsigned_to_nat(29u);
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___closed__2;
-x_4 = lean_unsigned_to_nat(107u);
+x_4 = lean_unsigned_to_nat(98u);
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -881,257 +882,7 @@ x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-lean_inc(x_2);
-lean_inc(x_1);
-x_10 = l_Lean_Elab_Tactic_getMainGoal(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-if (lean_obj_tag(x_10) == 0)
-{
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = lean_unsigned_to_nat(5u);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-x_14 = l_Lean_Meta_injections(x_11, x_13, x_5, x_6, x_7, x_8, x_12);
-if (lean_obj_tag(x_14) == 0)
-{
-lean_object* x_15; 
-x_15 = lean_ctor_get(x_14, 0);
-lean_inc(x_15);
-if (lean_obj_tag(x_15) == 0)
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_14, 1);
-lean_inc(x_16);
-lean_dec(x_14);
-x_17 = lean_box(0);
-x_18 = l_Lean_Elab_Tactic_replaceMainGoal(x_17, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
-if (lean_obj_tag(x_18) == 0)
-{
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_18);
-if (x_19 == 0)
-{
-lean_object* x_20; lean_object* x_21; 
-x_20 = lean_ctor_get(x_18, 0);
-lean_dec(x_20);
-x_21 = lean_box(0);
-lean_ctor_set(x_18, 0, x_21);
-return x_18;
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_22 = lean_ctor_get(x_18, 1);
-lean_inc(x_22);
-lean_dec(x_18);
-x_23 = lean_box(0);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_22);
-return x_24;
-}
-}
-else
-{
-uint8_t x_25; 
-x_25 = !lean_is_exclusive(x_18);
-if (x_25 == 0)
-{
-return x_18;
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_18, 0);
-x_27 = lean_ctor_get(x_18, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_18);
-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;
-}
-}
-}
-else
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_29 = lean_ctor_get(x_14, 1);
-lean_inc(x_29);
-lean_dec(x_14);
-x_30 = lean_ctor_get(x_15, 0);
-lean_inc(x_30);
-lean_dec(x_15);
-x_31 = lean_box(0);
-x_32 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_32, 0, x_30);
-lean_ctor_set(x_32, 1, x_31);
-x_33 = l_Lean_Elab_Tactic_replaceMainGoal(x_32, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_29);
-if (lean_obj_tag(x_33) == 0)
-{
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_ctor_get(x_33, 0);
-lean_dec(x_35);
-x_36 = lean_box(0);
-lean_ctor_set(x_33, 0, x_36);
-return x_33;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_33, 1);
-lean_inc(x_37);
-lean_dec(x_33);
-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_37);
-return x_39;
-}
-}
-else
-{
-uint8_t x_40; 
-x_40 = !lean_is_exclusive(x_33);
-if (x_40 == 0)
-{
-return x_33;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_33, 0);
-x_42 = lean_ctor_get(x_33, 1);
-lean_inc(x_42);
-lean_inc(x_41);
-lean_dec(x_33);
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_41);
-lean_ctor_set(x_43, 1, x_42);
-return x_43;
-}
-}
-}
-}
-else
-{
-uint8_t x_44; 
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_44 = !lean_is_exclusive(x_14);
-if (x_44 == 0)
-{
-return x_14;
-}
-else
-{
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_14, 0);
-x_46 = lean_ctor_get(x_14, 1);
-lean_inc(x_46);
-lean_inc(x_45);
-lean_dec(x_14);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_46);
-return x_47;
-}
-}
-}
-else
-{
-uint8_t x_48; 
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_48 = !lean_is_exclusive(x_10);
-if (x_48 == 0)
-{
-return x_10;
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_10, 0);
-x_50 = lean_ctor_get(x_10, 1);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_10);
-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;
-}
-}
-}
-}
-static lean_object* _init_l_Lean_Elab_Tactic_evalInjections___rarg___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalInjections___rarg___lambda__1), 9, 0);
-return x_1;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = l_Lean_Elab_Tactic_evalInjections___rarg___closed__1;
-x_11 = l_Lean_Elab_Tactic_withMainContext___rarg(x_10, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_11;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalInjections___rarg), 9, 0);
-return x_2;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___boxed(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = l_Lean_Elab_Tactic_evalInjections(x_1);
-lean_dec(x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1() {
+static lean_object* _init_l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1139,17 +890,367 @@ x_1 = lean_mk_string_from_bytes("injections", 10);
 return x_1;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2() {
+static lean_object* _init_l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__6;
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1;
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3() {
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; 
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+x_12 = l_Lean_Elab_Tactic_getMainGoal(x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+if (lean_obj_tag(x_12) == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = lean_unsigned_to_nat(5u);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_1);
+lean_inc(x_13);
+x_16 = l_Lean_Meta_injections(x_13, x_1, x_15, x_7, x_8, x_9, x_10, x_14);
+if (lean_obj_tag(x_16) == 0)
+{
+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; 
+x_18 = lean_ctor_get(x_16, 1);
+lean_inc(x_18);
+lean_dec(x_16);
+x_19 = l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2;
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_20 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_19, x_13, x_1, x_7, x_8, x_9, x_10, x_18);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; 
+x_21 = lean_ctor_get(x_20, 1);
+lean_inc(x_21);
+lean_dec(x_20);
+x_22 = l_Lean_Elab_Tactic_replaceMainGoal(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_21);
+if (lean_obj_tag(x_22) == 0)
+{
+uint8_t x_23; 
+x_23 = !lean_is_exclusive(x_22);
+if (x_23 == 0)
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_ctor_get(x_22, 0);
+lean_dec(x_24);
+x_25 = lean_box(0);
+lean_ctor_set(x_22, 0, x_25);
+return x_22;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_22, 1);
+lean_inc(x_26);
+lean_dec(x_22);
+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_22);
+if (x_29 == 0)
+{
+return x_22;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_22, 0);
+x_31 = lean_ctor_get(x_22, 1);
+lean_inc(x_31);
+lean_inc(x_30);
+lean_dec(x_22);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+return x_32;
+}
+}
+}
+else
+{
+uint8_t x_33; 
+lean_dec(x_10);
+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_3);
+lean_dec(x_2);
+x_33 = !lean_is_exclusive(x_20);
+if (x_33 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_20, 0);
+x_35 = lean_ctor_get(x_20, 1);
+lean_inc(x_35);
+lean_inc(x_34);
+lean_dec(x_20);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
+}
+}
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+lean_dec(x_1);
+x_37 = lean_ctor_get(x_16, 1);
+lean_inc(x_37);
+lean_dec(x_16);
+x_38 = lean_ctor_get(x_17, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_17, 1);
+lean_inc(x_39);
+lean_dec(x_17);
+x_40 = l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2;
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_41 = l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds(x_40, x_13, x_39, x_7, x_8, x_9, x_10, x_37);
+if (lean_obj_tag(x_41) == 0)
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+lean_dec(x_41);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_38);
+lean_ctor_set(x_43, 1, x_2);
+x_44 = l_Lean_Elab_Tactic_replaceMainGoal(x_43, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
+if (lean_obj_tag(x_44) == 0)
+{
+uint8_t x_45; 
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_ctor_get(x_44, 0);
+lean_dec(x_46);
+x_47 = lean_box(0);
+lean_ctor_set(x_44, 0, x_47);
+return x_44;
+}
+else
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_48 = lean_ctor_get(x_44, 1);
+lean_inc(x_48);
+lean_dec(x_44);
+x_49 = lean_box(0);
+x_50 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_50, 0, x_49);
+lean_ctor_set(x_50, 1, x_48);
+return x_50;
+}
+}
+else
+{
+uint8_t x_51; 
+x_51 = !lean_is_exclusive(x_44);
+if (x_51 == 0)
+{
+return x_44;
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_44, 0);
+x_53 = lean_ctor_get(x_44, 1);
+lean_inc(x_53);
+lean_inc(x_52);
+lean_dec(x_44);
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_52);
+lean_ctor_set(x_54, 1, x_53);
+return x_54;
+}
+}
+}
+else
+{
+uint8_t x_55; 
+lean_dec(x_38);
+lean_dec(x_10);
+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_3);
+lean_dec(x_2);
+x_55 = !lean_is_exclusive(x_41);
+if (x_55 == 0)
+{
+return x_41;
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_41, 0);
+x_57 = lean_ctor_get(x_41, 1);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_41);
+x_58 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_58, 0, x_56);
+lean_ctor_set(x_58, 1, x_57);
+return x_58;
+}
+}
+}
+}
+else
+{
+uint8_t x_59; 
+lean_dec(x_13);
+lean_dec(x_10);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_59 = !lean_is_exclusive(x_16);
+if (x_59 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_16, 0);
+x_61 = lean_ctor_get(x_16, 1);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_dec(x_16);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_60);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
+}
+}
+}
+else
+{
+uint8_t x_63; 
+lean_dec(x_10);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_63 = !lean_is_exclusive(x_12);
+if (x_63 == 0)
+{
+return x_12;
+}
+else
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_12, 0);
+x_65 = lean_ctor_get(x_12, 1);
+lean_inc(x_65);
+lean_inc(x_64);
+lean_dec(x_12);
+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_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = l_Lean_Syntax_getArg(x_1, x_11);
+x_13 = l_Lean_Syntax_getArgs(x_12);
+lean_dec(x_12);
+x_14 = lean_array_to_list(lean_box(0), x_13);
+x_15 = lean_box(0);
+x_16 = l_List_mapTRAux___at___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_getInjectionNewIds___spec__1(x_14, x_15);
+x_17 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalInjections___lambda__1), 11, 2);
+lean_closure_set(x_17, 0, x_16);
+lean_closure_set(x_17, 1, x_15);
+x_18 = l_Lean_Elab_Tactic_withMainContext___rarg(x_17, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+return x_18;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Elab_Tactic_evalInjections___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l_Lean_Elab_Tactic_evalInjections(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_1);
+return x_11;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__6;
+x_2 = l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -1157,21 +1258,21 @@ x_1 = lean_mk_string_from_bytes("evalInjections", 14);
 return x_1;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4() {
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__10;
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3;
+x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5() {
+static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalInjections___boxed), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalInjections___boxed), 10, 0);
 return x_1;
 }
 }
@@ -1180,9 +1281,9 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__13;
-x_3 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2;
-x_4 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4;
-x_5 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5;
+x_3 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1;
+x_4 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3;
+x_5 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4;
 x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_5, x_1);
 return x_6;
 }
@@ -1202,8 +1303,8 @@ static lean_object* _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRan
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_unsigned_to_nat(34u);
-x_2 = lean_unsigned_to_nat(36u);
+x_1 = lean_unsigned_to_nat(35u);
+x_2 = lean_unsigned_to_nat(97u);
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -1217,7 +1318,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_obj
 x_1 = l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__1;
 x_2 = lean_unsigned_to_nat(30u);
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__2;
-x_4 = lean_unsigned_to_nat(36u);
+x_4 = lean_unsigned_to_nat(97u);
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -1282,7 +1383,7 @@ LEAN_EXPORT lean_object* l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRang
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4;
+x_2 = l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3;
 x_3 = l___regBuiltin_Lean_Elab_Tactic_evalInjections_declRange___closed__7;
 x_4 = l_Lean_addBuiltinDeclarationRanges(x_2, x_3, x_1);
 return x_4;
@@ -1313,10 +1414,10 @@ l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___clos
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__3);
 l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__4 = _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__4();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__4);
-l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5 = _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5();
-lean_mark_persistent(l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__5);
-l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6 = _init_l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6();
-lean_mark_persistent(l___private_Lean_Elab_Tactic_Injection_0__Lean_Elab_Tactic_checkUnusedIds___closed__6);
+l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1 = _init_l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__1);
+l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2 = _init_l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalInjection___lambda__1___closed__2);
 l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__1 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__1);
 l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__2 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjection___closed__2();
@@ -1365,8 +1466,10 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange___c
 res = l___regBuiltin_Lean_Elab_Tactic_evalInjection_declRange(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Tactic_evalInjections___rarg___closed__1 = _init_l_Lean_Elab_Tactic_evalInjections___rarg___closed__1();
-lean_mark_persistent(l_Lean_Elab_Tactic_evalInjections___rarg___closed__1);
+l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1 = _init_l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__1);
+l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2 = _init_l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalInjections___lambda__1___closed__2);
 l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__1);
 l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__2();
@@ -1375,8 +1478,6 @@ l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3 = _init_l___regBuilti
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__3);
 l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__4);
-l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5 = _init_l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5();
-lean_mark_persistent(l___regBuiltin_Lean_Elab_Tactic_evalInjections___closed__5);
 res = l___regBuiltin_Lean_Elab_Tactic_evalInjections(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Match.c b/stage0/stdlib/Lean/Elab/Tactic/Match.c
index 68656b77c7..b399099538 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Match.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Match.c
@@ -115,6 +115,7 @@ extern lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__20;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26;
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalMatch___spec__5___rarg(lean_object*);
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 static lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__16;
@@ -304,7 +305,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("binderIdent", 11);
+x_1 = lean_mk_string_from_bytes("caseArg", 7);
 return x_1;
 }
 }
@@ -312,7 +313,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("=>", 2);
+x_1 = lean_mk_string_from_bytes("binderIdent", 11);
 return x_1;
 }
 }
@@ -320,7 +321,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("tacticSeq", 9);
+x_1 = lean_mk_string_from_bytes("=>", 2);
 return x_1;
 }
 }
@@ -328,7 +329,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("tacticSeq1Indented", 18);
+x_1 = lean_mk_string_from_bytes("tacticSeq", 9);
 return x_1;
 }
 }
@@ -336,7 +337,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("withAnnotateState", 17);
+x_1 = lean_mk_string_from_bytes("tacticSeq1Indented", 18);
 return x_1;
 }
 }
@@ -344,7 +345,7 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("with_annotate_state", 19);
+x_1 = lean_mk_string_from_bytes("withAnnotateState", 17);
 return x_1;
 }
 }
@@ -352,29 +353,37 @@ static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tact
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("skip", 4);
+x_1 = lean_mk_string_from_bytes("with_annotate_state", 19);
 return x_1;
 }
 }
 static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__22() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("skip", 4);
+return x_1;
+}
+}
+static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__23() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
 x_1 = lean_unsigned_to_nat(3u);
 x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__23() {
+static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = lean_unsigned_to_nat(5u);
+x_1 = lean_unsigned_to_nat(4u);
 x_2 = lean_mk_empty_array_with_capacity(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24() {
+static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25() {
 _start:
 {
 lean_object* x_1; 
@@ -382,12 +391,12 @@ x_1 = lean_mk_string_from_bytes("match", 5);
 return x_1;
 }
 }
-static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25() {
+static lean_object* _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24;
+x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -459,7 +468,7 @@ uint8_t x_45;
 x_45 = !lean_is_exclusive(x_14);
 if (x_45 == 0)
 {
-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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 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; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; 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; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
 x_46 = lean_ctor_get(x_14, 0);
 x_47 = lean_nat_add(x_46, x_36);
 lean_ctor_set(x_14, 0, x_47);
@@ -529,124 +538,139 @@ x_76 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_76, 0, x_70);
 lean_ctor_set(x_76, 1, x_74);
 x_77 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__15;
+lean_inc(x_73);
+x_78 = l_Lean_Name_str___override(x_73, x_77);
+x_79 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__16;
 lean_inc(x_4);
-x_78 = l_Lean_Name_str___override(x_4, x_77);
-x_79 = lean_array_push(x_31, x_68);
+x_80 = l_Lean_Name_str___override(x_4, x_79);
+x_81 = lean_array_push(x_31, x_68);
 lean_inc(x_70);
-x_80 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_80, 0, x_70);
-lean_ctor_set(x_80, 1, x_78);
-lean_ctor_set(x_80, 2, x_79);
+x_82 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_82, 0, x_70);
+lean_ctor_set(x_82, 1, x_80);
+lean_ctor_set(x_82, 2, x_81);
 lean_inc(x_3);
 lean_inc(x_70);
-x_81 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_81, 0, x_70);
-lean_ctor_set(x_81, 1, x_34);
-lean_ctor_set(x_81, 2, x_3);
-x_82 = lean_unsigned_to_nat(2u);
-x_83 = l_Lean_Syntax_getArg(x_37, x_82);
+x_83 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_83, 0, x_70);
+lean_ctor_set(x_83, 1, x_34);
+lean_ctor_set(x_83, 2, x_3);
+x_84 = lean_array_push(x_64, x_82);
 lean_inc(x_83);
-x_84 = l_Lean_SourceInfo_fromRef(x_83);
-x_85 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__16;
-x_86 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_86, 0, x_84);
-lean_ctor_set(x_86, 1, x_85);
-x_87 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__17;
-lean_inc(x_73);
-x_88 = l_Lean_Name_str___override(x_73, x_87);
-x_89 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__18;
-lean_inc(x_73);
-x_90 = l_Lean_Name_str___override(x_73, x_89);
-x_91 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__19;
-lean_inc(x_73);
-x_92 = l_Lean_Name_str___override(x_73, x_91);
-x_93 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__20;
+x_85 = lean_array_push(x_84, x_83);
 lean_inc(x_70);
-x_94 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_94, 0, x_70);
-lean_ctor_set(x_94, 1, x_93);
-x_95 = lean_unsigned_to_nat(0u);
-x_96 = l_Lean_Syntax_getArg(x_37, x_95);
-x_97 = lean_array_push(x_64, x_96);
-x_98 = lean_array_push(x_97, x_83);
-x_99 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_99, 0, x_33);
-lean_ctor_set(x_99, 1, x_34);
-lean_ctor_set(x_99, 2, x_98);
+x_86 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_86, 0, x_70);
+lean_ctor_set(x_86, 1, x_78);
+lean_ctor_set(x_86, 2, x_85);
+x_87 = lean_array_push(x_31, x_86);
+lean_inc(x_70);
+x_88 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_88, 0, x_70);
+lean_ctor_set(x_88, 1, x_34);
+lean_ctor_set(x_88, 2, x_87);
+x_89 = lean_unsigned_to_nat(2u);
+x_90 = l_Lean_Syntax_getArg(x_37, x_89);
+lean_inc(x_90);
+x_91 = l_Lean_SourceInfo_fromRef(x_90);
+x_92 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__17;
+x_93 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+x_94 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__18;
+lean_inc(x_73);
+x_95 = l_Lean_Name_str___override(x_73, x_94);
+x_96 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__19;
+lean_inc(x_73);
+x_97 = l_Lean_Name_str___override(x_73, x_96);
+x_98 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__20;
+lean_inc(x_73);
+x_99 = l_Lean_Name_str___override(x_73, x_98);
 x_100 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__21;
-x_101 = l_Lean_Name_str___override(x_73, x_100);
 lean_inc(x_70);
-x_102 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_102, 0, x_70);
-lean_ctor_set(x_102, 1, x_100);
-x_103 = lean_array_push(x_31, x_102);
+x_101 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_101, 0, x_70);
+lean_ctor_set(x_101, 1, x_100);
+x_102 = lean_unsigned_to_nat(0u);
+x_103 = l_Lean_Syntax_getArg(x_37, x_102);
+x_104 = lean_array_push(x_64, x_103);
+x_105 = lean_array_push(x_104, x_90);
+x_106 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_106, 0, x_33);
+lean_ctor_set(x_106, 1, x_34);
+lean_ctor_set(x_106, 2, x_105);
+x_107 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__22;
+x_108 = l_Lean_Name_str___override(x_73, x_107);
 lean_inc(x_70);
-x_104 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_104, 0, x_70);
-lean_ctor_set(x_104, 1, x_101);
-lean_ctor_set(x_104, 2, x_103);
-x_105 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__22;
-x_106 = lean_array_push(x_105, x_94);
-x_107 = lean_array_push(x_106, x_99);
-x_108 = lean_array_push(x_107, x_104);
-lean_inc(x_70);
-x_109 = lean_alloc_ctor(1, 3, 0);
+x_109 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_109, 0, x_70);
-lean_ctor_set(x_109, 1, x_92);
-lean_ctor_set(x_109, 2, x_108);
-x_110 = lean_array_push(x_105, x_109);
-lean_inc(x_81);
-x_111 = lean_array_push(x_110, x_81);
+lean_ctor_set(x_109, 1, x_107);
+x_110 = lean_array_push(x_31, x_109);
+lean_inc(x_70);
+x_111 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_111, 0, x_70);
+lean_ctor_set(x_111, 1, x_108);
+lean_ctor_set(x_111, 2, x_110);
+x_112 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__23;
+x_113 = lean_array_push(x_112, x_101);
+x_114 = lean_array_push(x_113, x_106);
+x_115 = lean_array_push(x_114, x_111);
+lean_inc(x_70);
+x_116 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_116, 0, x_70);
+lean_ctor_set(x_116, 1, x_99);
+lean_ctor_set(x_116, 2, x_115);
+x_117 = lean_array_push(x_112, x_116);
+x_118 = lean_array_push(x_117, x_83);
 lean_inc(x_8);
-x_112 = lean_array_push(x_111, x_8);
+x_119 = lean_array_push(x_118, x_8);
 lean_inc(x_70);
-x_113 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_113, 0, x_70);
-lean_ctor_set(x_113, 1, x_34);
-lean_ctor_set(x_113, 2, x_112);
-x_114 = lean_array_push(x_31, x_113);
+x_120 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_120, 0, x_70);
+lean_ctor_set(x_120, 1, x_34);
+lean_ctor_set(x_120, 2, x_119);
+x_121 = lean_array_push(x_31, x_120);
 lean_inc(x_70);
-x_115 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_115, 0, x_70);
-lean_ctor_set(x_115, 1, x_90);
-lean_ctor_set(x_115, 2, x_114);
-x_116 = lean_array_push(x_31, x_115);
+x_122 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_122, 0, x_70);
+lean_ctor_set(x_122, 1, x_97);
+lean_ctor_set(x_122, 2, x_121);
+x_123 = lean_array_push(x_31, x_122);
 lean_inc(x_70);
-x_117 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_117, 0, x_70);
-lean_ctor_set(x_117, 1, x_88);
-lean_ctor_set(x_117, 2, x_116);
-x_118 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__23;
-x_119 = lean_array_push(x_118, x_76);
-x_120 = lean_array_push(x_119, x_80);
-x_121 = lean_array_push(x_120, x_81);
-x_122 = lean_array_push(x_121, x_86);
-x_123 = lean_array_push(x_122, x_117);
 x_124 = lean_alloc_ctor(1, 3, 0);
 lean_ctor_set(x_124, 0, x_70);
-lean_ctor_set(x_124, 1, x_75);
+lean_ctor_set(x_124, 1, x_95);
 lean_ctor_set(x_124, 2, x_123);
-x_125 = lean_array_push(x_29, x_124);
-x_126 = lean_unsigned_to_nat(3u);
-x_127 = l_Lean_Syntax_setArg(x_37, x_126, x_67);
-x_128 = lean_box(0);
+x_125 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24;
+x_126 = lean_array_push(x_125, x_76);
+x_127 = lean_array_push(x_126, x_88);
+x_128 = lean_array_push(x_127, x_93);
+x_129 = lean_array_push(x_128, x_124);
+x_130 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_130, 0, x_70);
+lean_ctor_set(x_130, 1, x_75);
+lean_ctor_set(x_130, 2, x_129);
+x_131 = lean_array_push(x_29, x_130);
+x_132 = lean_unsigned_to_nat(3u);
+x_133 = l_Lean_Syntax_setArg(x_37, x_132, x_67);
+x_134 = lean_box(0);
 lean_inc(x_13);
-x_129 = lean_apply_7(x_38, x_127, x_27, x_125, x_30, x_128, x_13, x_71);
-if (lean_obj_tag(x_129) == 0)
+x_135 = lean_apply_7(x_38, x_133, x_27, x_131, x_30, x_134, x_13, x_71);
+if (lean_obj_tag(x_135) == 0)
 {
-lean_object* x_130; lean_object* x_131; 
-x_130 = lean_ctor_get(x_129, 0);
-lean_inc(x_130);
-x_131 = lean_ctor_get(x_129, 1);
-lean_inc(x_131);
-lean_dec(x_129);
-x_15 = x_130;
-x_16 = x_131;
+lean_object* x_136; lean_object* x_137; 
+x_136 = lean_ctor_get(x_135, 0);
+lean_inc(x_136);
+x_137 = lean_ctor_get(x_135, 1);
+lean_inc(x_137);
+lean_dec(x_135);
+x_15 = x_136;
+x_16 = x_137;
 goto block_23;
 }
 else
 {
-uint8_t x_132; 
+uint8_t x_138; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -655,222 +679,237 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_132 = !lean_is_exclusive(x_129);
-if (x_132 == 0)
+x_138 = !lean_is_exclusive(x_135);
+if (x_138 == 0)
 {
-return x_129;
-}
-else
-{
-lean_object* x_133; lean_object* x_134; lean_object* x_135; 
-x_133 = lean_ctor_get(x_129, 0);
-x_134 = lean_ctor_get(x_129, 1);
-lean_inc(x_134);
-lean_inc(x_133);
-lean_dec(x_129);
-x_135 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_135, 0, x_133);
-lean_ctor_set(x_135, 1, x_134);
 return x_135;
 }
+else
+{
+lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_139 = lean_ctor_get(x_135, 0);
+x_140 = lean_ctor_get(x_135, 1);
+lean_inc(x_140);
+lean_inc(x_139);
+lean_dec(x_135);
+x_141 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_141, 0, x_139);
+lean_ctor_set(x_141, 1, x_140);
+return x_141;
+}
 }
 }
 else
 {
-lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; 
-x_136 = lean_ctor_get(x_14, 0);
-x_137 = lean_ctor_get(x_14, 1);
-lean_inc(x_137);
-lean_inc(x_136);
-lean_dec(x_14);
-x_138 = lean_nat_add(x_136, x_36);
-x_139 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_139, 0, x_138);
-lean_ctor_set(x_139, 1, x_137);
-x_140 = lean_ctor_get(x_13, 0);
-lean_inc(x_140);
-x_141 = lean_ctor_get(x_13, 1);
-lean_inc(x_141);
-x_142 = lean_ctor_get(x_13, 3);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_13, 4);
+lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 
+x_142 = lean_ctor_get(x_14, 0);
+x_143 = lean_ctor_get(x_14, 1);
 lean_inc(x_143);
-x_144 = lean_ctor_get(x_13, 5);
-lean_inc(x_144);
-lean_inc(x_136);
-lean_inc(x_141);
-x_145 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_145, 0, x_140);
-lean_ctor_set(x_145, 1, x_141);
-lean_ctor_set(x_145, 2, x_136);
-lean_ctor_set(x_145, 3, x_142);
-lean_ctor_set(x_145, 4, x_143);
-lean_ctor_set(x_145, 5, x_144);
-x_146 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_145, x_139);
-x_147 = lean_ctor_get(x_146, 0);
+lean_inc(x_142);
+lean_dec(x_14);
+x_144 = lean_nat_add(x_142, x_36);
+x_145 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_145, 0, x_144);
+lean_ctor_set(x_145, 1, x_143);
+x_146 = lean_ctor_get(x_13, 0);
+lean_inc(x_146);
+x_147 = lean_ctor_get(x_13, 1);
 lean_inc(x_147);
-x_148 = lean_ctor_get(x_146, 1);
+x_148 = lean_ctor_get(x_13, 3);
 lean_inc(x_148);
-lean_dec(x_146);
-x_149 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
+x_149 = lean_ctor_get(x_13, 4);
+lean_inc(x_149);
+x_150 = lean_ctor_get(x_13, 5);
+lean_inc(x_150);
+lean_inc(x_142);
 lean_inc(x_147);
-x_150 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_150, 0, x_147);
-lean_ctor_set(x_150, 1, x_149);
-x_151 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__11;
-x_152 = l_Lean_addMacroScope(x_141, x_151, x_136);
-x_153 = lean_box(0);
-x_154 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__10;
-lean_inc(x_147);
-x_155 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_155, 0, x_147);
-lean_ctor_set(x_155, 1, x_154);
-lean_ctor_set(x_155, 2, x_152);
-lean_ctor_set(x_155, 3, x_153);
-x_156 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
-x_157 = lean_array_push(x_156, x_150);
-x_158 = lean_array_push(x_157, x_155);
-x_159 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_159, 0, x_147);
-lean_ctor_set(x_159, 1, x_40);
-lean_ctor_set(x_159, 2, x_158);
-x_160 = l_Lean_Syntax_getArg(x_159, x_36);
+x_151 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_151, 0, x_146);
+lean_ctor_set(x_151, 1, x_147);
+lean_ctor_set(x_151, 2, x_142);
+lean_ctor_set(x_151, 3, x_148);
+lean_ctor_set(x_151, 4, x_149);
+lean_ctor_set(x_151, 5, x_150);
+x_152 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_151, x_145);
+x_153 = lean_ctor_get(x_152, 0);
+lean_inc(x_153);
+x_154 = lean_ctor_get(x_152, 1);
+lean_inc(x_154);
+lean_dec(x_152);
+x_155 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
+lean_inc(x_153);
+x_156 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_156, 0, x_153);
+lean_ctor_set(x_156, 1, x_155);
+x_157 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__11;
+x_158 = l_Lean_addMacroScope(x_147, x_157, x_142);
+x_159 = lean_box(0);
+x_160 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__10;
+lean_inc(x_153);
+x_161 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_161, 0, x_153);
+lean_ctor_set(x_161, 1, x_160);
+lean_ctor_set(x_161, 2, x_158);
+lean_ctor_set(x_161, 3, x_159);
+x_162 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
+x_163 = lean_array_push(x_162, x_156);
+x_164 = lean_array_push(x_163, x_161);
+x_165 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_165, 0, x_153);
+lean_ctor_set(x_165, 1, x_40);
+lean_ctor_set(x_165, 2, x_164);
+x_166 = l_Lean_Syntax_getArg(x_165, x_36);
 lean_inc(x_13);
-x_161 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_148);
-x_162 = lean_ctor_get(x_161, 0);
-lean_inc(x_162);
-x_163 = lean_ctor_get(x_161, 1);
-lean_inc(x_163);
-lean_dec(x_161);
-x_164 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__13;
+x_167 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_154);
+x_168 = lean_ctor_get(x_167, 0);
+lean_inc(x_168);
+x_169 = lean_ctor_get(x_167, 1);
+lean_inc(x_169);
+lean_dec(x_167);
+x_170 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__13;
 lean_inc(x_5);
-x_165 = l_Lean_Name_str___override(x_5, x_164);
-x_166 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__14;
-lean_inc(x_165);
-x_167 = l_Lean_Name_str___override(x_165, x_166);
-lean_inc(x_162);
-x_168 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_168, 0, x_162);
-lean_ctor_set(x_168, 1, x_166);
-x_169 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__15;
-lean_inc(x_4);
-x_170 = l_Lean_Name_str___override(x_4, x_169);
-x_171 = lean_array_push(x_31, x_160);
-lean_inc(x_162);
-x_172 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_172, 0, x_162);
-lean_ctor_set(x_172, 1, x_170);
-lean_ctor_set(x_172, 2, x_171);
-lean_inc(x_3);
-lean_inc(x_162);
-x_173 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_173, 0, x_162);
-lean_ctor_set(x_173, 1, x_34);
-lean_ctor_set(x_173, 2, x_3);
-x_174 = lean_unsigned_to_nat(2u);
-x_175 = l_Lean_Syntax_getArg(x_37, x_174);
-lean_inc(x_175);
-x_176 = l_Lean_SourceInfo_fromRef(x_175);
+x_171 = l_Lean_Name_str___override(x_5, x_170);
+x_172 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__14;
+lean_inc(x_171);
+x_173 = l_Lean_Name_str___override(x_171, x_172);
+lean_inc(x_168);
+x_174 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_174, 0, x_168);
+lean_ctor_set(x_174, 1, x_172);
+x_175 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__15;
+lean_inc(x_171);
+x_176 = l_Lean_Name_str___override(x_171, x_175);
 x_177 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__16;
-x_178 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_178, 0, x_176);
-lean_ctor_set(x_178, 1, x_177);
-x_179 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__17;
-lean_inc(x_165);
-x_180 = l_Lean_Name_str___override(x_165, x_179);
-x_181 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__18;
-lean_inc(x_165);
-x_182 = l_Lean_Name_str___override(x_165, x_181);
-x_183 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__19;
-lean_inc(x_165);
-x_184 = l_Lean_Name_str___override(x_165, x_183);
-x_185 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__20;
-lean_inc(x_162);
-x_186 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_186, 0, x_162);
-lean_ctor_set(x_186, 1, x_185);
-x_187 = lean_unsigned_to_nat(0u);
+lean_inc(x_4);
+x_178 = l_Lean_Name_str___override(x_4, x_177);
+x_179 = lean_array_push(x_31, x_166);
+lean_inc(x_168);
+x_180 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_180, 0, x_168);
+lean_ctor_set(x_180, 1, x_178);
+lean_ctor_set(x_180, 2, x_179);
+lean_inc(x_3);
+lean_inc(x_168);
+x_181 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_181, 0, x_168);
+lean_ctor_set(x_181, 1, x_34);
+lean_ctor_set(x_181, 2, x_3);
+x_182 = lean_array_push(x_162, x_180);
+lean_inc(x_181);
+x_183 = lean_array_push(x_182, x_181);
+lean_inc(x_168);
+x_184 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_184, 0, x_168);
+lean_ctor_set(x_184, 1, x_176);
+lean_ctor_set(x_184, 2, x_183);
+x_185 = lean_array_push(x_31, x_184);
+lean_inc(x_168);
+x_186 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_186, 0, x_168);
+lean_ctor_set(x_186, 1, x_34);
+lean_ctor_set(x_186, 2, x_185);
+x_187 = lean_unsigned_to_nat(2u);
 x_188 = l_Lean_Syntax_getArg(x_37, x_187);
-x_189 = lean_array_push(x_156, x_188);
-x_190 = lean_array_push(x_189, x_175);
-x_191 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_191, 0, x_33);
-lean_ctor_set(x_191, 1, x_34);
-lean_ctor_set(x_191, 2, x_190);
-x_192 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__21;
-x_193 = l_Lean_Name_str___override(x_165, x_192);
-lean_inc(x_162);
-x_194 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_194, 0, x_162);
-lean_ctor_set(x_194, 1, x_192);
-x_195 = lean_array_push(x_31, x_194);
-lean_inc(x_162);
-x_196 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_196, 0, x_162);
-lean_ctor_set(x_196, 1, x_193);
-lean_ctor_set(x_196, 2, x_195);
-x_197 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__22;
-x_198 = lean_array_push(x_197, x_186);
-x_199 = lean_array_push(x_198, x_191);
-x_200 = lean_array_push(x_199, x_196);
-lean_inc(x_162);
-x_201 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_201, 0, x_162);
-lean_ctor_set(x_201, 1, x_184);
-lean_ctor_set(x_201, 2, x_200);
-x_202 = lean_array_push(x_197, x_201);
-lean_inc(x_173);
-x_203 = lean_array_push(x_202, x_173);
-lean_inc(x_8);
-x_204 = lean_array_push(x_203, x_8);
-lean_inc(x_162);
-x_205 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_205, 0, x_162);
-lean_ctor_set(x_205, 1, x_34);
-lean_ctor_set(x_205, 2, x_204);
-x_206 = lean_array_push(x_31, x_205);
-lean_inc(x_162);
-x_207 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_207, 0, x_162);
-lean_ctor_set(x_207, 1, x_182);
-lean_ctor_set(x_207, 2, x_206);
+lean_inc(x_188);
+x_189 = l_Lean_SourceInfo_fromRef(x_188);
+x_190 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__17;
+x_191 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_191, 0, x_189);
+lean_ctor_set(x_191, 1, x_190);
+x_192 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__18;
+lean_inc(x_171);
+x_193 = l_Lean_Name_str___override(x_171, x_192);
+x_194 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__19;
+lean_inc(x_171);
+x_195 = l_Lean_Name_str___override(x_171, x_194);
+x_196 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__20;
+lean_inc(x_171);
+x_197 = l_Lean_Name_str___override(x_171, x_196);
+x_198 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__21;
+lean_inc(x_168);
+x_199 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_199, 0, x_168);
+lean_ctor_set(x_199, 1, x_198);
+x_200 = lean_unsigned_to_nat(0u);
+x_201 = l_Lean_Syntax_getArg(x_37, x_200);
+x_202 = lean_array_push(x_162, x_201);
+x_203 = lean_array_push(x_202, x_188);
+x_204 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_204, 0, x_33);
+lean_ctor_set(x_204, 1, x_34);
+lean_ctor_set(x_204, 2, x_203);
+x_205 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__22;
+x_206 = l_Lean_Name_str___override(x_171, x_205);
+lean_inc(x_168);
+x_207 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_207, 0, x_168);
+lean_ctor_set(x_207, 1, x_205);
 x_208 = lean_array_push(x_31, x_207);
-lean_inc(x_162);
+lean_inc(x_168);
 x_209 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_209, 0, x_162);
-lean_ctor_set(x_209, 1, x_180);
+lean_ctor_set(x_209, 0, x_168);
+lean_ctor_set(x_209, 1, x_206);
 lean_ctor_set(x_209, 2, x_208);
 x_210 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__23;
-x_211 = lean_array_push(x_210, x_168);
-x_212 = lean_array_push(x_211, x_172);
-x_213 = lean_array_push(x_212, x_173);
-x_214 = lean_array_push(x_213, x_178);
-x_215 = lean_array_push(x_214, x_209);
-x_216 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_216, 0, x_162);
-lean_ctor_set(x_216, 1, x_167);
-lean_ctor_set(x_216, 2, x_215);
-x_217 = lean_array_push(x_29, x_216);
-x_218 = lean_unsigned_to_nat(3u);
-x_219 = l_Lean_Syntax_setArg(x_37, x_218, x_159);
-x_220 = lean_box(0);
+x_211 = lean_array_push(x_210, x_199);
+x_212 = lean_array_push(x_211, x_204);
+x_213 = lean_array_push(x_212, x_209);
+lean_inc(x_168);
+x_214 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_214, 0, x_168);
+lean_ctor_set(x_214, 1, x_197);
+lean_ctor_set(x_214, 2, x_213);
+x_215 = lean_array_push(x_210, x_214);
+x_216 = lean_array_push(x_215, x_181);
+lean_inc(x_8);
+x_217 = lean_array_push(x_216, x_8);
+lean_inc(x_168);
+x_218 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_218, 0, x_168);
+lean_ctor_set(x_218, 1, x_34);
+lean_ctor_set(x_218, 2, x_217);
+x_219 = lean_array_push(x_31, x_218);
+lean_inc(x_168);
+x_220 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_220, 0, x_168);
+lean_ctor_set(x_220, 1, x_195);
+lean_ctor_set(x_220, 2, x_219);
+x_221 = lean_array_push(x_31, x_220);
+lean_inc(x_168);
+x_222 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_222, 0, x_168);
+lean_ctor_set(x_222, 1, x_193);
+lean_ctor_set(x_222, 2, x_221);
+x_223 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24;
+x_224 = lean_array_push(x_223, x_174);
+x_225 = lean_array_push(x_224, x_186);
+x_226 = lean_array_push(x_225, x_191);
+x_227 = lean_array_push(x_226, x_222);
+x_228 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_228, 0, x_168);
+lean_ctor_set(x_228, 1, x_173);
+lean_ctor_set(x_228, 2, x_227);
+x_229 = lean_array_push(x_29, x_228);
+x_230 = lean_unsigned_to_nat(3u);
+x_231 = l_Lean_Syntax_setArg(x_37, x_230, x_165);
+x_232 = lean_box(0);
 lean_inc(x_13);
-x_221 = lean_apply_7(x_38, x_219, x_27, x_217, x_30, x_220, x_13, x_163);
-if (lean_obj_tag(x_221) == 0)
+x_233 = lean_apply_7(x_38, x_231, x_27, x_229, x_30, x_232, x_13, x_169);
+if (lean_obj_tag(x_233) == 0)
 {
-lean_object* x_222; lean_object* x_223; 
-x_222 = lean_ctor_get(x_221, 0);
-lean_inc(x_222);
-x_223 = lean_ctor_get(x_221, 1);
-lean_inc(x_223);
-lean_dec(x_221);
-x_15 = x_222;
-x_16 = x_223;
+lean_object* x_234; lean_object* x_235; 
+x_234 = lean_ctor_get(x_233, 0);
+lean_inc(x_234);
+x_235 = lean_ctor_get(x_233, 1);
+lean_inc(x_235);
+lean_dec(x_233);
+x_15 = x_234;
+x_16 = x_235;
 goto block_23;
 }
 else
 {
-lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; 
+lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -879,212 +918,160 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_224 = lean_ctor_get(x_221, 0);
-lean_inc(x_224);
-x_225 = lean_ctor_get(x_221, 1);
-lean_inc(x_225);
-if (lean_is_exclusive(x_221)) {
- lean_ctor_release(x_221, 0);
- lean_ctor_release(x_221, 1);
- x_226 = x_221;
+x_236 = lean_ctor_get(x_233, 0);
+lean_inc(x_236);
+x_237 = lean_ctor_get(x_233, 1);
+lean_inc(x_237);
+if (lean_is_exclusive(x_233)) {
+ lean_ctor_release(x_233, 0);
+ lean_ctor_release(x_233, 1);
+ x_238 = x_233;
 } else {
- lean_dec_ref(x_221);
- x_226 = lean_box(0);
+ lean_dec_ref(x_233);
+ x_238 = lean_box(0);
 }
-if (lean_is_scalar(x_226)) {
- x_227 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_238)) {
+ x_239 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_227 = x_226;
+ x_239 = x_238;
 }
-lean_ctor_set(x_227, 0, x_224);
-lean_ctor_set(x_227, 1, x_225);
-return x_227;
+lean_ctor_set(x_239, 0, x_236);
+lean_ctor_set(x_239, 1, x_237);
+return x_239;
 }
 }
 }
 else
 {
-lean_object* x_228; uint8_t x_229; 
-x_228 = lean_array_get_size(x_2);
-x_229 = lean_nat_dec_lt(x_36, x_228);
-lean_dec(x_228);
-if (x_229 == 0)
+lean_object* x_240; uint8_t x_241; 
+x_240 = lean_array_get_size(x_2);
+x_241 = lean_nat_dec_lt(x_36, x_240);
+lean_dec(x_240);
+if (x_241 == 0)
 {
-lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
+lean_object* x_242; 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; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; 
 lean_inc(x_1);
 lean_inc(x_8);
-x_230 = l_Lean_mkIdentFrom(x_8, x_1);
+x_242 = l_Lean_mkIdentFrom(x_8, x_1);
 lean_inc(x_13);
-x_231 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_14);
-x_232 = lean_ctor_get(x_231, 0);
-lean_inc(x_232);
-x_233 = lean_ctor_get(x_231, 1);
-lean_inc(x_233);
-lean_dec(x_231);
-x_234 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
-lean_inc(x_232);
-x_235 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_235, 0, x_232);
-lean_ctor_set(x_235, 1, x_234);
-x_236 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
-x_237 = lean_array_push(x_236, x_235);
-x_238 = lean_array_push(x_237, x_230);
-x_239 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_239, 0, x_232);
-lean_ctor_set(x_239, 1, x_40);
-lean_ctor_set(x_239, 2, x_238);
-x_240 = lean_nat_add(x_30, x_36);
-lean_dec(x_30);
-x_241 = lean_unsigned_to_nat(3u);
-x_242 = l_Lean_Syntax_setArg(x_37, x_241, x_239);
-x_243 = lean_box(0);
-lean_inc(x_13);
-x_244 = lean_apply_7(x_38, x_242, x_27, x_29, x_240, x_243, x_13, x_233);
-if (lean_obj_tag(x_244) == 0)
-{
-lean_object* x_245; lean_object* x_246; 
-x_245 = lean_ctor_get(x_244, 0);
+x_243 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_14);
+x_244 = lean_ctor_get(x_243, 0);
+lean_inc(x_244);
+x_245 = lean_ctor_get(x_243, 1);
 lean_inc(x_245);
-x_246 = lean_ctor_get(x_244, 1);
-lean_inc(x_246);
-lean_dec(x_244);
-x_15 = x_245;
-x_16 = x_246;
-goto block_23;
-}
-else
-{
-uint8_t x_247; 
-lean_dec(x_13);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_247 = !lean_is_exclusive(x_244);
-if (x_247 == 0)
-{
-return x_244;
-}
-else
-{
-lean_object* x_248; lean_object* x_249; lean_object* x_250; 
-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_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_250, 0, x_248);
-lean_ctor_set(x_250, 1, x_249);
-return x_250;
-}
-}
-}
-else
-{
-lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; 
-x_251 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25;
-lean_inc(x_30);
-x_252 = lean_name_append_index_after(x_251, x_30);
-x_253 = l_Lean_Name_append(x_1, x_252);
-lean_inc(x_8);
-x_254 = l_Lean_mkIdentFrom(x_8, x_253);
-lean_inc(x_13);
-x_255 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_14);
-x_256 = lean_ctor_get(x_255, 0);
-lean_inc(x_256);
-x_257 = lean_ctor_get(x_255, 1);
-lean_inc(x_257);
-lean_dec(x_255);
-x_258 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
-lean_inc(x_256);
-x_259 = lean_alloc_ctor(2, 2, 0);
-lean_ctor_set(x_259, 0, x_256);
-lean_ctor_set(x_259, 1, x_258);
-x_260 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
-x_261 = lean_array_push(x_260, x_259);
-x_262 = lean_array_push(x_261, x_254);
-x_263 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_263, 0, x_256);
-lean_ctor_set(x_263, 1, x_40);
-lean_ctor_set(x_263, 2, x_262);
-x_264 = lean_nat_add(x_30, x_36);
+lean_dec(x_243);
+x_246 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
+lean_inc(x_244);
+x_247 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_247, 0, x_244);
+lean_ctor_set(x_247, 1, x_246);
+x_248 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
+x_249 = lean_array_push(x_248, x_247);
+x_250 = lean_array_push(x_249, x_242);
+x_251 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_251, 0, x_244);
+lean_ctor_set(x_251, 1, x_40);
+lean_ctor_set(x_251, 2, x_250);
+x_252 = lean_nat_add(x_30, x_36);
 lean_dec(x_30);
-x_265 = lean_unsigned_to_nat(3u);
-x_266 = l_Lean_Syntax_setArg(x_37, x_265, x_263);
-x_267 = lean_box(0);
+x_253 = lean_unsigned_to_nat(3u);
+x_254 = l_Lean_Syntax_setArg(x_37, x_253, x_251);
+x_255 = lean_box(0);
 lean_inc(x_13);
-x_268 = lean_apply_7(x_38, x_266, x_27, x_29, x_264, x_267, x_13, x_257);
-if (lean_obj_tag(x_268) == 0)
+x_256 = lean_apply_7(x_38, x_254, x_27, x_29, x_252, x_255, x_13, x_245);
+if (lean_obj_tag(x_256) == 0)
 {
-lean_object* x_269; lean_object* x_270; 
-x_269 = lean_ctor_get(x_268, 0);
+lean_object* x_257; lean_object* x_258; 
+x_257 = lean_ctor_get(x_256, 0);
+lean_inc(x_257);
+x_258 = lean_ctor_get(x_256, 1);
+lean_inc(x_258);
+lean_dec(x_256);
+x_15 = x_257;
+x_16 = x_258;
+goto block_23;
+}
+else
+{
+uint8_t x_259; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_259 = !lean_is_exclusive(x_256);
+if (x_259 == 0)
+{
+return x_256;
+}
+else
+{
+lean_object* x_260; lean_object* x_261; lean_object* x_262; 
+x_260 = lean_ctor_get(x_256, 0);
+x_261 = lean_ctor_get(x_256, 1);
+lean_inc(x_261);
+lean_inc(x_260);
+lean_dec(x_256);
+x_262 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_262, 0, x_260);
+lean_ctor_set(x_262, 1, x_261);
+return x_262;
+}
+}
+}
+else
+{
+lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; 
+x_263 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26;
+lean_inc(x_30);
+x_264 = lean_name_append_index_after(x_263, x_30);
+x_265 = l_Lean_Name_append(x_1, x_264);
+lean_inc(x_8);
+x_266 = l_Lean_mkIdentFrom(x_8, x_265);
+lean_inc(x_13);
+x_267 = l_Lean_MonadRef_mkInfoFromRefPos___at___aux__Init__Notation______macroRules__precMax__1___spec__1(x_13, x_14);
+x_268 = lean_ctor_get(x_267, 0);
+lean_inc(x_268);
+x_269 = lean_ctor_get(x_267, 1);
 lean_inc(x_269);
-x_270 = lean_ctor_get(x_268, 1);
-lean_inc(x_270);
-lean_dec(x_268);
-x_15 = x_269;
-x_16 = x_270;
-goto block_23;
-}
-else
-{
-uint8_t x_271; 
-lean_dec(x_13);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_271 = !lean_is_exclusive(x_268);
-if (x_271 == 0)
-{
-return x_268;
-}
-else
-{
-lean_object* x_272; lean_object* x_273; lean_object* x_274; 
-x_272 = lean_ctor_get(x_268, 0);
-x_273 = lean_ctor_get(x_268, 1);
-lean_inc(x_273);
-lean_inc(x_272);
-lean_dec(x_268);
-x_274 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_274, 0, x_272);
-lean_ctor_set(x_274, 1, x_273);
-return x_274;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_275; lean_object* x_276; 
-lean_dec(x_40);
-x_275 = lean_box(0);
+lean_dec(x_267);
+x_270 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__7;
+lean_inc(x_268);
+x_271 = lean_alloc_ctor(2, 2, 0);
+lean_ctor_set(x_271, 0, x_268);
+lean_ctor_set(x_271, 1, x_270);
+x_272 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__12;
+x_273 = lean_array_push(x_272, x_271);
+x_274 = lean_array_push(x_273, x_266);
+x_275 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_275, 0, x_268);
+lean_ctor_set(x_275, 1, x_40);
+lean_ctor_set(x_275, 2, x_274);
+x_276 = lean_nat_add(x_30, x_36);
+lean_dec(x_30);
+x_277 = lean_unsigned_to_nat(3u);
+x_278 = l_Lean_Syntax_setArg(x_37, x_277, x_275);
+x_279 = lean_box(0);
 lean_inc(x_13);
-x_276 = lean_apply_7(x_38, x_37, x_27, x_29, x_30, x_275, x_13, x_14);
-if (lean_obj_tag(x_276) == 0)
+x_280 = lean_apply_7(x_38, x_278, x_27, x_29, x_276, x_279, x_13, x_269);
+if (lean_obj_tag(x_280) == 0)
 {
-lean_object* x_277; lean_object* x_278; 
-x_277 = lean_ctor_get(x_276, 0);
-lean_inc(x_277);
-x_278 = lean_ctor_get(x_276, 1);
-lean_inc(x_278);
-lean_dec(x_276);
-x_15 = x_277;
-x_16 = x_278;
+lean_object* x_281; lean_object* x_282; 
+x_281 = lean_ctor_get(x_280, 0);
+lean_inc(x_281);
+x_282 = lean_ctor_get(x_280, 1);
+lean_inc(x_282);
+lean_dec(x_280);
+x_15 = x_281;
+x_16 = x_282;
 goto block_23;
 }
 else
 {
-uint8_t x_279; 
+uint8_t x_283; 
 lean_dec(x_13);
 lean_dec(x_8);
 lean_dec(x_7);
@@ -1093,23 +1080,75 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_279 = !lean_is_exclusive(x_276);
-if (x_279 == 0)
+x_283 = !lean_is_exclusive(x_280);
+if (x_283 == 0)
 {
-return x_276;
+return x_280;
 }
 else
 {
-lean_object* x_280; lean_object* x_281; lean_object* x_282; 
-x_280 = lean_ctor_get(x_276, 0);
-x_281 = lean_ctor_get(x_276, 1);
-lean_inc(x_281);
-lean_inc(x_280);
-lean_dec(x_276);
-x_282 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_282, 0, x_280);
-lean_ctor_set(x_282, 1, x_281);
-return x_282;
+lean_object* x_284; lean_object* x_285; lean_object* x_286; 
+x_284 = lean_ctor_get(x_280, 0);
+x_285 = lean_ctor_get(x_280, 1);
+lean_inc(x_285);
+lean_inc(x_284);
+lean_dec(x_280);
+x_286 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_286, 0, x_284);
+lean_ctor_set(x_286, 1, x_285);
+return x_286;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_287; lean_object* x_288; 
+lean_dec(x_40);
+x_287 = lean_box(0);
+lean_inc(x_13);
+x_288 = lean_apply_7(x_38, x_37, x_27, x_29, x_30, x_287, x_13, x_14);
+if (lean_obj_tag(x_288) == 0)
+{
+lean_object* x_289; lean_object* x_290; 
+x_289 = lean_ctor_get(x_288, 0);
+lean_inc(x_289);
+x_290 = lean_ctor_get(x_288, 1);
+lean_inc(x_290);
+lean_dec(x_288);
+x_15 = x_289;
+x_16 = x_290;
+goto block_23;
+}
+else
+{
+uint8_t x_291; 
+lean_dec(x_13);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_291 = !lean_is_exclusive(x_288);
+if (x_291 == 0)
+{
+return x_288;
+}
+else
+{
+lean_object* x_292; lean_object* x_293; lean_object* x_294; 
+x_292 = lean_ctor_get(x_288, 0);
+x_293 = lean_ctor_get(x_288, 1);
+lean_inc(x_293);
+lean_inc(x_292);
+lean_dec(x_288);
+x_294 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_294, 0, x_292);
+lean_ctor_set(x_294, 1, x_293);
+return x_294;
 }
 }
 }
@@ -1667,7 +1706,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__6;
-x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24;
+x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -2929,7 +2968,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Tactic_evalMatch___closed__1;
-x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24;
+x_2 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
@@ -3185,6 +3224,8 @@ l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tact
 lean_mark_persistent(l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__24);
 l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25();
 lean_mark_persistent(l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__25);
+l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26();
+lean_mark_persistent(l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__1___closed__26);
 l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__1 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__1();
 lean_mark_persistent(l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__1);
 l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__2 = _init_l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTerm___spec__2___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/Term.c b/stage0/stdlib/Lean/Elab/Term.c
index a47cebf35e..5a6c341e1e 100644
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
@@ -861,6 +861,7 @@ static lean_object* l_Lean_Elab_Term_mkCoe___closed__5;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandDeclId___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_InternalExceptionId_getName(lean_object*, lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_instMetaEvalTermElabM___spec__5___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_EXPORT lean_object* l_Lean_Elab_Term_LVal_getRef(lean_object*);
 lean_object* l_Lean_Elab_expandDeclIdCore(lean_object*);
@@ -1971,17 +1972,19 @@ return x_5;
 static lean_object* _init_l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__6() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Tactic_instInhabitedSnapshot___closed__1;
 x_2 = l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__3;
 x_3 = l_Lean_Elab_Term_instInhabitedLetRecToLift___closed__1;
-x_4 = l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__5;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__5;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Elab_Tactic_instInhabitedSnapshot___closed__7() {
diff --git a/stage0/stdlib/Lean/Environment.c b/stage0/stdlib/Lean/Environment.c
index 1d6020faf4..8a4d7faac8 100644
--- a/stage0/stdlib/Lean/Environment.c
+++ b/stage0/stdlib/Lean/Environment.c
@@ -28,11 +28,13 @@ LEAN_EXPORT lean_object* l_Std_AssocList_foldlM___at_Lean_importModules___spec__
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_isNamespace___boxed(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2;
 static lean_object* l_Lean_Environment_displayStats___closed__2;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMap_insert_x27___at_Lean_importModules___spec__9(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_importModules___spec__1(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(size_t, lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType___rarg___closed__1;
 static lean_object* l_Lean_instInhabitedEnvironmentHeader___closed__2;
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_setState___rarg(lean_object*, lean_object*, lean_object*);
@@ -59,15 +61,15 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleDat
 LEAN_EXPORT lean_object* l_Lean_withImportModules(lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Environment_isNamespace(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvironmentHeader;
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1;
 extern lean_object* l_Lean_NameSet_instInhabitedNameSet;
 LEAN_EXPORT lean_object* lean_environment_free_regions(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_setState(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1038_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1089_(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__1;
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__4___boxed(lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 LEAN_EXPORT lean_object* l_Lean_mkMapDeclarationExtension___rarg___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -75,9 +77,10 @@ LEAN_EXPORT lean_object* l_Lean_mkTagDeclarationExtension___lambda__1(lean_objec
 static lean_object* l_Lean_Environment_displayStats___closed__4;
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_setState(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_setState(lean_object*);
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4;
 LEAN_EXPORT lean_object* l_Lean_Environment_header___default;
 LEAN_EXPORT lean_object* l_Lean_Environment_imports(lean_object*);
+LEAN_EXPORT lean_object* l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt(lean_object*);
 extern lean_object* l_Std_Format_defWidth;
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
@@ -85,28 +88,25 @@ LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getState(lean_objec
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_mkModuleData___spec__5(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__8;
 LEAN_EXPORT lean_object* l_Lean_SMap_numBuckets___at_Lean_Environment_displayStats___spec__5___boxed(lean_object*);
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4(lean_object*, size_t, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1;
 LEAN_EXPORT uint8_t l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1___rarg___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_instInhabitedSimplePersistentEnvExtension(lean_object*, lean_object*);
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__8___lambda__1___closed__2;
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__1(lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 static lean_object* l_Lean_mkTagDeclarationExtension___closed__1;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType(lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_MapDeclarationExtension_contains___spec__1(lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1___closed__1;
 LEAN_EXPORT lean_object* lean_environment_set_main_module(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg(lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2;
 lean_object* lean_update_env_attributes(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_isQuotInit___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedModuleIdx;
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Environment_addAux___spec__3___closed__3;
 size_t lean_usize_sub(size_t, size_t);
 LEAN_EXPORT lean_object* lean_environment_find(lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6;
 lean_object* l___private_Lean_Data_HashMap_0__Std_numBucketsForCapacity(lean_object*);
 static lean_object* l_Lean_instInhabitedEnvironment___closed__4;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__2;
@@ -124,6 +124,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_allImportedModuleNames___boxed(lean_
 extern lean_object* l_instInhabitedNat;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_getState___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_TagDeclarationExtension_isTagged___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1(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_EXPORT lean_object* l___private_Lean_Environment_0__Lean_getEntriesFor(lean_object*, lean_object*, lean_object*);
@@ -151,6 +152,7 @@ lean_object* lean_get_num_attributes(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_setState___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Environment_addAux___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__1(lean_object*, lean_object*);
 lean_object* l_Array_qpartition_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkMapDeclarationExtension___rarg___lambda__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState(lean_object*);
@@ -161,8 +163,8 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Environment
 LEAN_EXPORT lean_object* l_Lean_SMap_size___at_Lean_Environment_displayStats___spec__3(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_replace___at_Lean_importModules___spec__8(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3(lean_object*, size_t, size_t, lean_object*);
 static lean_object* l_Lean_TagDeclarationExtension_tag___closed__5;
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_freeRegions___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadEnv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__4(lean_object*);
@@ -177,6 +179,7 @@ LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface___lambda__3(l
 static lean_object* l_Lean_EnvExtensionStateSpec___closed__1;
 LEAN_EXPORT lean_object* l_Lean_TagDeclarationExtension_instInhabitedTagDeclarationExtension;
 lean_object* lean_nat_add(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_RBTree_toArray___at_Lean_mkModuleData___spec__6(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_binSearchAux___at_Lean_MapDeclarationExtension_contains___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_contains___boxed(lean_object*, lean_object*);
@@ -187,7 +190,6 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_display
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_invalidExtMsg;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_setState(lean_object*, lean_object*, lean_object*);
 size_t lean_uint64_to_usize(uint64_t);
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_FindImpl_findUnsafe_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binSearchAux___at_Lean_MapDeclarationExtension_contains___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkEmptyEnvironment___lambda__1(uint32_t, lean_object*, lean_object*);
@@ -199,6 +201,7 @@ LEAN_EXPORT lean_object* l_Lean_EnvironmentHeader_moduleNames___default;
 LEAN_EXPORT lean_object* l_Lean_ImportState_moduleNameSet___default;
 LEAN_EXPORT uint8_t l_Lean_Environment_isConstructor(lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__7;
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_find_x3f___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__5;
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__2(lean_object*, lean_object*, lean_object*);
@@ -243,7 +246,6 @@ LEAN_EXPORT lean_object* l_Lean_EnvironmentHeader_mainModule___default;
 LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__3(lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__2;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_mkInitialExtensionStates(lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMap_insert___at_Lean_Environment_addAux___spec__6(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_importModules_importMods___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toString(lean_object*, uint8_t);
@@ -264,7 +266,6 @@ LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_addEntry(lean_object*, le
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_mkModuleData___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_toStringAux___at_Lean_Environment_displayStats___spec__2___boxed(lean_object*, lean_object*);
 static lean_object* l_List_toStringAux___at_Lean_Environment_displayStats___spec__2___closed__1;
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_setImportedEntries___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_name(lean_object*);
 uint8_t l_Lean_Name_quickCmp(lean_object*, lean_object*);
@@ -277,6 +278,7 @@ LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___boxed(lean
 static lean_object* l_Lean_MapDeclarationExtension_insert___rarg___closed__1;
 lean_object* l_Std_RBNode_insert___at_Lean_NameMap_insert___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_evalConstCheck(lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3;
 lean_object* l_Nat_repr(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_contains___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_instInhabitedModuleData___closed__1;
@@ -284,7 +286,6 @@ LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg(lean
 LEAN_EXPORT lean_object* l_Lean_CompactedRegion_isMemoryMapped___boxed(lean_object*);
 uint8_t lean_compacted_region_is_memory_mapped(size_t);
 static lean_object* l_Lean_MapDeclarationExtension_insert___rarg___closed__2;
-LEAN_EXPORT uint8_t l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_modifyState(lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getEntries___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -302,14 +303,13 @@ lean_object* l_Std_PersistentHashMap_mkEmptyEntriesArray(lean_object*, lean_obje
 LEAN_EXPORT lean_object* l_Lean_mkTagDeclarationExtension___lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_getTrustLevel___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_modifyState___rarg(lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4;
+LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadEnv___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_instInhabitedEnvExtension(lean_object*, lean_object*);
 size_t lean_usize_shift_left(size_t, size_t);
 static lean_object* l_Lean_importModules_importMods___closed__2;
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* lean_eval_const(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_getEntries___rarg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Environment_contains(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__3___boxed(lean_object*);
@@ -318,15 +318,18 @@ LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getModuleEntries___rarg__
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkTagDeclarationExtension___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_moveEntries___at_Lean_importModules___spec__6(lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5;
 static lean_object* l_Lean_Environment_evalConstCheck___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Lean_persistentEnvExtensionsRef;
 LEAN_EXPORT lean_object* l_Lean_mkMapDeclarationExtension(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ImportState_regions___default;
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* lean_environment_add(lean_object*, lean_object*);
 lean_object* lean_save_module_data(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_withImportModules___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ImportState_moduleNames___default;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_getState___rarg___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2(lean_object*, size_t, size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 static lean_object* l_Lean_Environment_displayStats___closed__10;
@@ -339,7 +342,6 @@ LEAN_EXPORT lean_object* l_Lean_mkEmptyEnvironment___lambda__1___boxed(lean_obje
 static lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___lambda__2___closed__2;
 static lean_object* l_Lean_mkEmptyEnvironment___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_modifyState(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtensionDescr_statsFn___default___boxed(lean_object*, lean_object*);
 static uint32_t l_Lean_instInhabitedEnvironmentHeader___closed__1;
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -369,6 +371,7 @@ LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Environment_find_x3f
 LEAN_EXPORT lean_object* l_Lean_SMap_find_x3f_x27___at_Lean_Environment_find_x3f___spec__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getModuleIdx_x3f___lambda__1___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__1;
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_MapDeclarationExtension_instInhabitedMapDeclarationExtension___closed__1;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__2;
 LEAN_EXPORT lean_object* l_Lean_SMap_stageSizes___at_Lean_Environment_displayStats___spec__4(lean_object*);
@@ -453,14 +456,16 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_Environment_regist
 LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries(lean_object*, lean_object*);
 static lean_object* l_Lean_Environment_registerNamespace___closed__1;
 LEAN_EXPORT uint8_t l_Lean_Environment_hasUnsafe___lambda__1(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_registerNamespace(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedEnvExtensionInterface___lambda__1___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getNamespaceSet(lean_object*);
 static lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___closed__1;
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4(lean_object*, size_t, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_Environment_throwUnexpectedType___rarg___closed__3;
 static lean_object* l_List_toString___at_Lean_Environment_displayStats___spec__1___closed__1;
 static lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__3;
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_whnf___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_registerExt___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__4___closed__1;
@@ -485,6 +490,7 @@ LEAN_EXPORT lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___la
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__10(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instMonadEnv___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_mkModuleData___spec__2(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1___boxed(lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__3;
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg___closed__1;
 lean_object* lean_nat_mul(lean_object*, lean_object*);
@@ -495,15 +501,13 @@ static lean_object* l_Lean_Environment_header___default___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtensionDescr_statsFn___default(lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911_(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_2060_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_2121_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtensionState___rarg(lean_object*);
 static lean_object* l_Lean_instInhabitedEnvExtensionInterface___closed__5;
-LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Environment_0__Lean_getEntriesFor___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___rarg___boxed(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__1(lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedName;
 LEAN_EXPORT lean_object* l_Lean_registerPersistentEnvExtensionUnsafe(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -519,6 +523,7 @@ LEAN_EXPORT uint8_t l_Lean_Import_runtimeOnly___default;
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_MapDeclarationExtension_find_x3f___spec__1___rarg(lean_object*, lean_object*);
 static lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___closed__7;
 lean_object* lean_panic_fn(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_allImportedModuleNames(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_addAux(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_MapDeclarationExtension_contains___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -534,7 +539,7 @@ LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtensionState(lean_ob
 LEAN_EXPORT uint8_t l_Lean_Environment_getModuleIdx_x3f___lambda__1(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getNamespaceSet___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2(lean_object*, size_t, size_t, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at___private_Lean_Environment_0__Lean_setImportedEntries___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Environment_getModuleIdxFor_x3f___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtension_modifyState___rarg(lean_object*, lean_object*, lean_object*);
@@ -547,6 +552,7 @@ LEAN_EXPORT lean_object* l_Lean_instToStringImport(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_MapDeclarationExtension_find_x3f___rarg___closed__1;
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Environment_find_x3f___spec__5(lean_object*, lean_object*);
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_TagDeclarationExtension_isTagged___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_lengthTRAux___rarg(lean_object*, lean_object*);
 lean_object* l_IO_println___at_Lean_instEval___spec__1(lean_object*, lean_object*);
@@ -560,31 +566,29 @@ LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_mkModuleData___spec
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_EnvExtensionInterfaceUnsafe_mkInitialExtStates___spec__1(size_t, size_t, lean_object*, lean_object*);
 static lean_object* l_Lean_importModules___lambda__4___closed__1;
 static lean_object* l_Lean_TagDeclarationExtension_isTagged___closed__1;
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5;
 LEAN_EXPORT lean_object* l_Lean_ImportState_moduleData___default;
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__2(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__4(lean_object*);
-static lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3;
 static lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__8___lambda__1___closed__1;
 LEAN_EXPORT lean_object* l_Lean_EnvironmentHeader_imports___default;
 LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_envExtensionsRef;
 uint8_t l_List_isEmpty___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Environment_addAux___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SMap_insert___at_Lean_Environment_addAux___spec__1(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Environment_getModuleIdx_x3f(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_contains___at_Lean_Environment_addAux___spec__7___boxed(lean_object*, lean_object*);
 lean_object* lean_usize_to_nat(size_t);
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__2(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_registerEnvExtension___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_imp___elambda__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_EStateM_pure___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_TagDeclarationExtension_tag(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 uint32_t lean_uint32_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Environment_displayStats___spec__8___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg(lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Environment_addAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Environment_find_x3f___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkTagDeclarationExtension___lambda__3(lean_object*);
@@ -603,6 +607,7 @@ lean_object* lean_nat_to_int(lean_object*);
 static lean_object* l_Lean_mkTagDeclarationExtension___closed__3;
 static lean_object* l_List_forIn_loop___at_Lean_importModules___spec__1___closed__1;
 lean_object* l_Std_PersistentHashMap_mkEmptyEntries(lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12(size_t, lean_object*, size_t, size_t, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_importModules___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Kernel_isDefEq___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at_Lean_importModules___spec__1___boxed(lean_object*, lean_object*, lean_object*);
@@ -610,6 +615,7 @@ lean_object* lean_compacted_region_free(size_t, lean_object*);
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_instInhabitedEnvironment___spec__2___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_MapDeclarationExtension_contains(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_mkTagDeclarationExtension___lambda__2___boxed(lean_object*);
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_SimplePersistentEnvExtension_setState___rarg___lambda__1(lean_object*, lean_object*);
 uint8_t l_Std_Format_isNil(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_instInhabitedPersistentEnvExtension___lambda__1(lean_object*, lean_object*, lean_object*);
@@ -621,7 +627,6 @@ lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_o
 static lean_object* l_Array_qsort_sort___at_Lean_mkMapDeclarationExtension___spec__1___rarg___closed__1;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* lean_add_decl(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2___boxed(lean_object*, lean_object*);
 static lean_object* _init_l_Lean_EnvExtensionStateSpec___closed__1() {
 _start:
 {
@@ -764,10 +769,11 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_instInhabitedModuleData___closed__1;
-x_2 = lean_alloc_ctor(0, 3, 0);
+x_2 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_2, 0, x_1);
 lean_ctor_set(x_2, 1, x_1);
 lean_ctor_set(x_2, 2, x_1);
+lean_ctor_set(x_2, 3, x_1);
 return x_2;
 }
 }
@@ -966,7 +972,7 @@ return x_5;
 static lean_object* _init_l_Lean_instInhabitedEnvironment() {
 _start:
 {
-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_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; 
 x_1 = lean_unsigned_to_nat(0u);
 x_2 = l_Std_mkHashMapImp___rarg(x_1);
 x_3 = 1;
@@ -977,13 +983,15 @@ lean_ctor_set(x_5, 0, x_2);
 lean_ctor_set(x_5, 1, x_4);
 lean_ctor_set_uint8(x_5, sizeof(void*)*2, x_3);
 x_6 = l_Lean_instInhabitedModuleData___closed__1;
-x_7 = l_Lean_instInhabitedEnvironment___closed__4;
-x_8 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_8, 0, x_2);
-lean_ctor_set(x_8, 1, x_5);
-lean_ctor_set(x_8, 2, x_6);
-lean_ctor_set(x_8, 3, x_7);
-return x_8;
+x_7 = l_Lean_NameSet_empty;
+x_8 = l_Lean_instInhabitedEnvironment___closed__4;
+x_9 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_9, 0, x_2);
+lean_ctor_set(x_9, 1, x_5);
+lean_ctor_set(x_9, 2, x_6);
+lean_ctor_set(x_9, 3, x_7);
+lean_ctor_set(x_9, 4, x_8);
+return x_9;
 }
 }
 LEAN_EXPORT lean_object* l_Std_mkHashMap___at_Lean_instInhabitedEnvironment___spec__1___boxed(lean_object* x_1) {
@@ -1971,24 +1979,27 @@ return x_1;
 }
 else
 {
-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_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_7 = lean_ctor_get(x_1, 0);
 x_8 = lean_ctor_get(x_1, 1);
 x_9 = lean_ctor_get(x_1, 2);
 x_10 = lean_ctor_get(x_1, 3);
+x_11 = lean_ctor_get(x_1, 4);
+lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_dec(x_1);
-x_11 = l_Lean_ConstantInfo_name(x_2);
-x_12 = l_Lean_SMap_insert___at_Lean_Environment_addAux___spec__1(x_8, x_11, x_2);
-x_13 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_13, 0, x_7);
-lean_ctor_set(x_13, 1, x_12);
-lean_ctor_set(x_13, 2, x_9);
-lean_ctor_set(x_13, 3, x_10);
-return x_13;
+x_12 = l_Lean_ConstantInfo_name(x_2);
+x_13 = l_Lean_SMap_insert___at_Lean_Environment_addAux___spec__1(x_8, x_12, x_2);
+x_14 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_14, 0, x_7);
+lean_ctor_set(x_14, 1, x_13);
+lean_ctor_set(x_14, 2, x_9);
+lean_ctor_set(x_14, 3, x_10);
+lean_ctor_set(x_14, 4, x_11);
+return x_14;
 }
 }
 }
@@ -2027,6 +2038,301 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
+LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint64_t x_5; size_t x_6; size_t x_7; lean_object* x_8; uint8_t x_9; 
+x_3 = lean_ctor_get(x_1, 1);
+x_4 = lean_array_get_size(x_3);
+x_5 = l_Lean_Name_hash___override(x_2);
+x_6 = lean_uint64_to_usize(x_5);
+x_7 = lean_usize_modn(x_6, x_4);
+lean_dec(x_4);
+x_8 = lean_array_uget(x_3, x_7);
+x_9 = l_Std_AssocList_contains___at_Lean_Environment_addAux___spec__7(x_2, x_8);
+lean_dec(x_8);
+return x_9;
+}
+}
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5(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)
+{
+uint8_t x_8; 
+lean_dec(x_4);
+x_8 = 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
+{
+uint8_t x_14; 
+lean_dec(x_4);
+x_14 = 1;
+return x_14;
+}
+}
+}
+}
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4(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_Std_PersistentHashMap_insertAux___at_Lean_Environment_addAux___spec__3___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; uint8_t x_12; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_name_eq(x_3, x_11);
+lean_dec(x_11);
+return x_12;
+}
+case 1:
+{
+lean_object* x_13; size_t x_14; 
+x_13 = lean_ctor_get(x_10, 0);
+lean_inc(x_13);
+lean_dec(x_10);
+x_14 = lean_usize_shift_right(x_2, x_5);
+x_1 = x_13;
+x_2 = x_14;
+goto _start;
+}
+default: 
+{
+uint8_t x_16; 
+x_16 = 0;
+return x_16;
+}
+}
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_17 = lean_ctor_get(x_1, 0);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_1, 1);
+lean_inc(x_18);
+lean_dec(x_1);
+x_19 = lean_unsigned_to_nat(0u);
+x_20 = l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5(x_17, x_18, lean_box(0), x_19, x_3);
+lean_dec(x_18);
+lean_dec(x_17);
+return x_20;
+}
+}
+}
+LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; uint64_t x_4; size_t x_5; uint8_t 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_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4(x_3, x_5, x_2);
+lean_dec(x_2);
+return x_6;
+}
+}
+LEAN_EXPORT uint8_t l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; 
+x_3 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_1, 1);
+lean_inc(x_5);
+lean_dec(x_1);
+x_6 = l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2(x_4, x_2);
+lean_dec(x_4);
+if (x_6 == 0)
+{
+uint8_t x_7; 
+x_7 = l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3(x_5, x_2);
+return x_7;
+}
+else
+{
+uint8_t x_8; 
+lean_dec(x_5);
+lean_dec(x_2);
+x_8 = 1;
+return x_8;
+}
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_ctor_get(x_1, 0);
+lean_inc(x_9);
+lean_dec(x_1);
+x_10 = l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2(x_9, x_2);
+lean_dec(x_2);
+lean_dec(x_9);
+return x_10;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Environment_addExtraName(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; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_1, 1);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_1, 2);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_1, 3);
+lean_inc(x_6);
+x_7 = lean_ctor_get(x_1, 4);
+lean_inc(x_7);
+lean_inc(x_2);
+lean_inc(x_4);
+x_8 = l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1(x_4, x_2);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+x_9 = !lean_is_exclusive(x_1);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_10 = lean_ctor_get(x_1, 4);
+lean_dec(x_10);
+x_11 = lean_ctor_get(x_1, 3);
+lean_dec(x_11);
+x_12 = lean_ctor_get(x_1, 2);
+lean_dec(x_12);
+x_13 = lean_ctor_get(x_1, 1);
+lean_dec(x_13);
+x_14 = lean_ctor_get(x_1, 0);
+lean_dec(x_14);
+x_15 = lean_box(0);
+x_16 = l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(x_6, x_2, x_15);
+lean_ctor_set(x_1, 3, x_16);
+return x_1;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+lean_dec(x_1);
+x_17 = lean_box(0);
+x_18 = l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(x_6, x_2, x_17);
+x_19 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_19, 0, x_3);
+lean_ctor_set(x_19, 1, x_4);
+lean_ctor_set(x_19, 2, x_5);
+lean_ctor_set(x_19, 3, x_18);
+lean_ctor_set(x_19, 4, x_7);
+return x_19;
+}
+}
+else
+{
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_1;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Std_HashMapImp_contains___at_Lean_Environment_addExtraName___spec__2(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_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; lean_object* x_7; 
+x_6 = l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_addExtraName___spec__5(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+x_7 = lean_box(x_6);
+return x_7;
+}
+}
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; uint8_t x_5; lean_object* x_6; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_Std_PersistentHashMap_containsAux___at_Lean_Environment_addExtraName___spec__4(x_1, x_4, x_3);
+lean_dec(x_3);
+x_6 = lean_box(x_5);
+return x_6;
+}
+}
+LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Std_PersistentHashMap_contains___at_Lean_Environment_addExtraName___spec__3(x_1, x_2);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+LEAN_EXPORT lean_object* l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1(x_1, x_2);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
 LEAN_EXPORT lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Environment_find_x3f___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2310,182 +2616,6 @@ lean_dec(x_1);
 return x_3;
 }
 }
-LEAN_EXPORT uint8_t l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; uint64_t x_5; size_t x_6; size_t x_7; lean_object* x_8; uint8_t x_9; 
-x_3 = lean_ctor_get(x_1, 1);
-x_4 = lean_array_get_size(x_3);
-x_5 = l_Lean_Name_hash___override(x_2);
-x_6 = lean_uint64_to_usize(x_5);
-x_7 = lean_usize_modn(x_6, x_4);
-lean_dec(x_4);
-x_8 = lean_array_uget(x_3, x_7);
-x_9 = l_Std_AssocList_contains___at_Lean_Environment_addAux___spec__7(x_2, x_8);
-lean_dec(x_8);
-return x_9;
-}
-}
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5(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)
-{
-uint8_t x_8; 
-lean_dec(x_4);
-x_8 = 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
-{
-uint8_t x_14; 
-lean_dec(x_4);
-x_14 = 1;
-return x_14;
-}
-}
-}
-}
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4(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_Std_PersistentHashMap_insertAux___at_Lean_Environment_addAux___spec__3___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; uint8_t x_12; 
-x_11 = lean_ctor_get(x_10, 0);
-lean_inc(x_11);
-lean_dec(x_10);
-x_12 = lean_name_eq(x_3, x_11);
-lean_dec(x_11);
-return x_12;
-}
-case 1:
-{
-lean_object* x_13; size_t x_14; 
-x_13 = lean_ctor_get(x_10, 0);
-lean_inc(x_13);
-lean_dec(x_10);
-x_14 = lean_usize_shift_right(x_2, x_5);
-x_1 = x_13;
-x_2 = x_14;
-goto _start;
-}
-default: 
-{
-uint8_t x_16; 
-x_16 = 0;
-return x_16;
-}
-}
-}
-else
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-x_17 = lean_ctor_get(x_1, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_1, 1);
-lean_inc(x_18);
-lean_dec(x_1);
-x_19 = lean_unsigned_to_nat(0u);
-x_20 = l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5(x_17, x_18, lean_box(0), x_19, x_3);
-lean_dec(x_18);
-lean_dec(x_17);
-return x_20;
-}
-}
-}
-LEAN_EXPORT uint8_t l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; uint64_t x_4; size_t x_5; uint8_t 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_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4(x_3, x_5, x_2);
-lean_dec(x_2);
-return x_6;
-}
-}
-LEAN_EXPORT uint8_t l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; 
-x_3 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-lean_dec(x_1);
-x_6 = l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2(x_4, x_2);
-lean_dec(x_4);
-if (x_6 == 0)
-{
-uint8_t x_7; 
-x_7 = l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3(x_5, x_2);
-return x_7;
-}
-else
-{
-uint8_t x_8; 
-lean_dec(x_5);
-lean_dec(x_2);
-x_8 = 1;
-return x_8;
-}
-}
-else
-{
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-lean_dec(x_1);
-x_10 = l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2(x_9, x_2);
-lean_dec(x_2);
-lean_dec(x_9);
-return x_10;
-}
-}
-}
 LEAN_EXPORT uint8_t l_Lean_Environment_contains(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -2493,60 +2623,7 @@ lean_object* x_3; uint8_t x_4;
 x_3 = lean_ctor_get(x_1, 1);
 lean_inc(x_3);
 lean_dec(x_1);
-x_4 = l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1(x_3, x_2);
-return x_4;
-}
-}
-LEAN_EXPORT lean_object* l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_HashMapImp_contains___at_Lean_Environment_contains___spec__2(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_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-uint8_t x_6; lean_object* x_7; 
-x_6 = l_Std_PersistentHashMap_containsAtAux___at_Lean_Environment_contains___spec__5(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-x_7 = lean_box(x_6);
-return x_7;
-}
-}
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-size_t x_4; uint8_t x_5; lean_object* x_6; 
-x_4 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_5 = l_Std_PersistentHashMap_containsAux___at_Lean_Environment_contains___spec__4(x_1, x_4, x_3);
-lean_dec(x_3);
-x_6 = lean_box(x_5);
-return x_6;
-}
-}
-LEAN_EXPORT lean_object* l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_Std_PersistentHashMap_contains___at_Lean_Environment_contains___spec__3(x_1, x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-LEAN_EXPORT lean_object* l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_Lean_SMap_contains___at_Lean_Environment_contains___spec__1(x_1, x_2);
-x_4 = lean_box(x_3);
+x_4 = l_Lean_SMap_contains___at_Lean_Environment_addExtraName___spec__1(x_3, x_2);
 return x_4;
 }
 }
@@ -2563,7 +2640,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_imports(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = lean_ctor_get(x_1, 3);
+x_2 = lean_ctor_get(x_1, 4);
 x_3 = lean_ctor_get(x_2, 1);
 lean_inc(x_3);
 return x_3;
@@ -2582,7 +2659,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_allImportedModuleNames(lean_object*
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = lean_ctor_get(x_1, 3);
+x_2 = lean_ctor_get(x_1, 4);
 x_3 = lean_ctor_get(x_2, 3);
 lean_inc(x_3);
 return x_3;
@@ -2605,7 +2682,7 @@ x_3 = !lean_is_exclusive(x_1);
 if (x_3 == 0)
 {
 lean_object* x_4; uint8_t x_5; 
-x_4 = lean_ctor_get(x_1, 3);
+x_4 = lean_ctor_get(x_1, 4);
 x_5 = !lean_is_exclusive(x_4);
 if (x_5 == 0)
 {
@@ -2637,61 +2714,64 @@ lean_ctor_set(x_13, 3, x_11);
 lean_ctor_set(x_13, 4, x_12);
 lean_ctor_set_uint32(x_13, sizeof(void*)*5, x_7);
 lean_ctor_set_uint8(x_13, sizeof(void*)*5 + 4, x_8);
-lean_ctor_set(x_1, 3, x_13);
+lean_ctor_set(x_1, 4, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint32_t x_18; uint8_t 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_14 = lean_ctor_get(x_1, 3);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint32_t x_19; uint8_t 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_14 = lean_ctor_get(x_1, 4);
 x_15 = lean_ctor_get(x_1, 0);
 x_16 = lean_ctor_get(x_1, 1);
 x_17 = lean_ctor_get(x_1, 2);
+x_18 = lean_ctor_get(x_1, 3);
 lean_inc(x_14);
+lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_dec(x_1);
-x_18 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
-x_19 = lean_ctor_get_uint8(x_14, sizeof(void*)*5 + 4);
-x_20 = lean_ctor_get(x_14, 1);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_14, 2);
+x_19 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
+x_20 = lean_ctor_get_uint8(x_14, sizeof(void*)*5 + 4);
+x_21 = lean_ctor_get(x_14, 1);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_14, 3);
+x_22 = lean_ctor_get(x_14, 2);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_14, 4);
+x_23 = lean_ctor_get(x_14, 3);
 lean_inc(x_23);
+x_24 = lean_ctor_get(x_14, 4);
+lean_inc(x_24);
 if (lean_is_exclusive(x_14)) {
  lean_ctor_release(x_14, 0);
  lean_ctor_release(x_14, 1);
  lean_ctor_release(x_14, 2);
  lean_ctor_release(x_14, 3);
  lean_ctor_release(x_14, 4);
- x_24 = x_14;
+ x_25 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_24 = lean_box(0);
+ x_25 = lean_box(0);
 }
-if (lean_is_scalar(x_24)) {
- x_25 = lean_alloc_ctor(0, 5, 5);
+if (lean_is_scalar(x_25)) {
+ x_26 = lean_alloc_ctor(0, 5, 5);
 } else {
- x_25 = x_24;
+ x_26 = x_25;
 }
-lean_ctor_set(x_25, 0, x_2);
-lean_ctor_set(x_25, 1, x_20);
-lean_ctor_set(x_25, 2, x_21);
-lean_ctor_set(x_25, 3, x_22);
-lean_ctor_set(x_25, 4, x_23);
-lean_ctor_set_uint32(x_25, sizeof(void*)*5, x_18);
-lean_ctor_set_uint8(x_25, sizeof(void*)*5 + 4, x_19);
-x_26 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_26, 0, x_15);
-lean_ctor_set(x_26, 1, x_16);
-lean_ctor_set(x_26, 2, x_17);
-lean_ctor_set(x_26, 3, x_25);
-return x_26;
+lean_ctor_set(x_26, 0, x_2);
+lean_ctor_set(x_26, 1, x_21);
+lean_ctor_set(x_26, 2, x_22);
+lean_ctor_set(x_26, 3, x_23);
+lean_ctor_set(x_26, 4, x_24);
+lean_ctor_set_uint32(x_26, sizeof(void*)*5, x_19);
+lean_ctor_set_uint8(x_26, sizeof(void*)*5 + 4, x_20);
+x_27 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_27, 0, x_15);
+lean_ctor_set(x_27, 1, x_16);
+lean_ctor_set(x_27, 2, x_17);
+lean_ctor_set(x_27, 3, x_18);
+lean_ctor_set(x_27, 4, x_26);
+return x_27;
 }
 }
 }
@@ -2699,7 +2779,7 @@ LEAN_EXPORT lean_object* lean_environment_main_module(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = lean_ctor_get(x_1, 3);
+x_2 = lean_ctor_get(x_1, 4);
 lean_inc(x_2);
 lean_dec(x_1);
 x_3 = lean_ctor_get(x_2, 0);
@@ -2716,7 +2796,7 @@ x_2 = !lean_is_exclusive(x_1);
 if (x_2 == 0)
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = lean_ctor_get(x_1, 3);
+x_3 = lean_ctor_get(x_1, 4);
 x_4 = !lean_is_exclusive(x_3);
 if (x_4 == 0)
 {
@@ -2749,63 +2829,66 @@ lean_ctor_set(x_13, 3, x_10);
 lean_ctor_set(x_13, 4, x_11);
 lean_ctor_set_uint32(x_13, sizeof(void*)*5, x_6);
 lean_ctor_set_uint8(x_13, sizeof(void*)*5 + 4, x_12);
-lean_ctor_set(x_1, 3, x_13);
+lean_ctor_set(x_1, 4, x_13);
 return x_1;
 }
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint32_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; uint8_t x_25; lean_object* x_26; lean_object* x_27; 
-x_14 = lean_ctor_get(x_1, 3);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint32_t 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; uint8_t x_26; lean_object* x_27; lean_object* x_28; 
+x_14 = lean_ctor_get(x_1, 4);
 x_15 = lean_ctor_get(x_1, 0);
 x_16 = lean_ctor_get(x_1, 1);
 x_17 = lean_ctor_get(x_1, 2);
+x_18 = lean_ctor_get(x_1, 3);
 lean_inc(x_14);
+lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
 lean_inc(x_15);
 lean_dec(x_1);
-x_18 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
-x_19 = lean_ctor_get(x_14, 0);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_14, 1);
+x_19 = lean_ctor_get_uint32(x_14, sizeof(void*)*5);
+x_20 = lean_ctor_get(x_14, 0);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_14, 2);
+x_21 = lean_ctor_get(x_14, 1);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_14, 3);
+x_22 = lean_ctor_get(x_14, 2);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_14, 4);
+x_23 = lean_ctor_get(x_14, 3);
 lean_inc(x_23);
+x_24 = lean_ctor_get(x_14, 4);
+lean_inc(x_24);
 if (lean_is_exclusive(x_14)) {
  lean_ctor_release(x_14, 0);
  lean_ctor_release(x_14, 1);
  lean_ctor_release(x_14, 2);
  lean_ctor_release(x_14, 3);
  lean_ctor_release(x_14, 4);
- x_24 = x_14;
+ x_25 = x_14;
 } else {
  lean_dec_ref(x_14);
- x_24 = lean_box(0);
+ x_25 = lean_box(0);
 }
-x_25 = 1;
-if (lean_is_scalar(x_24)) {
- x_26 = lean_alloc_ctor(0, 5, 5);
+x_26 = 1;
+if (lean_is_scalar(x_25)) {
+ x_27 = lean_alloc_ctor(0, 5, 5);
 } else {
- x_26 = x_24;
+ x_27 = x_25;
 }
-lean_ctor_set(x_26, 0, x_19);
-lean_ctor_set(x_26, 1, x_20);
-lean_ctor_set(x_26, 2, x_21);
-lean_ctor_set(x_26, 3, x_22);
-lean_ctor_set(x_26, 4, x_23);
-lean_ctor_set_uint32(x_26, sizeof(void*)*5, x_18);
-lean_ctor_set_uint8(x_26, sizeof(void*)*5 + 4, x_25);
-x_27 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_27, 0, x_15);
-lean_ctor_set(x_27, 1, x_16);
-lean_ctor_set(x_27, 2, x_17);
-lean_ctor_set(x_27, 3, x_26);
-return x_27;
+lean_ctor_set(x_27, 0, x_20);
+lean_ctor_set(x_27, 1, x_21);
+lean_ctor_set(x_27, 2, x_22);
+lean_ctor_set(x_27, 3, x_23);
+lean_ctor_set(x_27, 4, x_24);
+lean_ctor_set_uint32(x_27, sizeof(void*)*5, x_19);
+lean_ctor_set_uint8(x_27, sizeof(void*)*5 + 4, x_26);
+x_28 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_28, 0, x_15);
+lean_ctor_set(x_28, 1, x_16);
+lean_ctor_set(x_28, 2, x_17);
+lean_ctor_set(x_28, 3, x_18);
+lean_ctor_set(x_28, 4, x_27);
+return x_28;
 }
 }
 }
@@ -2813,7 +2896,7 @@ LEAN_EXPORT uint8_t lean_environment_quot_init(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; 
-x_2 = lean_ctor_get(x_1, 3);
+x_2 = lean_ctor_get(x_1, 4);
 lean_inc(x_2);
 lean_dec(x_1);
 x_3 = lean_ctor_get_uint8(x_2, sizeof(void*)*5 + 4);
@@ -2834,7 +2917,7 @@ LEAN_EXPORT uint32_t lean_environment_trust_level(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint32_t x_3; 
-x_2 = lean_ctor_get(x_1, 3);
+x_2 = lean_ctor_get(x_1, 4);
 lean_inc(x_2);
 lean_dec(x_1);
 x_3 = lean_ctor_get_uint32(x_2, sizeof(void*)*5);
@@ -2979,7 +3062,7 @@ LEAN_EXPORT lean_object* l_Lean_Environment_getModuleIdx_x3f(lean_object* x_1, l
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_3 = lean_ctor_get(x_1, 3);
+x_3 = lean_ctor_get(x_1, 4);
 x_4 = lean_ctor_get(x_3, 3);
 x_5 = lean_alloc_closure((void*)(l_Lean_Environment_getModuleIdx_x3f___lambda__1___boxed), 2, 1);
 lean_closure_set(x_5, 0, x_2);
@@ -3183,7 +3266,7 @@ x_2 = l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__2;
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1038_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1089_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
@@ -3273,156 +3356,163 @@ goto _start;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_object* x_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; 
 x_22 = lean_ctor_get(x_2, 0);
 x_23 = lean_ctor_get(x_2, 1);
 x_24 = lean_ctor_get(x_2, 2);
 x_25 = lean_ctor_get(x_2, 3);
+x_26 = lean_ctor_get(x_2, 4);
+lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_dec(x_2);
-x_26 = lean_array_push(x_24, x_14);
-x_27 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_27, 0, x_22);
-lean_ctor_set(x_27, 1, x_23);
-lean_ctor_set(x_27, 2, x_26);
-lean_ctor_set(x_27, 3, x_25);
-x_28 = lean_unsigned_to_nat(1u);
-x_29 = lean_nat_add(x_1, x_28);
+x_27 = lean_array_push(x_24, x_14);
+x_28 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_28, 0, x_22);
+lean_ctor_set(x_28, 1, x_23);
+lean_ctor_set(x_28, 2, x_27);
+lean_ctor_set(x_28, 3, x_25);
+lean_ctor_set(x_28, 4, x_26);
+x_29 = lean_unsigned_to_nat(1u);
+x_30 = lean_nat_add(x_1, x_29);
 lean_dec(x_1);
-x_1 = x_29;
-x_2 = x_27;
+x_1 = x_30;
+x_2 = x_28;
 x_3 = x_15;
 goto _start;
 }
 }
 else
 {
-uint8_t x_31; 
+uint8_t x_32; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_31 = !lean_is_exclusive(x_13);
-if (x_31 == 0)
+x_32 = !lean_is_exclusive(x_13);
+if (x_32 == 0)
 {
 return x_13;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_13, 0);
-x_33 = lean_ctor_get(x_13, 1);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_13, 0);
+x_34 = lean_ctor_get(x_13, 1);
+lean_inc(x_34);
 lean_inc(x_33);
-lean_inc(x_32);
 lean_dec(x_13);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
+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
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
-x_35 = lean_ctor_get(x_5, 0);
-x_36 = lean_ctor_get(x_5, 1);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
+x_36 = lean_ctor_get(x_5, 0);
+x_37 = lean_ctor_get(x_5, 1);
+lean_inc(x_37);
 lean_inc(x_36);
-lean_inc(x_35);
 lean_dec(x_5);
-x_37 = lean_array_get_size(x_35);
-x_38 = lean_nat_dec_lt(x_1, x_37);
-lean_dec(x_37);
-if (x_38 == 0)
+x_38 = lean_array_get_size(x_36);
+x_39 = lean_nat_dec_lt(x_1, x_38);
+lean_dec(x_38);
+if (x_39 == 0)
 {
-lean_object* x_39; 
-lean_dec(x_35);
+lean_object* x_40; 
+lean_dec(x_36);
 lean_dec(x_1);
-x_39 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_39, 0, x_2);
-lean_ctor_set(x_39, 1, x_36);
-return x_39;
+x_40 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_40, 0, x_2);
+lean_ctor_set(x_40, 1, x_37);
+return x_40;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_40 = lean_array_fget(x_35, x_1);
-lean_dec(x_35);
-x_41 = lean_ctor_get(x_40, 1);
-lean_inc(x_41);
-lean_dec(x_40);
-x_42 = lean_apply_1(x_41, x_36);
-if (lean_obj_tag(x_42) == 0)
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_array_fget(x_36, x_1);
+lean_dec(x_36);
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+lean_dec(x_41);
+x_43 = lean_apply_1(x_42, x_37);
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 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_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
-lean_dec(x_42);
-x_45 = lean_ctor_get(x_2, 0);
+x_45 = lean_ctor_get(x_43, 1);
 lean_inc(x_45);
-x_46 = lean_ctor_get(x_2, 1);
+lean_dec(x_43);
+x_46 = lean_ctor_get(x_2, 0);
 lean_inc(x_46);
-x_47 = lean_ctor_get(x_2, 2);
+x_47 = lean_ctor_get(x_2, 1);
 lean_inc(x_47);
-x_48 = lean_ctor_get(x_2, 3);
+x_48 = lean_ctor_get(x_2, 2);
 lean_inc(x_48);
+x_49 = lean_ctor_get(x_2, 3);
+lean_inc(x_49);
+x_50 = lean_ctor_get(x_2, 4);
+lean_inc(x_50);
 if (lean_is_exclusive(x_2)) {
  lean_ctor_release(x_2, 0);
  lean_ctor_release(x_2, 1);
  lean_ctor_release(x_2, 2);
  lean_ctor_release(x_2, 3);
- x_49 = x_2;
+ lean_ctor_release(x_2, 4);
+ x_51 = x_2;
 } else {
  lean_dec_ref(x_2);
- x_49 = lean_box(0);
+ x_51 = lean_box(0);
 }
-x_50 = lean_array_push(x_47, x_43);
-if (lean_is_scalar(x_49)) {
- x_51 = lean_alloc_ctor(0, 4, 0);
+x_52 = lean_array_push(x_48, x_44);
+if (lean_is_scalar(x_51)) {
+ x_53 = lean_alloc_ctor(0, 5, 0);
 } else {
- x_51 = x_49;
+ x_53 = x_51;
 }
-lean_ctor_set(x_51, 0, x_45);
-lean_ctor_set(x_51, 1, x_46);
-lean_ctor_set(x_51, 2, x_50);
-lean_ctor_set(x_51, 3, x_48);
-x_52 = lean_unsigned_to_nat(1u);
-x_53 = lean_nat_add(x_1, x_52);
+lean_ctor_set(x_53, 0, x_46);
+lean_ctor_set(x_53, 1, x_47);
+lean_ctor_set(x_53, 2, x_52);
+lean_ctor_set(x_53, 3, x_49);
+lean_ctor_set(x_53, 4, x_50);
+x_54 = lean_unsigned_to_nat(1u);
+x_55 = lean_nat_add(x_1, x_54);
 lean_dec(x_1);
-x_1 = x_53;
-x_2 = x_51;
-x_3 = x_44;
+x_1 = x_55;
+x_2 = x_53;
+x_3 = x_45;
 goto _start;
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_55 = lean_ctor_get(x_42, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_42, 1);
-lean_inc(x_56);
-if (lean_is_exclusive(x_42)) {
- lean_ctor_release(x_42, 0);
- lean_ctor_release(x_42, 1);
- x_57 = x_42;
+x_57 = lean_ctor_get(x_43, 0);
+lean_inc(x_57);
+x_58 = lean_ctor_get(x_43, 1);
+lean_inc(x_58);
+if (lean_is_exclusive(x_43)) {
+ lean_ctor_release(x_43, 0);
+ lean_ctor_release(x_43, 1);
+ x_59 = x_43;
 } else {
- lean_dec_ref(x_42);
- x_57 = lean_box(0);
+ lean_dec_ref(x_43);
+ x_59 = lean_box(0);
 }
-if (lean_is_scalar(x_57)) {
- x_58 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_59)) {
+ x_60 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_58 = x_57;
+ x_60 = x_59;
 }
-lean_ctor_set(x_58, 0, x_55);
-lean_ctor_set(x_58, 1, x_56);
-return x_58;
+lean_ctor_set(x_60, 0, x_57);
+lean_ctor_set(x_60, 1, x_58);
+return x_60;
 }
 }
 }
@@ -3487,7 +3577,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_EnvExtensionInterfaceUnsafe_setState___rarg___closed__1;
 x_2 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__2;
-x_3 = lean_unsigned_to_nat(256u);
+x_3 = lean_unsigned_to_nat(279u);
 x_4 = lean_unsigned_to_nat(4u);
 x_5 = l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_invalidExtMsg;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -3504,76 +3594,82 @@ lean_dec(x_1);
 x_5 = !lean_is_exclusive(x_2);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_ctor_get(x_2, 1);
 x_8 = lean_ctor_get(x_2, 2);
 x_9 = lean_ctor_get(x_2, 3);
-x_10 = lean_array_get_size(x_8);
-x_11 = lean_nat_dec_lt(x_4, x_10);
-lean_dec(x_10);
-if (x_11 == 0)
+x_10 = lean_ctor_get(x_2, 4);
+x_11 = lean_array_get_size(x_8);
+x_12 = lean_nat_dec_lt(x_4, x_11);
+lean_dec(x_11);
+if (x_12 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
+lean_object* x_13; lean_object* x_14; 
 lean_free_object(x_2);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
-x_12 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__3;
-x_13 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_12);
-return x_13;
+x_13 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__3;
+x_14 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_13);
+return x_14;
 }
 else
 {
-lean_object* x_14; 
-x_14 = lean_array_fset(x_8, x_4, x_3);
+lean_object* x_15; 
+x_15 = lean_array_fset(x_8, x_4, x_3);
 lean_dec(x_4);
-lean_ctor_set(x_2, 2, x_14);
+lean_ctor_set(x_2, 2, x_15);
 return x_2;
 }
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-x_15 = lean_ctor_get(x_2, 0);
-x_16 = lean_ctor_get(x_2, 1);
-x_17 = lean_ctor_get(x_2, 2);
-x_18 = lean_ctor_get(x_2, 3);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_16 = lean_ctor_get(x_2, 0);
+x_17 = lean_ctor_get(x_2, 1);
+x_18 = lean_ctor_get(x_2, 2);
+x_19 = lean_ctor_get(x_2, 3);
+x_20 = lean_ctor_get(x_2, 4);
+lean_inc(x_20);
+lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
-lean_inc(x_15);
 lean_dec(x_2);
-x_19 = lean_array_get_size(x_17);
-x_20 = lean_nat_dec_lt(x_4, x_19);
-lean_dec(x_19);
-if (x_20 == 0)
+x_21 = lean_array_get_size(x_18);
+x_22 = lean_nat_dec_lt(x_4, x_21);
+lean_dec(x_21);
+if (x_22 == 0)
 {
-lean_object* x_21; lean_object* x_22; 
+lean_object* x_23; lean_object* x_24; 
+lean_dec(x_20);
+lean_dec(x_19);
 lean_dec(x_18);
 lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
 lean_dec(x_4);
 lean_dec(x_3);
-x_21 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__3;
-x_22 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_21);
-return x_22;
+x_23 = l_Lean_EnvExtensionInterfaceUnsafe_setState___rarg___closed__3;
+x_24 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_23);
+return x_24;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; 
-x_23 = lean_array_fset(x_17, x_4, x_3);
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_array_fset(x_18, x_4, x_3);
 lean_dec(x_4);
-x_24 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_24, 0, x_15);
-lean_ctor_set(x_24, 1, x_16);
-lean_ctor_set(x_24, 2, x_23);
-lean_ctor_set(x_24, 3, x_18);
-return x_24;
+x_26 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_26, 0, x_16);
+lean_ctor_set(x_26, 1, x_17);
+lean_ctor_set(x_26, 2, x_25);
+lean_ctor_set(x_26, 3, x_19);
+lean_ctor_set(x_26, 4, x_20);
+return x_26;
 }
 }
 }
@@ -3600,7 +3696,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_EnvExtensionInterfaceUnsafe_setState___rarg___closed__1;
 x_2 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__1;
-x_3 = lean_unsigned_to_nat(266u);
+x_3 = lean_unsigned_to_nat(289u);
 x_4 = lean_unsigned_to_nat(4u);
 x_5 = l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_invalidExtMsg;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -3614,82 +3710,88 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_2);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_ctor_get(x_2, 1);
 x_8 = lean_ctor_get(x_2, 2);
 x_9 = lean_ctor_get(x_2, 3);
-x_10 = lean_array_get_size(x_8);
-x_11 = lean_nat_dec_lt(x_5, x_10);
-lean_dec(x_10);
-if (x_11 == 0)
+x_10 = lean_ctor_get(x_2, 4);
+x_11 = lean_array_get_size(x_8);
+x_12 = lean_nat_dec_lt(x_5, x_11);
+lean_dec(x_11);
+if (x_12 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
+lean_object* x_13; lean_object* x_14; 
 lean_free_object(x_2);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_3);
-x_12 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
-x_13 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_12);
-return x_13;
+x_13 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
+x_14 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_13);
+return x_14;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_14 = lean_array_fget(x_8, x_5);
-x_15 = lean_box(0);
-x_16 = lean_array_fset(x_8, x_5, x_15);
-x_17 = lean_apply_1(x_3, x_14);
-x_18 = lean_array_fset(x_16, x_5, x_17);
-lean_ctor_set(x_2, 2, x_18);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_15 = lean_array_fget(x_8, x_5);
+x_16 = lean_box(0);
+x_17 = lean_array_fset(x_8, x_5, x_16);
+x_18 = lean_apply_1(x_3, x_15);
+x_19 = lean_array_fset(x_17, x_5, x_18);
+lean_ctor_set(x_2, 2, x_19);
 return x_2;
 }
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_19 = lean_ctor_get(x_1, 0);
-x_20 = lean_ctor_get(x_2, 0);
-x_21 = lean_ctor_get(x_2, 1);
-x_22 = lean_ctor_get(x_2, 2);
-x_23 = lean_ctor_get(x_2, 3);
+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; uint8_t x_27; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_2, 0);
+x_22 = lean_ctor_get(x_2, 1);
+x_23 = lean_ctor_get(x_2, 2);
+x_24 = lean_ctor_get(x_2, 3);
+x_25 = lean_ctor_get(x_2, 4);
+lean_inc(x_25);
+lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
-lean_inc(x_20);
 lean_dec(x_2);
-x_24 = lean_array_get_size(x_22);
-x_25 = lean_nat_dec_lt(x_19, x_24);
-lean_dec(x_24);
-if (x_25 == 0)
+x_26 = lean_array_get_size(x_23);
+x_27 = lean_nat_dec_lt(x_20, x_26);
+lean_dec(x_26);
+if (x_27 == 0)
 {
-lean_object* x_26; lean_object* x_27; 
+lean_object* x_28; lean_object* x_29; 
+lean_dec(x_25);
+lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
-lean_dec(x_20);
 lean_dec(x_3);
-x_26 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
-x_27 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_26);
-return x_27;
+x_28 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
+x_29 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_28);
+return x_29;
 }
 else
 {
-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_28 = lean_array_fget(x_22, x_19);
-x_29 = lean_box(0);
-x_30 = lean_array_fset(x_22, x_19, x_29);
-x_31 = lean_apply_1(x_3, x_28);
-x_32 = lean_array_fset(x_30, x_19, x_31);
-x_33 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_33, 0, x_20);
-lean_ctor_set(x_33, 1, x_21);
-lean_ctor_set(x_33, 2, x_32);
-lean_ctor_set(x_33, 3, x_23);
-return x_33;
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_30 = lean_array_fget(x_23, x_20);
+x_31 = lean_box(0);
+x_32 = lean_array_fset(x_23, x_20, x_31);
+x_33 = lean_apply_1(x_3, x_30);
+x_34 = lean_array_fset(x_32, x_20, x_33);
+x_35 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_35, 0, x_21);
+lean_ctor_set(x_35, 1, x_22);
+lean_ctor_set(x_35, 2, x_34);
+lean_ctor_set(x_35, 3, x_24);
+lean_ctor_set(x_35, 4, x_25);
+return x_35;
 }
 }
 }
@@ -3725,7 +3827,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_EnvExtensionInterfaceUnsafe_setState___rarg___closed__1;
 x_2 = l_Lean_EnvExtensionInterfaceUnsafe_getState___rarg___closed__1;
-x_3 = lean_unsigned_to_nat(273u);
+x_3 = lean_unsigned_to_nat(296u);
 x_4 = lean_unsigned_to_nat(4u);
 x_5 = l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_invalidExtMsg;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4025,82 +4127,88 @@ uint8_t x_4;
 x_4 = !lean_is_exclusive(x_2);
 if (x_4 == 0)
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
 x_5 = lean_ctor_get(x_1, 0);
 x_6 = lean_ctor_get(x_2, 0);
 x_7 = lean_ctor_get(x_2, 1);
 x_8 = lean_ctor_get(x_2, 2);
 x_9 = lean_ctor_get(x_2, 3);
-x_10 = lean_array_get_size(x_8);
-x_11 = lean_nat_dec_lt(x_5, x_10);
-lean_dec(x_10);
-if (x_11 == 0)
+x_10 = lean_ctor_get(x_2, 4);
+x_11 = lean_array_get_size(x_8);
+x_12 = lean_nat_dec_lt(x_5, x_11);
+lean_dec(x_11);
+if (x_12 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
+lean_object* x_13; lean_object* x_14; 
 lean_free_object(x_2);
+lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_3);
-x_12 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
-x_13 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_12);
-return x_13;
+x_13 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
+x_14 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_13);
+return x_14;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_14 = lean_array_fget(x_8, x_5);
-x_15 = lean_box(0);
-x_16 = lean_array_fset(x_8, x_5, x_15);
-x_17 = lean_apply_1(x_3, x_14);
-x_18 = lean_array_fset(x_16, x_5, x_17);
-lean_ctor_set(x_2, 2, x_18);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_15 = lean_array_fget(x_8, x_5);
+x_16 = lean_box(0);
+x_17 = lean_array_fset(x_8, x_5, x_16);
+x_18 = lean_apply_1(x_3, x_15);
+x_19 = lean_array_fset(x_17, x_5, x_18);
+lean_ctor_set(x_2, 2, x_19);
 return x_2;
 }
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_19 = lean_ctor_get(x_1, 0);
-x_20 = lean_ctor_get(x_2, 0);
-x_21 = lean_ctor_get(x_2, 1);
-x_22 = lean_ctor_get(x_2, 2);
-x_23 = lean_ctor_get(x_2, 3);
+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; uint8_t x_27; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_2, 0);
+x_22 = lean_ctor_get(x_2, 1);
+x_23 = lean_ctor_get(x_2, 2);
+x_24 = lean_ctor_get(x_2, 3);
+x_25 = lean_ctor_get(x_2, 4);
+lean_inc(x_25);
+lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
-lean_inc(x_20);
 lean_dec(x_2);
-x_24 = lean_array_get_size(x_22);
-x_25 = lean_nat_dec_lt(x_19, x_24);
-lean_dec(x_24);
-if (x_25 == 0)
+x_26 = lean_array_get_size(x_23);
+x_27 = lean_nat_dec_lt(x_20, x_26);
+lean_dec(x_26);
+if (x_27 == 0)
 {
-lean_object* x_26; lean_object* x_27; 
+lean_object* x_28; lean_object* x_29; 
+lean_dec(x_25);
+lean_dec(x_24);
 lean_dec(x_23);
 lean_dec(x_22);
 lean_dec(x_21);
-lean_dec(x_20);
 lean_dec(x_3);
-x_26 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
-x_27 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_26);
-return x_27;
+x_28 = l_Lean_EnvExtensionInterfaceUnsafe_modifyState___rarg___closed__2;
+x_29 = l_panic___at_Lean_EnvExtensionInterfaceUnsafe_setState___spec__1(x_28);
+return x_29;
 }
 else
 {
-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_28 = lean_array_fget(x_22, x_19);
-x_29 = lean_box(0);
-x_30 = lean_array_fset(x_22, x_19, x_29);
-x_31 = lean_apply_1(x_3, x_28);
-x_32 = lean_array_fset(x_30, x_19, x_31);
-x_33 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_33, 0, x_20);
-lean_ctor_set(x_33, 1, x_21);
-lean_ctor_set(x_33, 2, x_32);
-lean_ctor_set(x_33, 3, x_23);
-return x_33;
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_30 = lean_array_fget(x_23, x_20);
+x_31 = lean_box(0);
+x_32 = lean_array_fset(x_23, x_20, x_31);
+x_33 = lean_apply_1(x_3, x_30);
+x_34 = lean_array_fset(x_32, x_20, x_33);
+x_35 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_35, 0, x_21);
+lean_ctor_set(x_35, 1, x_22);
+lean_ctor_set(x_35, 2, x_34);
+lean_ctor_set(x_35, 3, x_24);
+lean_ctor_set(x_35, 4, x_25);
+return x_35;
 }
 }
 }
@@ -4417,7 +4525,7 @@ uint8_t x_5;
 x_5 = !lean_is_exclusive(x_4);
 if (x_5 == 0)
 {
-lean_object* 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_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; 
 x_6 = lean_ctor_get(x_4, 0);
 x_7 = 0;
 x_8 = lean_box(0);
@@ -4432,66 +4540,70 @@ lean_ctor_set_uint32(x_10, sizeof(void*)*5, x_1);
 lean_ctor_set_uint8(x_10, sizeof(void*)*5 + 4, x_7);
 x_11 = l_Lean_mkEmptyEnvironment___lambda__1___closed__1;
 x_12 = l_Lean_mkEmptyEnvironment___lambda__1___closed__2;
-x_13 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_13, 0, x_11);
-lean_ctor_set(x_13, 1, x_12);
-lean_ctor_set(x_13, 2, x_6);
-lean_ctor_set(x_13, 3, x_10);
-lean_ctor_set(x_4, 0, x_13);
+x_13 = l_Lean_NameSet_empty;
+x_14 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_14, 0, x_11);
+lean_ctor_set(x_14, 1, x_12);
+lean_ctor_set(x_14, 2, x_6);
+lean_ctor_set(x_14, 3, x_13);
+lean_ctor_set(x_14, 4, x_10);
+lean_ctor_set(x_4, 0, x_14);
 return x_4;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_14 = lean_ctor_get(x_4, 0);
-x_15 = lean_ctor_get(x_4, 1);
+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_25; 
+x_15 = lean_ctor_get(x_4, 0);
+x_16 = lean_ctor_get(x_4, 1);
+lean_inc(x_16);
 lean_inc(x_15);
-lean_inc(x_14);
 lean_dec(x_4);
-x_16 = 0;
-x_17 = lean_box(0);
-x_18 = l_Lean_instInhabitedModuleData___closed__1;
-x_19 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_19, 0, x_17);
-lean_ctor_set(x_19, 1, x_18);
-lean_ctor_set(x_19, 2, x_18);
-lean_ctor_set(x_19, 3, x_18);
-lean_ctor_set(x_19, 4, x_18);
-lean_ctor_set_uint32(x_19, sizeof(void*)*5, x_1);
-lean_ctor_set_uint8(x_19, sizeof(void*)*5 + 4, x_16);
-x_20 = l_Lean_mkEmptyEnvironment___lambda__1___closed__1;
-x_21 = l_Lean_mkEmptyEnvironment___lambda__1___closed__2;
-x_22 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_21);
-lean_ctor_set(x_22, 2, x_14);
-lean_ctor_set(x_22, 3, x_19);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_15);
-return x_23;
+x_17 = 0;
+x_18 = lean_box(0);
+x_19 = l_Lean_instInhabitedModuleData___closed__1;
+x_20 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+lean_ctor_set(x_20, 2, x_19);
+lean_ctor_set(x_20, 3, x_19);
+lean_ctor_set(x_20, 4, x_19);
+lean_ctor_set_uint32(x_20, sizeof(void*)*5, x_1);
+lean_ctor_set_uint8(x_20, sizeof(void*)*5 + 4, x_17);
+x_21 = l_Lean_mkEmptyEnvironment___lambda__1___closed__1;
+x_22 = l_Lean_mkEmptyEnvironment___lambda__1___closed__2;
+x_23 = l_Lean_NameSet_empty;
+x_24 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_24, 0, x_21);
+lean_ctor_set(x_24, 1, x_22);
+lean_ctor_set(x_24, 2, x_15);
+lean_ctor_set(x_24, 3, x_23);
+lean_ctor_set(x_24, 4, x_20);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_24);
+lean_ctor_set(x_25, 1, x_16);
+return x_25;
 }
 }
 else
 {
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_4);
-if (x_24 == 0)
+uint8_t x_26; 
+x_26 = !lean_is_exclusive(x_4);
+if (x_26 == 0)
 {
 return x_4;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_4, 0);
-x_26 = lean_ctor_get(x_4, 1);
-lean_inc(x_26);
-lean_inc(x_25);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_4, 0);
+x_28 = lean_ctor_get(x_4, 1);
+lean_inc(x_28);
+lean_inc(x_27);
 lean_dec(x_4);
-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;
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
 }
 }
 }
@@ -4974,7 +5086,7 @@ lean_dec(x_1);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_2060_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_2121_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; uint8_t x_4; 
@@ -6197,7 +6309,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_EnvExtensionInterfaceUnsafe_setState___rarg___closed__1;
 x_2 = l_Lean_TagDeclarationExtension_tag___closed__4;
-x_3 = lean_unsigned_to_nat(506u);
+x_3 = lean_unsigned_to_nat(530u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l_Lean_TagDeclarationExtension_tag___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -6761,7 +6873,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_EnvExtensionInterfaceUnsafe_setState___rarg___closed__1;
 x_2 = l_Lean_MapDeclarationExtension_insert___rarg___closed__3;
-x_3 = lean_unsigned_to_nat(535u);
+x_3 = lean_unsigned_to_nat(559u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l_Lean_MapDeclarationExtension_insert___rarg___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -7359,7 +7471,7 @@ LEAN_EXPORT lean_object* lean_environment_free_regions(lean_object* x_1, lean_ob
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
-x_3 = lean_ctor_get(x_1, 3);
+x_3 = lean_ctor_get(x_1, 4);
 lean_inc(x_3);
 lean_dec(x_1);
 x_4 = lean_ctor_get(x_3, 2);
@@ -7646,6 +7758,40 @@ x_5 = l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3___rarg(
 return x_5;
 }
 }
+LEAN_EXPORT lean_object* l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+return x_1;
+}
+else
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_3 = lean_ctor_get(x_2, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_2, 1);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_2, 3);
+lean_inc(x_5);
+lean_dec(x_2);
+x_6 = l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(x_1, x_3);
+x_7 = lean_array_push(x_6, x_4);
+x_1 = x_7;
+x_2 = x_5;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Std_RBTree_toArray___at_Lean_mkModuleData___spec__6(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_instInhabitedModuleData___closed__1;
+x_3 = l_Std_RBNode_fold___at_Lean_mkModuleData___spec__7(x_2, x_1);
+return x_3;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_mkModuleData___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -7671,7 +7817,7 @@ x_4 = lean_st_ref_get(x_3, x_2);
 x_5 = !lean_is_exclusive(x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+lean_object* x_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_object* x_17; lean_object* x_18; 
 x_6 = lean_ctor_get(x_4, 0);
 x_7 = lean_array_get_size(x_6);
 x_8 = l_Lean_instInhabitedModuleData___closed__1;
@@ -7679,61 +7825,69 @@ lean_inc(x_7);
 x_9 = l_Nat_foldTR_loop___at_Lean_mkModuleData___spec__1(x_1, x_6, x_7, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-x_10 = lean_ctor_get(x_1, 3);
+x_10 = lean_ctor_get(x_1, 4);
 lean_inc(x_10);
 x_11 = lean_ctor_get(x_10, 1);
 lean_inc(x_11);
 lean_dec(x_10);
 x_12 = lean_ctor_get(x_1, 1);
 lean_inc(x_12);
-lean_dec(x_1);
 x_13 = lean_ctor_get(x_12, 1);
 lean_inc(x_13);
 lean_dec(x_12);
 x_14 = l_Lean_mkModuleData___closed__1;
 x_15 = l_Std_PersistentHashMap_foldlM___at_Lean_mkModuleData___spec__2(x_13, x_14, x_8);
-x_16 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_16, 0, x_11);
-lean_ctor_set(x_16, 1, x_15);
-lean_ctor_set(x_16, 2, x_9);
-lean_ctor_set(x_4, 0, x_16);
+x_16 = lean_ctor_get(x_1, 3);
+lean_inc(x_16);
+lean_dec(x_1);
+x_17 = l_Std_RBTree_toArray___at_Lean_mkModuleData___spec__6(x_16);
+x_18 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_18, 0, x_11);
+lean_ctor_set(x_18, 1, x_15);
+lean_ctor_set(x_18, 2, x_17);
+lean_ctor_set(x_18, 3, x_9);
+lean_ctor_set(x_4, 0, x_18);
 return x_4;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_17 = lean_ctor_get(x_4, 0);
-x_18 = lean_ctor_get(x_4, 1);
-lean_inc(x_18);
-lean_inc(x_17);
-lean_dec(x_4);
-x_19 = lean_array_get_size(x_17);
-x_20 = l_Lean_instInhabitedModuleData___closed__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; 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_19 = lean_ctor_get(x_4, 0);
+x_20 = lean_ctor_get(x_4, 1);
+lean_inc(x_20);
 lean_inc(x_19);
-x_21 = l_Nat_foldTR_loop___at_Lean_mkModuleData___spec__1(x_1, x_17, x_19, x_19, x_20);
+lean_dec(x_4);
+x_21 = lean_array_get_size(x_19);
+x_22 = l_Lean_instInhabitedModuleData___closed__1;
+lean_inc(x_21);
+x_23 = l_Nat_foldTR_loop___at_Lean_mkModuleData___spec__1(x_1, x_19, x_21, x_21, x_22);
+lean_dec(x_21);
 lean_dec(x_19);
-lean_dec(x_17);
-x_22 = lean_ctor_get(x_1, 3);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_22, 1);
-lean_inc(x_23);
-lean_dec(x_22);
-x_24 = lean_ctor_get(x_1, 1);
+x_24 = lean_ctor_get(x_1, 4);
 lean_inc(x_24);
-lean_dec(x_1);
 x_25 = lean_ctor_get(x_24, 1);
 lean_inc(x_25);
 lean_dec(x_24);
-x_26 = l_Lean_mkModuleData___closed__1;
-x_27 = l_Std_PersistentHashMap_foldlM___at_Lean_mkModuleData___spec__2(x_25, x_26, x_20);
-x_28 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_28, 0, x_23);
-lean_ctor_set(x_28, 1, x_27);
-lean_ctor_set(x_28, 2, x_21);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_18);
-return x_29;
+x_26 = lean_ctor_get(x_1, 1);
+lean_inc(x_26);
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+lean_dec(x_26);
+x_28 = l_Lean_mkModuleData___closed__1;
+x_29 = l_Std_PersistentHashMap_foldlM___at_Lean_mkModuleData___spec__2(x_27, x_28, x_22);
+x_30 = lean_ctor_get(x_1, 3);
+lean_inc(x_30);
+lean_dec(x_1);
+x_31 = l_Std_RBTree_toArray___at_Lean_mkModuleData___spec__6(x_30);
+x_32 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_32, 0, x_25);
+lean_ctor_set(x_32, 1, x_29);
+lean_ctor_set(x_32, 2, x_31);
+lean_ctor_set(x_32, 3, x_23);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_20);
+return x_33;
 }
 }
 }
@@ -7815,7 +7969,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Environment_0__Lean_getEntriesFor(lean
 _start:
 {
 lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_1, 2);
+x_4 = lean_ctor_get(x_1, 3);
 x_5 = lean_array_get_size(x_4);
 x_6 = lean_nat_dec_lt(x_3, x_5);
 lean_dec(x_5);
@@ -10220,7 +10374,35 @@ return x_29;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(size_t x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6) {
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+uint8_t x_7; 
+x_7 = lean_usize_dec_lt(x_4, x_3);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_1);
+x_8 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_8, 0, x_5);
+lean_ctor_set(x_8, 1, x_6);
+return x_8;
+}
+else
+{
+lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; 
+x_9 = lean_array_uget(x_2, x_4);
+lean_inc(x_1);
+x_10 = l_Std_HashMap_insert___at_Lean_importModules___spec__3(x_5, x_9, x_1);
+x_11 = 1;
+x_12 = lean_usize_add(x_4, x_11);
+x_4 = x_12;
+x_5 = x_10;
+goto _start;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12(size_t x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; 
@@ -10249,7 +10431,6 @@ lean_inc(x_13);
 lean_dec(x_11);
 x_14 = lean_ctor_get(x_9, 1);
 lean_inc(x_14);
-lean_dec(x_9);
 lean_ctor_set(x_5, 1, x_12);
 x_15 = lean_array_get_size(x_14);
 x_16 = lean_usize_of_nat(x_15);
@@ -10268,162 +10449,205 @@ lean_dec(x_17);
 x_20 = !lean_is_exclusive(x_18);
 if (x_20 == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; size_t x_26; size_t x_27; 
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; size_t 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; size_t x_32; size_t x_33; 
 x_21 = lean_ctor_get(x_18, 0);
 x_22 = lean_ctor_get(x_18, 1);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_add(x_13, x_23);
+x_23 = lean_ctor_get(x_9, 2);
+lean_inc(x_23);
+lean_dec(x_9);
+x_24 = lean_array_get_size(x_23);
+x_25 = lean_usize_of_nat(x_24);
+lean_dec(x_24);
+lean_inc(x_13);
+x_26 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_13, x_23, x_25, x_1, x_21, x_19);
+lean_dec(x_23);
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = lean_unsigned_to_nat(1u);
+x_30 = lean_nat_add(x_13, x_29);
 lean_dec(x_13);
-lean_ctor_set(x_18, 1, x_24);
+lean_ctor_set(x_18, 1, x_30);
 lean_ctor_set(x_18, 0, x_22);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_21);
-lean_ctor_set(x_25, 1, x_18);
-x_26 = 1;
-x_27 = lean_usize_add(x_4, x_26);
-x_4 = x_27;
-x_5 = x_25;
-x_6 = x_19;
+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 = 1;
+x_33 = lean_usize_add(x_4, x_32);
+x_4 = x_33;
+x_5 = x_31;
+x_6 = x_28;
 goto _start;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; 
-x_29 = lean_ctor_get(x_18, 0);
-x_30 = lean_ctor_get(x_18, 1);
-lean_inc(x_30);
-lean_inc(x_29);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; size_t 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; size_t x_47; size_t x_48; 
+x_35 = lean_ctor_get(x_18, 0);
+x_36 = lean_ctor_get(x_18, 1);
+lean_inc(x_36);
+lean_inc(x_35);
 lean_dec(x_18);
-x_31 = lean_unsigned_to_nat(1u);
-x_32 = lean_nat_add(x_13, x_31);
+x_37 = lean_ctor_get(x_9, 2);
+lean_inc(x_37);
+lean_dec(x_9);
+x_38 = lean_array_get_size(x_37);
+x_39 = lean_usize_of_nat(x_38);
+lean_dec(x_38);
+lean_inc(x_13);
+x_40 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_13, x_37, x_39, x_1, x_35, x_19);
+lean_dec(x_37);
+x_41 = lean_ctor_get(x_40, 0);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+x_43 = lean_unsigned_to_nat(1u);
+x_44 = lean_nat_add(x_13, x_43);
 lean_dec(x_13);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_30);
-lean_ctor_set(x_33, 1, x_32);
-x_34 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_34, 0, x_29);
-lean_ctor_set(x_34, 1, x_33);
-x_35 = 1;
-x_36 = lean_usize_add(x_4, x_35);
-x_4 = x_36;
-x_5 = x_34;
-x_6 = x_19;
+x_45 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_45, 0, x_36);
+lean_ctor_set(x_45, 1, x_44);
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_41);
+lean_ctor_set(x_46, 1, x_45);
+x_47 = 1;
+x_48 = lean_usize_add(x_4, x_47);
+x_4 = x_48;
+x_5 = x_46;
+x_6 = x_42;
 goto _start;
 }
 }
 else
 {
-uint8_t x_38; 
+uint8_t x_50; 
 lean_dec(x_13);
-x_38 = !lean_is_exclusive(x_17);
-if (x_38 == 0)
+lean_dec(x_9);
+x_50 = !lean_is_exclusive(x_17);
+if (x_50 == 0)
 {
 return x_17;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_39 = lean_ctor_get(x_17, 0);
-x_40 = lean_ctor_get(x_17, 1);
-lean_inc(x_40);
-lean_inc(x_39);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_17, 0);
+x_52 = lean_ctor_get(x_17, 1);
+lean_inc(x_52);
+lean_inc(x_51);
 lean_dec(x_17);
-x_41 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_41, 0, x_39);
-lean_ctor_set(x_41, 1, x_40);
-return x_41;
+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
 {
-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; size_t x_49; lean_object* x_50; 
-x_42 = lean_ctor_get(x_5, 0);
-x_43 = lean_ctor_get(x_5, 1);
-lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_5);
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_43, 1);
-lean_inc(x_45);
-lean_dec(x_43);
-x_46 = lean_ctor_get(x_9, 1);
-lean_inc(x_46);
-lean_dec(x_9);
-x_47 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_47, 0, x_42);
-lean_ctor_set(x_47, 1, x_44);
-x_48 = lean_array_get_size(x_46);
-x_49 = lean_usize_of_nat(x_48);
-lean_dec(x_48);
-lean_inc(x_45);
-x_50 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__10(x_45, x_46, x_49, x_1, x_47, x_6);
-lean_dec(x_46);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; size_t x_60; size_t x_61; 
-x_51 = lean_ctor_get(x_50, 0);
-lean_inc(x_51);
-x_52 = lean_ctor_get(x_50, 1);
-lean_inc(x_52);
-lean_dec(x_50);
-x_53 = lean_ctor_get(x_51, 0);
-lean_inc(x_53);
-x_54 = lean_ctor_get(x_51, 1);
+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; size_t x_61; lean_object* x_62; 
+x_54 = lean_ctor_get(x_5, 0);
+x_55 = lean_ctor_get(x_5, 1);
+lean_inc(x_55);
 lean_inc(x_54);
-if (lean_is_exclusive(x_51)) {
- lean_ctor_release(x_51, 0);
- lean_ctor_release(x_51, 1);
- x_55 = x_51;
-} else {
- lean_dec_ref(x_51);
- x_55 = lean_box(0);
-}
-x_56 = lean_unsigned_to_nat(1u);
-x_57 = lean_nat_add(x_45, x_56);
-lean_dec(x_45);
-if (lean_is_scalar(x_55)) {
- x_58 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_58 = x_55;
-}
-lean_ctor_set(x_58, 0, x_54);
-lean_ctor_set(x_58, 1, x_57);
+lean_dec(x_5);
+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_ctor_get(x_9, 1);
+lean_inc(x_58);
 x_59 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_59, 0, x_53);
-lean_ctor_set(x_59, 1, x_58);
-x_60 = 1;
-x_61 = lean_usize_add(x_4, x_60);
-x_4 = x_61;
-x_5 = x_59;
-x_6 = x_52;
+lean_ctor_set(x_59, 0, x_54);
+lean_ctor_set(x_59, 1, x_56);
+x_60 = lean_array_get_size(x_58);
+x_61 = lean_usize_of_nat(x_60);
+lean_dec(x_60);
+lean_inc(x_57);
+x_62 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__10(x_57, x_58, x_61, x_1, x_59, x_6);
+lean_dec(x_58);
+if (lean_obj_tag(x_62) == 0)
+{
+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; size_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; size_t x_78; size_t x_79; 
+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 = lean_ctor_get(x_63, 0);
+lean_inc(x_65);
+x_66 = lean_ctor_get(x_63, 1);
+lean_inc(x_66);
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ x_67 = x_63;
+} else {
+ lean_dec_ref(x_63);
+ x_67 = lean_box(0);
+}
+x_68 = lean_ctor_get(x_9, 2);
+lean_inc(x_68);
+lean_dec(x_9);
+x_69 = lean_array_get_size(x_68);
+x_70 = lean_usize_of_nat(x_69);
+lean_dec(x_69);
+lean_inc(x_57);
+x_71 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_57, x_68, x_70, x_1, x_65, x_64);
+lean_dec(x_68);
+x_72 = lean_ctor_get(x_71, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_71, 1);
+lean_inc(x_73);
+lean_dec(x_71);
+x_74 = lean_unsigned_to_nat(1u);
+x_75 = lean_nat_add(x_57, x_74);
+lean_dec(x_57);
+if (lean_is_scalar(x_67)) {
+ x_76 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_76 = x_67;
+}
+lean_ctor_set(x_76, 0, x_66);
+lean_ctor_set(x_76, 1, x_75);
+x_77 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_77, 0, x_72);
+lean_ctor_set(x_77, 1, x_76);
+x_78 = 1;
+x_79 = lean_usize_add(x_4, x_78);
+x_4 = x_79;
+x_5 = x_77;
+x_6 = x_73;
 goto _start;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-lean_dec(x_45);
-x_63 = lean_ctor_get(x_50, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_50, 1);
-lean_inc(x_64);
-if (lean_is_exclusive(x_50)) {
- lean_ctor_release(x_50, 0);
- lean_ctor_release(x_50, 1);
- x_65 = x_50;
+lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+lean_dec(x_57);
+lean_dec(x_9);
+x_81 = lean_ctor_get(x_62, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_62, 1);
+lean_inc(x_82);
+if (lean_is_exclusive(x_62)) {
+ lean_ctor_release(x_62, 0);
+ lean_ctor_release(x_62, 1);
+ x_83 = x_62;
 } else {
- lean_dec_ref(x_50);
- x_65 = lean_box(0);
+ lean_dec_ref(x_62);
+ x_83 = lean_box(0);
 }
-if (lean_is_scalar(x_65)) {
- x_66 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_83)) {
+ x_84 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_66 = x_65;
+ x_84 = x_83;
 }
-lean_ctor_set(x_66, 0, x_63);
-lean_ctor_set(x_66, 1, x_64);
-return x_66;
+lean_ctor_set(x_84, 0, x_81);
+lean_ctor_set(x_84, 1, x_82);
+return x_84;
 }
 }
 }
@@ -10552,7 +10776,7 @@ lean_ctor_set(x_16, 1, x_11);
 x_17 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_17, 0, x_15);
 lean_ctor_set(x_17, 1, x_16);
-x_18 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_10, x_7, x_9, x_10, x_17, x_14);
+x_18 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12(x_10, x_7, x_9, x_10, x_17, x_14);
 if (lean_obj_tag(x_18) == 0)
 {
 lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
@@ -10591,7 +10815,7 @@ lean_dec(x_31);
 x_33 = l_List_toArrayAux___rarg(x_1, x_32);
 if (x_30 == 0)
 {
-lean_object* x_34; lean_object* x_35; uint8_t 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_34; lean_object* x_35; uint8_t 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; 
 x_34 = lean_ctor_get(x_6, 3);
 lean_inc(x_34);
 x_35 = lean_ctor_get(x_6, 1);
@@ -10608,192 +10832,196 @@ lean_ctor_set(x_38, 3, x_35);
 lean_ctor_set(x_38, 4, x_7);
 lean_ctor_set_uint32(x_38, sizeof(void*)*5, x_2);
 lean_ctor_set_uint8(x_38, sizeof(void*)*5 + 4, x_36);
-x_39 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_39, 0, x_22);
-lean_ctor_set(x_39, 1, x_26);
-lean_ctor_set(x_39, 2, x_28);
-lean_ctor_set(x_39, 3, x_38);
-x_40 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_39, x_7, x_11, x_29);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+x_39 = l_Lean_NameSet_empty;
+x_40 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_40, 0, x_22);
+lean_ctor_set(x_40, 1, x_26);
+lean_ctor_set(x_40, 2, x_28);
+lean_ctor_set(x_40, 3, x_39);
+lean_ctor_set(x_40, 4, x_38);
+x_41 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_40, x_7, x_11, x_29);
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(x_7, x_3, x_11, x_41, 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___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(x_7, x_3, x_11, x_42, x_43);
+if (lean_obj_tag(x_44) == 0)
 {
-uint8_t x_44; 
-x_44 = !lean_is_exclusive(x_43);
-if (x_44 == 0)
+uint8_t x_45; 
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
 {
-return x_43;
+return x_44;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_43, 0);
-x_46 = lean_ctor_get(x_43, 1);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_44, 0);
+x_47 = lean_ctor_get(x_44, 1);
+lean_inc(x_47);
 lean_inc(x_46);
-lean_inc(x_45);
-lean_dec(x_43);
-x_47 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_46);
-return x_47;
+lean_dec(x_44);
+x_48 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
 }
 else
 {
-uint8_t x_48; 
-x_48 = !lean_is_exclusive(x_43);
-if (x_48 == 0)
+uint8_t x_49; 
+x_49 = !lean_is_exclusive(x_44);
+if (x_49 == 0)
 {
-return x_43;
+return x_44;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_43, 0);
-x_50 = lean_ctor_get(x_43, 1);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_44, 0);
+x_51 = lean_ctor_get(x_44, 1);
+lean_inc(x_51);
 lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_43);
-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;
+lean_dec(x_44);
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_50);
+lean_ctor_set(x_52, 1, x_51);
+return x_52;
 }
 }
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_52 = lean_ctor_get(x_6, 3);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_6, 1);
+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; 
+x_53 = lean_ctor_get(x_6, 3);
 lean_inc(x_53);
+x_54 = lean_ctor_get(x_6, 1);
+lean_inc(x_54);
 lean_dec(x_6);
-x_54 = lean_box(0);
+x_55 = lean_box(0);
 lean_inc(x_7);
-x_55 = lean_alloc_ctor(0, 5, 5);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_33);
-lean_ctor_set(x_55, 2, x_52);
-lean_ctor_set(x_55, 3, x_53);
-lean_ctor_set(x_55, 4, x_7);
-lean_ctor_set_uint32(x_55, sizeof(void*)*5, x_2);
-lean_ctor_set_uint8(x_55, sizeof(void*)*5 + 4, x_24);
-x_56 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_56, 0, x_22);
-lean_ctor_set(x_56, 1, x_26);
-lean_ctor_set(x_56, 2, x_28);
-lean_ctor_set(x_56, 3, x_55);
-x_57 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_56, x_7, x_11, x_29);
-x_58 = lean_ctor_get(x_57, 0);
-lean_inc(x_58);
-x_59 = lean_ctor_get(x_57, 1);
-lean_inc(x_59);
-lean_dec(x_57);
-x_60 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(x_7, x_3, x_11, x_58, x_59);
-if (lean_obj_tag(x_60) == 0)
+x_56 = lean_alloc_ctor(0, 5, 5);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_33);
+lean_ctor_set(x_56, 2, x_53);
+lean_ctor_set(x_56, 3, x_54);
+lean_ctor_set(x_56, 4, x_7);
+lean_ctor_set_uint32(x_56, sizeof(void*)*5, x_2);
+lean_ctor_set_uint8(x_56, sizeof(void*)*5 + 4, x_24);
+x_57 = l_Lean_NameSet_empty;
+x_58 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_58, 0, x_22);
+lean_ctor_set(x_58, 1, x_26);
+lean_ctor_set(x_58, 2, x_28);
+lean_ctor_set(x_58, 3, x_57);
+lean_ctor_set(x_58, 4, x_56);
+x_59 = l___private_Lean_Environment_0__Lean_setImportedEntries(x_58, x_7, x_11, x_29);
+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 = l___private_Lean_Environment_0__Lean_finalizePersistentExtensions_loop(x_7, x_3, x_11, x_60, x_61);
+if (lean_obj_tag(x_62) == 0)
 {
-uint8_t x_61; 
-x_61 = !lean_is_exclusive(x_60);
-if (x_61 == 0)
+uint8_t x_63; 
+x_63 = !lean_is_exclusive(x_62);
+if (x_63 == 0)
 {
-return x_60;
+return x_62;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_60, 0);
-x_63 = lean_ctor_get(x_60, 1);
-lean_inc(x_63);
-lean_inc(x_62);
-lean_dec(x_60);
-x_64 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_62, 0);
+x_65 = lean_ctor_get(x_62, 1);
+lean_inc(x_65);
+lean_inc(x_64);
+lean_dec(x_62);
+x_66 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_66, 0, x_64);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
 }
 }
 else
 {
-uint8_t x_65; 
-x_65 = !lean_is_exclusive(x_60);
-if (x_65 == 0)
+uint8_t x_67; 
+x_67 = !lean_is_exclusive(x_62);
+if (x_67 == 0)
 {
-return x_60;
+return x_62;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_60, 0);
-x_67 = lean_ctor_get(x_60, 1);
-lean_inc(x_67);
-lean_inc(x_66);
-lean_dec(x_60);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_62, 0);
+x_69 = lean_ctor_get(x_62, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_62);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
 }
 }
 }
 }
 else
 {
-uint8_t x_69; 
+uint8_t x_71; 
 lean_dec(x_26);
 lean_dec(x_22);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_3);
 lean_dec(x_1);
-x_69 = !lean_is_exclusive(x_27);
-if (x_69 == 0)
+x_71 = !lean_is_exclusive(x_27);
+if (x_71 == 0)
 {
 return x_27;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_27, 0);
-x_71 = lean_ctor_get(x_27, 1);
-lean_inc(x_71);
-lean_inc(x_70);
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_27, 0);
+x_73 = lean_ctor_get(x_27, 1);
+lean_inc(x_73);
+lean_inc(x_72);
 lean_dec(x_27);
-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;
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
 }
 }
 }
 else
 {
-uint8_t x_73; 
+uint8_t x_75; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_3);
 lean_dec(x_1);
-x_73 = !lean_is_exclusive(x_18);
-if (x_73 == 0)
+x_75 = !lean_is_exclusive(x_18);
+if (x_75 == 0)
 {
 return x_18;
 }
 else
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_18, 0);
-x_75 = lean_ctor_get(x_18, 1);
-lean_inc(x_75);
-lean_inc(x_74);
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_76 = lean_ctor_get(x_18, 0);
+x_77 = lean_ctor_get(x_18, 1);
+lean_inc(x_77);
+lean_inc(x_76);
 lean_dec(x_18);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_74);
-lean_ctor_set(x_76, 1, x_75);
-return x_76;
+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;
 }
 }
 }
@@ -10918,6 +11146,19 @@ return x_9;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11___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; size_t x_8; lean_object* x_9; 
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_9 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_1, x_2, x_7, x_8, x_5, x_6);
+lean_dec(x_2);
+return x_9;
+}
+}
+LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12___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; size_t x_8; size_t x_9; lean_object* x_10; 
 x_7 = lean_unbox_usize(x_1);
 lean_dec(x_1);
@@ -10925,7 +11166,7 @@ x_8 = lean_unbox_usize(x_3);
 lean_dec(x_3);
 x_9 = lean_unbox_usize(x_4);
 lean_dec(x_4);
-x_10 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__11(x_7, x_2, x_8, x_9, x_5, x_6);
+x_10 = l_Array_forInUnsafe_loop___at_Lean_importModules___spec__12(x_7, x_2, x_8, x_9, x_5, x_6);
 lean_dec(x_2);
 return x_10;
 }
@@ -11135,7 +11376,7 @@ x_7 = l_Lean_withImportModules___rarg(x_1, x_2, x_6, x_4, x_5);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11158,7 +11399,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; 
@@ -11196,7 +11437,7 @@ size_t x_15; size_t x_16; lean_object* x_17;
 x_15 = 0;
 x_16 = lean_usize_of_nat(x_7);
 lean_dec(x_7);
-x_17 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2(x_6, x_15, x_16, x_4);
+x_17 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2(x_6, x_15, x_16, x_4);
 lean_dec(x_6);
 x_2 = x_11;
 x_4 = x_17;
@@ -11210,7 +11451,7 @@ return x_4;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; uint8_t x_5; 
@@ -11239,14 +11480,14 @@ size_t x_7; size_t x_8; lean_object* x_9;
 x_7 = 0;
 x_8 = lean_usize_of_nat(x_3);
 lean_dec(x_3);
-x_9 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3(x_2, x_7, x_8, x_1);
+x_9 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3(x_2, x_7, x_8, x_1);
 lean_dec(x_2);
 return x_9;
 }
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; 
@@ -11284,7 +11525,7 @@ return x_8;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__1(lean_object* x_1, lean_object* x_2) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
@@ -11293,17 +11534,17 @@ x_4 = l_Lean_SMap_insert___at_Lean_NameSSet_insert___spec__1(x_1, x_2, x_3);
 return x_4;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__2(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_2 = l_Lean_SMap_empty___at_Lean_NameSSet_empty___spec__1;
-x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__1(x_2, x_1);
-x_4 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__4(x_3);
+x_3 = l_Lean_mkStateFromImportedEntries___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__1(x_2, x_1);
+x_4 = l_Lean_SMap_switch___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__4(x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -11311,17 +11552,17 @@ x_1 = lean_mk_string_from_bytes("namespaces", 10);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1;
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -11330,30 +11571,30 @@ lean_closure_set(x_1, 0, lean_box(0));
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__1), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__1), 2, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_4911____lambda__2), 1, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_initFn____x40_Lean_Environment___hyg_5043____lambda__2), 1, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6() {
+static lean_object* _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2;
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4;
-x_3 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5;
-x_4 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3;
+x_1 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2;
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4;
+x_3 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5;
+x_4 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3;
 x_5 = lean_alloc_ctor(0, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
@@ -11362,16 +11603,16 @@ lean_ctor_set(x_5, 3, x_4);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_4911_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_initFn____x40_Lean_Environment___hyg_5043_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6;
+x_2 = l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6;
 x_3 = l_Lean_registerSimplePersistentEnvExtension___rarg(x_2, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -11379,12 +11620,12 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__2(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__2(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
 }
-LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 size_t x_5; size_t x_6; lean_object* x_7; 
@@ -11392,7 +11633,7 @@ x_5 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_6 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_4911____spec__3(x_1, x_5, x_6, x_4);
+x_7 = l_Array_foldlMUnsafe_fold___at_Lean_initFn____x40_Lean_Environment___hyg_5043____spec__3(x_1, x_5, x_6, x_4);
 lean_dec(x_1);
 return x_7;
 }
@@ -12224,7 +12465,7 @@ lean_inc(x_5);
 x_6 = lean_ctor_get(x_4, 1);
 lean_inc(x_6);
 lean_dec(x_4);
-x_7 = lean_ctor_get(x_1, 3);
+x_7 = lean_ctor_get(x_1, 4);
 lean_inc(x_7);
 x_8 = lean_ctor_get(x_7, 1);
 lean_inc(x_8);
@@ -13232,7 +13473,7 @@ l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__1 = _init_l_Lean_E
 lean_mark_persistent(l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__1);
 l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__2 = _init_l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__2();
 lean_mark_persistent(l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__2);
-if (builtin) {res = l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1038_(lean_io_mk_world());
+if (builtin) {res = l_Lean_EnvExtensionInterfaceUnsafe_initFn____x40_Lean_Environment___hyg_1089_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_envExtensionsRef = lean_io_result_get_value(res);
 lean_mark_persistent(l___private_Lean_Environment_0__Lean_EnvExtensionInterfaceUnsafe_envExtensionsRef);
@@ -13297,7 +13538,7 @@ l_Lean_instInhabitedPersistentEnvExtension___closed__4 = _init_l_Lean_instInhabi
 lean_mark_persistent(l_Lean_instInhabitedPersistentEnvExtension___closed__4);
 l_Lean_instInhabitedPersistentEnvExtension___closed__5 = _init_l_Lean_instInhabitedPersistentEnvExtension___closed__5();
 lean_mark_persistent(l_Lean_instInhabitedPersistentEnvExtension___closed__5);
-if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_2060_(lean_io_mk_world());
+if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_2121_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_persistentEnvExtensionsRef = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_persistentEnvExtensionsRef);
@@ -13392,19 +13633,19 @@ l_Lean_importModules___lambda__4___closed__1 = _init_l_Lean_importModules___lamb
 lean_mark_persistent(l_Lean_importModules___lambda__4___closed__1);
 l_Lean_importModules___closed__1 = _init_l_Lean_importModules___closed__1();
 lean_mark_persistent(l_Lean_importModules___closed__1);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__1);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__2);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__3);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__4);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__5);
-l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6();
-lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_4911____closed__6);
-if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_4911_(lean_io_mk_world());
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__1);
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__2);
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__3);
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__4);
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__5);
+l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6 = _init_l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6();
+lean_mark_persistent(l_Lean_initFn____x40_Lean_Environment___hyg_5043____closed__6);
+if (builtin) {res = l_Lean_initFn____x40_Lean_Environment___hyg_5043_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_namespacesExt = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_namespacesExt);
diff --git a/stage0/stdlib/Lean/Expr.c b/stage0/stdlib/Lean/Expr.c
index 16d8a232c4..7e14dbac8a 100644
--- a/stage0/stdlib/Lean/Expr.c
+++ b/stage0/stdlib/Lean/Expr.c
@@ -17,6 +17,7 @@ lean_object* l_List_reverse___rarg(lean_object*);
 static lean_object* l___private_Lean_Expr_0__Lean_reprBinderInfo____x40_Lean_Expr___hyg_391____closed__20;
 LEAN_EXPORT lean_object* l_Lean_BinderInfo_isImplicit___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_isBinding___boxed(lean_object*);
+LEAN_EXPORT uint8_t l_Lean_Expr_isType0(lean_object*);
 static lean_object* l_Lean_Expr_letName_x21___closed__2;
 static lean_object* l_Lean_Expr_ctorName___closed__7;
 static lean_object* l_Lean_mkNatLit___closed__8;
@@ -91,6 +92,7 @@ static lean_object* l_Lean_Expr_litValue_x21___closed__2;
 lean_object* lean_array_uget(lean_object*, size_t);
 static lean_object* l___private_Lean_Expr_0__Lean_reprExpr____x40_Lean_Expr___hyg_2880____closed__8;
 LEAN_EXPORT lean_object* l_Lean_Expr_replaceFVarId___boxed(lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Expr_isType0___boxed(lean_object*);
 static lean_object* l_Lean_mkSimpleThunkType___closed__3;
 LEAN_EXPORT uint8_t l_Lean_Expr_isProp(lean_object*);
 static lean_object* l_Lean_Expr_instHashableExpr___closed__1;
@@ -8475,6 +8477,55 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+LEAN_EXPORT uint8_t l_Lean_Expr_isType0(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 3)
+{
+lean_object* x_2; 
+x_2 = lean_ctor_get(x_1, 0);
+if (lean_obj_tag(x_2) == 1)
+{
+lean_object* x_3; 
+x_3 = lean_ctor_get(x_2, 0);
+if (lean_obj_tag(x_3) == 0)
+{
+uint8_t x_4; 
+x_4 = 1;
+return x_4;
+}
+else
+{
+uint8_t x_5; 
+x_5 = 0;
+return x_5;
+}
+}
+else
+{
+uint8_t x_6; 
+x_6 = 0;
+return x_6;
+}
+}
+else
+{
+uint8_t x_7; 
+x_7 = 0;
+return x_7;
+}
+}
+}
+LEAN_EXPORT lean_object* l_Lean_Expr_isType0___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Expr_isType0(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 LEAN_EXPORT uint8_t l_Lean_Expr_isProp(lean_object* x_1) {
 _start:
 {
@@ -9387,7 +9438,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_getRevArg_x21___closed__1;
-x_3 = lean_unsigned_to_nat(922u);
+x_3 = lean_unsigned_to_nat(966u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_Lean_Expr_getRevArg_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9684,7 +9735,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_appFn_x21___closed__1;
-x_3 = lean_unsigned_to_nat(956u);
+x_3 = lean_unsigned_to_nat(1000u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_Lean_Expr_appFn_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9733,7 +9784,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_appArg_x21___closed__1;
-x_3 = lean_unsigned_to_nat(960u);
+x_3 = lean_unsigned_to_nat(1004u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_Lean_Expr_appFn_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9782,7 +9833,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_appFn_x21_x27___closed__1;
-x_3 = lean_unsigned_to_nat(965u);
+x_3 = lean_unsigned_to_nat(1009u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Expr_appFn_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9840,7 +9891,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_appArg_x21_x27___closed__1;
-x_3 = lean_unsigned_to_nat(970u);
+x_3 = lean_unsigned_to_nat(1014u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Expr_appFn_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9906,7 +9957,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_sortLevel_x21___closed__1;
-x_3 = lean_unsigned_to_nat(974u);
+x_3 = lean_unsigned_to_nat(1018u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_Expr_sortLevel_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -9972,7 +10023,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_litValue_x21___closed__1;
-x_3 = lean_unsigned_to_nat(978u);
+x_3 = lean_unsigned_to_nat(1022u);
 x_4 = lean_unsigned_to_nat(13u);
 x_5 = l_Lean_Expr_litValue_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10199,7 +10250,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_constName_x21___closed__1;
-x_3 = lean_unsigned_to_nat(997u);
+x_3 = lean_unsigned_to_nat(1041u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Expr_constName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10286,7 +10337,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_constLevels_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1005u);
+x_3 = lean_unsigned_to_nat(1049u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Expr_constName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10336,7 +10387,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_bvarIdx_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1009u);
+x_3 = lean_unsigned_to_nat(1053u);
 x_4 = lean_unsigned_to_nat(16u);
 x_5 = l_Lean_Expr_bvarIdx_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10402,7 +10453,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_fvarId_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1013u);
+x_3 = lean_unsigned_to_nat(1057u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_Expr_fvarId_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10461,7 +10512,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_mvarId_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1017u);
+x_3 = lean_unsigned_to_nat(1061u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_Expr_mvarId_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10511,7 +10562,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_bindingName_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1022u);
+x_3 = lean_unsigned_to_nat(1066u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Expr_bindingName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10569,7 +10620,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_bindingDomain_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1027u);
+x_3 = lean_unsigned_to_nat(1071u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Expr_bindingName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10627,7 +10678,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_bindingBody_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1032u);
+x_3 = lean_unsigned_to_nat(1076u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Expr_bindingName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10695,7 +10746,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_bindingInfo_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1037u);
+x_3 = lean_unsigned_to_nat(1081u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l_Lean_Expr_bindingName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10755,7 +10806,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_letName_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1041u);
+x_3 = lean_unsigned_to_nat(1085u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Expr_letName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10804,7 +10855,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_letType_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1045u);
+x_3 = lean_unsigned_to_nat(1089u);
 x_4 = lean_unsigned_to_nat(19u);
 x_5 = l_Lean_Expr_letName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10853,7 +10904,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_letValue_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1049u);
+x_3 = lean_unsigned_to_nat(1093u);
 x_4 = lean_unsigned_to_nat(21u);
 x_5 = l_Lean_Expr_letName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10902,7 +10953,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_letBody_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1053u);
+x_3 = lean_unsigned_to_nat(1097u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Expr_letName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -10985,7 +11036,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_mdataExpr_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1061u);
+x_3 = lean_unsigned_to_nat(1105u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Expr_mdataExpr_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -11042,7 +11093,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_projExpr_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1065u);
+x_3 = lean_unsigned_to_nat(1109u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Expr_projExpr_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -11091,7 +11142,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_projIdx_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1069u);
+x_3 = lean_unsigned_to_nat(1113u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Expr_projExpr_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -12950,7 +13001,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateApp_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1419u);
+x_3 = lean_unsigned_to_nat(1463u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Expr_appFn_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13029,7 +13080,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateConst_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1430u);
+x_3 = lean_unsigned_to_nat(1474u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Expr_constName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13095,7 +13146,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateSort_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1441u);
+x_3 = lean_unsigned_to_nat(1485u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateSort_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13166,7 +13217,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateMData_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1452u);
+x_3 = lean_unsigned_to_nat(1496u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateMData_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13234,7 +13285,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateProj_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateProj_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13305,7 +13356,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateForall_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1478u);
+x_3 = lean_unsigned_to_nat(1522u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateForall_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13408,7 +13459,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_updateForallE_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateForall_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13514,7 +13565,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateLambda_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1498u);
+x_3 = lean_unsigned_to_nat(1542u);
 x_4 = lean_unsigned_to_nat(19u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateLambda_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13617,7 +13668,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_Expr_mkData___closed__5;
 x_2 = l_Lean_Expr_updateLambdaE_x21___closed__1;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l___private_Lean_Expr_0__Lean_Expr_updateLambda_x21Impl___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13715,7 +13766,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_Expr_mkData___closed__5;
 x_2 = l___private_Lean_Expr_0__Lean_Expr_updateLet_x21Impl___closed__1;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Lean_Expr_letName_x21___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/KeyedDeclsAttribute.c b/stage0/stdlib/Lean/KeyedDeclsAttribute.c
index d5aecbe3c4..4a24b6921f 100644
--- a/stage0/stdlib/Lean/KeyedDeclsAttribute.c
+++ b/stage0/stdlib/Lean/KeyedDeclsAttribute.c
@@ -43,7 +43,6 @@ lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__9___closed__1;
 static lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__9___closed__8;
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_KeyedDeclsAttribute_getEntries___spec__8(lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___closed__4;
 LEAN_EXPORT uint8_t l_Std_PersistentHashMap_isEmpty___at_Lean_KeyedDeclsAttribute_getEntries___spec__11(lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -339,6 +338,7 @@ LEAN_EXPORT lean_object* l_Std_AssocList_contains___at___private_Lean_KeyedDecls
 LEAN_EXPORT lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_replace___at___private_Lean_KeyedDeclsAttribute_0__Lean_KeyedDeclsAttribute_Table_insert___spec__32(lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Lean_Attribute_Builtin_getId(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* _init_l_Lean_KeyedDeclsAttribute_Def_builtinName___default() {
@@ -5971,7 +5971,7 @@ x_17 = l_Lean_KeyedDeclsAttribute_init___rarg___lambda__10___closed__4;
 x_18 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_18, x_9, x_10, x_11);
+x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_18, x_9, x_10, x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 x_20 = !lean_is_exclusive(x_19);
diff --git a/stage0/stdlib/Lean/Linter/MissingDocs.c b/stage0/stdlib/Lean/Linter/MissingDocs.c
index 249960bb14..ee80edc7b5 100644
--- a/stage0/stdlib/Lean/Linter/MissingDocs.c
+++ b/stage0/stdlib/Lean/Linter/MissingDocs.c
@@ -38,7 +38,6 @@ lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_MissingDocs_mkHandlerUnsafe___closed__4;
 static lean_object* l_Lean_Linter_MissingDocs_declModifiersPubNoDoc___closed__3;
 static lean_object* l_Lean_Linter_MissingDocs_lintDeclHead___closed__14;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Linter_MissingDocs_SimpleHandler_toHandler___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Linter_linter_missingDocs;
 static lean_object* l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757____closed__16;
@@ -284,6 +283,7 @@ LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Linter_MissingDocs_c
 static lean_object* l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757____closed__17;
 static lean_object* l___regBuiltin_Lean_Linter_MissingDocs_checkSimpLike___closed__6;
 static lean_object* l___regBuiltin_Lean_Linter_MissingDocs_checkClassAbbrev___closed__4;
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_MissingDocs_lintDeclHead___closed__11;
 LEAN_EXPORT lean_object* l_Lean_Elab_elabSetOption___at_Lean_Linter_MissingDocs_handleIn___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_356____lambda__4(lean_object*, lean_object*);
@@ -325,7 +325,6 @@ static lean_object* l_Lean_Linter_MissingDocs_checkRegisterSimpAttr___closed__1;
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_MissingDocs___hyg_8____closed__1;
 static lean_object* l_Array_anyMUnsafe_any___at_Lean_Linter_MissingDocs_hasInheritDoc___spec__1___closed__7;
 static lean_object* l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757____lambda__4___closed__1;
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___regBuiltin_Lean_Linter_MissingDocs_checkInit(lean_object*);
 static lean_object* l___regBuiltin_Lean_Linter_MissingDocs_checkSyntaxAbbrev___closed__3;
 static lean_object* l_Lean_Linter_getLinterMissingDocs___closed__1;
@@ -484,6 +483,7 @@ LEAN_EXPORT lean_object* l_IO_ofExcept___at_Lean_Linter_MissingDocs_mkHandlerUns
 static lean_object* l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757____closed__12;
 LEAN_EXPORT lean_object* l_Lean_Linter_MissingDocs_addBuiltinHandler(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Nat_decEq___boxed(lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -2360,7 +2360,7 @@ x_23 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_24 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_24, 0, x_22);
 lean_ctor_set(x_24, 1, x_23);
-x_25 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_24, x_5, x_6, x_17);
+x_25 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_24, x_5, x_6, x_17);
 lean_dec(x_6);
 lean_dec(x_5);
 x_26 = !lean_is_exclusive(x_25);
@@ -2419,7 +2419,7 @@ x_43 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_44 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_44, 0, x_42);
 lean_ctor_set(x_44, 1, x_43);
-x_45 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_44, x_5, x_6, x_17);
+x_45 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_44, x_5, x_6, x_17);
 lean_dec(x_6);
 lean_dec(x_5);
 x_46 = !lean_is_exclusive(x_45);
@@ -2616,7 +2616,7 @@ x_14 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_15 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_15, 0, x_13);
 lean_ctor_set(x_15, 1, x_14);
-x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_15, x_6, x_7, x_8);
+x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_15, x_6, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 x_17 = !lean_is_exclusive(x_16);
@@ -2711,7 +2711,7 @@ lean_ctor_set(x_19, 0, x_1);
 lean_ctor_set(x_19, 1, x_18);
 x_20 = l_Lean_Linter_MissingDocs_addHandler___closed__1;
 x_21 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_20, x_3, x_19);
-x_22 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_21, x_5, x_6, x_17);
+x_22 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_21, x_5, x_6, x_17);
 return x_22;
 }
 else
@@ -2820,7 +2820,7 @@ x_24 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_25 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_25, 0, x_23);
 lean_ctor_set(x_25, 1, x_24);
-x_26 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_25, x_6, x_7, x_18);
+x_26 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_25, x_6, x_7, x_18);
 lean_dec(x_7);
 lean_dec(x_6);
 x_27 = !lean_is_exclusive(x_26);
@@ -2878,7 +2878,7 @@ x_44 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_45 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_45, 0, x_43);
 lean_ctor_set(x_45, 1, x_44);
-x_46 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_45, x_6, x_7, x_18);
+x_46 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_45, x_6, x_7, x_18);
 lean_dec(x_7);
 lean_dec(x_6);
 x_47 = !lean_is_exclusive(x_46);
@@ -3071,7 +3071,7 @@ x_19 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_20 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_20, 0, x_18);
 lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_20, x_6, x_7, x_11);
+x_21 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_20, x_6, x_7, x_11);
 lean_dec(x_7);
 lean_dec(x_6);
 x_22 = !lean_is_exclusive(x_21);
@@ -3117,7 +3117,7 @@ x_14 = l_Lean_Linter_MissingDocs_initFn____x40_Lean_Linter_MissingDocs___hyg_757
 x_15 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_15, 0, x_13);
 lean_ctor_set(x_15, 1, x_14);
-x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_15, x_6, x_7, x_8);
+x_16 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_15, x_6, x_7, x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 x_17 = !lean_is_exclusive(x_16);
diff --git a/stage0/stdlib/Lean/Linter/UnusedVariables.c b/stage0/stdlib/Lean/Linter/UnusedVariables.c
index 9b53939c6c..d12b35be6e 100644
--- a/stage0/stdlib/Lean/Linter/UnusedVariables.c
+++ b/stage0/stdlib/Lean/Linter/UnusedVariables.c
@@ -37,7 +37,6 @@ LEAN_EXPORT lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Linter_getUnusedVariablesIgnoreFnsImpl___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_463____lambda__1___closed__7;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_InfoTree_hasSorry(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_InfoTree_visitM_go___at_Lean_Linter_unusedVariables___spec__24(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_usize_dec_eq(size_t, size_t);
@@ -300,6 +299,7 @@ static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hy
 lean_object* l_List_filterMap___at_Lean_Linter_collectMacroExpansions_x3f_go___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_Linter_unusedVariables___spec__25(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1713____lambda__1___closed__10;
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_List_forIn_loop___at_Lean_Linter_unusedVariables___spec__32___lambda__1___closed__5;
 lean_object* l_Lean_Linter_logLint(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_381____lambda__1___closed__4;
@@ -331,7 +331,6 @@ static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hy
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1475____closed__1;
 static lean_object* l_Lean_Elab_InfoTree_visitM_go___at_Lean_Linter_unusedVariables___spec__24___closed__3;
 static lean_object* l_Array_foldrMUnsafe_fold___at_Lean_Linter_unusedVariables___spec__35___closed__1;
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_293____lambda__1___closed__7;
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_225____lambda__1___closed__5;
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1885____lambda__4___closed__2;
@@ -520,6 +519,7 @@ static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hy
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_225____lambda__1___closed__12;
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_545____lambda__5___closed__10;
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_71____closed__1;
 static lean_object* l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1885____closed__13;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -4121,7 +4121,7 @@ lean_inc(x_9);
 lean_dec(x_7);
 x_10 = l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1885____lambda__1___closed__1;
 x_11 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_10, x_9, x_1);
-x_12 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_11, x_3, x_4, x_8);
+x_12 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_11, x_3, x_4, x_8);
 return x_12;
 }
 }
@@ -4177,7 +4177,7 @@ if (x_13 == 0)
 lean_object* x_14; lean_object* x_15; uint8_t x_16; 
 lean_dec(x_1);
 x_14 = l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1885____lambda__2___closed__3;
-x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_14, x_4, x_5, x_9);
+x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_14, x_4, x_5, x_9);
 lean_dec(x_5);
 lean_dec(x_4);
 x_16 = !lean_is_exclusive(x_15);
@@ -4275,7 +4275,7 @@ lean_object* x_12; lean_object* x_13; uint8_t x_14;
 lean_dec(x_2);
 lean_dec(x_1);
 x_12 = l_Lean_Linter_initFn____x40_Lean_Linter_UnusedVariables___hyg_1885____lambda__3___closed__2;
-x_13 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_12, x_5, x_6, x_9);
+x_13 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_12, x_5, x_6, x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 x_14 = !lean_is_exclusive(x_13);
diff --git a/stage0/stdlib/Lean/Meta/Basic.c b/stage0/stdlib/Lean/Meta/Basic.c
index 7c4365cd07..37fe7c9999 100644
--- a/stage0/stdlib/Lean/Meta/Basic.c
+++ b/stage0/stdlib/Lean/Meta/Basic.c
@@ -589,6 +589,7 @@ size_t lean_usize_of_nat(lean_object*);
 static lean_object* l_Lean_Meta_mkLevelStuckErrorMessage___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Meta_withLocalDecl___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_lambdaMetaTelescope_process___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_setEnv___at_Lean_Meta_setInlineAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instBEqProd___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1972,17 +1973,19 @@ return x_5;
 static lean_object* _init_l_Lean_Meta_instInhabitedSavedState___closed__5() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Meta_instInhabitedSavedState___closed__1;
 x_2 = l_Lean_Meta_instInhabitedSavedState___closed__2;
 x_3 = l_Lean_Meta_ParamInfo_backDeps___default___closed__1;
-x_4 = l_Lean_Meta_instInhabitedSavedState___closed__4;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Meta_instInhabitedSavedState___closed__4;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Meta_instInhabitedSavedState___closed__6() {
diff --git a/stage0/stdlib/Lean/Meta/Closure.c b/stage0/stdlib/Lean/Meta/Closure.c
index e1e2f7ca80..40dfb3d754 100644
--- a/stage0/stdlib/Lean/Meta/Closure.c
+++ b/stage0/stdlib/Lean/Meta/Closure.c
@@ -3995,7 +3995,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__2;
-x_3 = lean_unsigned_to_nat(1452u);
+x_3 = lean_unsigned_to_nat(1496u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4024,7 +4024,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__5;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__6;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4053,7 +4053,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__8;
-x_3 = lean_unsigned_to_nat(1419u);
+x_3 = lean_unsigned_to_nat(1463u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__9;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4082,7 +4082,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__11;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__12;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4111,7 +4111,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__14;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__15;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4140,7 +4140,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_Meta_Closure_collectExprAux___closed__1;
 x_2 = l_Lean_Meta_Closure_collectExprAux___closed__17;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Lean_Meta_Closure_collectExprAux___closed__18;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Meta/ExprDefEq.c b/stage0/stdlib/Lean/Meta/ExprDefEq.c
index f823636e79..b0c9a811a8 100644
--- a/stage0/stdlib/Lean/Meta/ExprDefEq.c
+++ b/stage0/stdlib/Lean/Meta/ExprDefEq.c
@@ -16681,7 +16681,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_Meta_CheckAssignment_check___closed__1;
 x_2 = l_Lean_Meta_CheckAssignment_check___closed__2;
-x_3 = lean_unsigned_to_nat(1452u);
+x_3 = lean_unsigned_to_nat(1496u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Meta_CheckAssignment_check___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -16710,7 +16710,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_Meta_CheckAssignment_check___closed__1;
 x_2 = l_Lean_Meta_CheckAssignment_check___closed__5;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Meta_CheckAssignment_check___closed__6;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -16739,7 +16739,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_Meta_CheckAssignment_check___closed__1;
 x_2 = l_Lean_Meta_CheckAssignment_check___closed__8;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_Lean_Meta_CheckAssignment_check___closed__9;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -16768,7 +16768,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_Meta_CheckAssignment_check___closed__1;
 x_2 = l_Lean_Meta_CheckAssignment_check___closed__11;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l_Lean_Meta_CheckAssignment_check___closed__12;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -16797,7 +16797,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_Meta_CheckAssignment_check___closed__1;
 x_2 = l_Lean_Meta_CheckAssignment_check___closed__14;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Lean_Meta_CheckAssignment_check___closed__15;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Meta/ExprLens.c b/stage0/stdlib/Lean/Meta/ExprLens.c
index 643832134f..1e144b19fe 100644
--- a/stage0/stdlib/Lean/Meta/ExprLens.c
+++ b/stage0/stdlib/Lean/Meta/ExprLens.c
@@ -403,7 +403,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_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__1;
 x_2 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__2;
-x_3 = lean_unsigned_to_nat(1419u);
+x_3 = lean_unsigned_to_nat(1463u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -581,7 +581,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_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__1;
 x_2 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__8___closed__1;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__8___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -782,7 +782,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_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__1;
 x_2 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__10___closed__1;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__10___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -906,7 +906,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_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__3___closed__1;
 x_2 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__11___closed__1;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l___private_Lean_Meta_ExprLens_0__Lean_Meta_lensCoord___rarg___lambda__11___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Meta/Instances.c b/stage0/stdlib/Lean/Meta/Instances.c
index 7a5ecf4a50..5cae11c70a 100644
--- a/stage0/stdlib/Lean/Meta/Instances.c
+++ b/stage0/stdlib/Lean/Meta/Instances.c
@@ -34,7 +34,6 @@ LEAN_EXPORT lean_object* l_Lean_Meta_Instances_erase___at_Lean_Meta_initFn____x4
 LEAN_EXPORT uint8_t l_Array_contains___at_Lean_Meta_addInstanceEntry___spec__11(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux___at_Lean_Meta_addInstanceEntry___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_Instances_discrTree___default___closed__1;
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Instances___hyg_308____closed__5;
 static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Instances___hyg_500____closed__22;
@@ -337,6 +336,7 @@ lean_object* l_Lean_Meta_DiscrTree_instInhabitedTrie(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_isInstance(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_empty(lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_binInsertM___at_Lean_Meta_addInstanceEntry___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Instances___hyg_1280____closed__7;
@@ -4092,7 +4092,7 @@ x_11 = l_Lean_Meta_Instances_erase___rarg___closed__4;
 x_12 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
-x_13 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_12, x_3, x_4, x_5);
+x_13 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_12, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 x_14 = !lean_is_exclusive(x_13);
@@ -8301,7 +8301,7 @@ lean_object* x_14; lean_object* x_15; uint8_t x_16;
 lean_dec(x_10);
 lean_dec(x_1);
 x_14 = l_Lean_Meta_initFn____x40_Lean_Meta_Instances___hyg_1280____lambda__2___closed__2;
-x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_14, x_4, x_5, x_11);
+x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_14, x_4, x_5, x_11);
 lean_dec(x_5);
 lean_dec(x_4);
 x_16 = !lean_is_exclusive(x_15);
diff --git a/stage0/stdlib/Lean/Meta/Match/MatchEqs.c b/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
index 62e06461a7..d7da53a0d2 100644
--- a/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
+++ b/stage0/stdlib/Lean/Meta/Match/MatchEqs.c
@@ -172,7 +172,7 @@ LEAN_EXPORT lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_Match_forallAltTelescope(lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Match_forallAltTelescope_go___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallMetaBoundedTelescope(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(size_t, size_t, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Meta_Match_forallAltTelescope_isNamedPatternProof___lambda__1(lean_object*, lean_object*);
@@ -520,7 +520,7 @@ LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_M
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_withIncRecDepth___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__18(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_Meta_Match_MatchEqs_0__Lean_Meta_Match_simpH_x3f___closed__3;
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12690_(lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12694_(lean_object*);
 static lean_object* l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_proveSubgoalLoop___lambda__1___closed__3;
 LEAN_EXPORT lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertCastEqRec___spec__6___lambda__1(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_mapTRAux___at___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_mkSplitterProof_convertTemplate___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -6145,135 +6145,136 @@ lean_inc(x_2);
 x_7 = l_Lean_Meta_substVars(x_1, x_2, x_3, x_4, x_5, x_6);
 if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_8 = lean_ctor_get(x_7, 0);
 lean_inc(x_8);
 x_9 = lean_ctor_get(x_7, 1);
 lean_inc(x_9);
 lean_dec(x_7);
-x_10 = lean_unsigned_to_nat(5u);
+x_10 = lean_box(0);
+x_11 = lean_unsigned_to_nat(5u);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
 lean_inc(x_8);
-x_11 = l_Lean_Meta_injections(x_8, x_10, x_2, x_3, x_4, x_5, x_9);
-if (lean_obj_tag(x_11) == 0)
-{
-lean_object* x_12; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
+x_12 = l_Lean_Meta_injections(x_8, x_10, x_11, x_2, x_3, x_4, x_5, x_9);
 if (lean_obj_tag(x_12) == 0)
 {
-uint8_t x_13; 
+lean_object* x_13; 
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+if (lean_obj_tag(x_13) == 0)
+{
+uint8_t x_14; 
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_13 = !lean_is_exclusive(x_11);
-if (x_13 == 0)
+x_14 = !lean_is_exclusive(x_12);
+if (x_14 == 0)
 {
-lean_object* x_14; uint8_t x_15; lean_object* x_16; 
-x_14 = lean_ctor_get(x_11, 0);
-lean_dec(x_14);
-x_15 = 1;
-x_16 = lean_box(x_15);
-lean_ctor_set(x_11, 0, x_16);
-return x_11;
+lean_object* x_15; uint8_t x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_12, 0);
+lean_dec(x_15);
+x_16 = 1;
+x_17 = lean_box(x_16);
+lean_ctor_set(x_12, 0, x_17);
+return x_12;
 }
 else
 {
-lean_object* x_17; uint8_t x_18; lean_object* x_19; lean_object* x_20; 
-x_17 = lean_ctor_get(x_11, 1);
-lean_inc(x_17);
-lean_dec(x_11);
-x_18 = 1;
-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_17);
-return x_20;
+lean_object* x_18; uint8_t x_19; lean_object* x_20; lean_object* x_21; 
+x_18 = lean_ctor_get(x_12, 1);
+lean_inc(x_18);
+lean_dec(x_12);
+x_19 = 1;
+x_20 = lean_box(x_19);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_18);
+return x_21;
 }
 }
 else
 {
-lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_21 = lean_ctor_get(x_11, 1);
-lean_inc(x_21);
-lean_dec(x_11);
-x_22 = lean_ctor_get(x_12, 0);
+lean_object* x_22; lean_object* x_23; uint8_t x_24; 
+x_22 = lean_ctor_get(x_12, 1);
 lean_inc(x_22);
 lean_dec(x_12);
-x_23 = lean_name_eq(x_22, x_8);
-if (x_23 == 0)
-{
-lean_object* x_24; 
-lean_dec(x_8);
-x_24 = l_Lean_Meta_Match_SimpH_trySubstVarsAndContradiction(x_22, x_2, x_3, x_4, x_5, x_21);
-return x_24;
-}
-else
+x_23 = lean_ctor_get(x_13, 0);
+lean_inc(x_23);
+lean_dec(x_13);
+x_24 = lean_name_eq(x_23, x_8);
+if (x_24 == 0)
 {
 lean_object* x_25; 
-lean_dec(x_22);
-x_25 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_contradiction(x_8, x_2, x_3, x_4, x_5, x_21);
+lean_dec(x_8);
+x_25 = l_Lean_Meta_Match_SimpH_trySubstVarsAndContradiction(x_23, x_2, x_3, x_4, x_5, x_22);
 return x_25;
 }
+else
+{
+lean_object* x_26; 
+lean_dec(x_23);
+x_26 = l___private_Lean_Meta_Match_MatchEqs_0__Lean_Meta_Match_SimpH_contradiction(x_8, x_2, x_3, x_4, x_5, x_22);
+return x_26;
+}
 }
 }
 else
 {
-uint8_t x_26; 
+uint8_t x_27; 
 lean_dec(x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_26 = !lean_is_exclusive(x_11);
-if (x_26 == 0)
+x_27 = !lean_is_exclusive(x_12);
+if (x_27 == 0)
 {
-return x_11;
+return x_12;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_11, 0);
-x_28 = lean_ctor_get(x_11, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_12, 0);
+x_29 = lean_ctor_get(x_12, 1);
+lean_inc(x_29);
 lean_inc(x_28);
-lean_inc(x_27);
-lean_dec(x_11);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
+lean_dec(x_12);
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
 }
 }
 }
 else
 {
-uint8_t x_30; 
+uint8_t x_31; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_30 = !lean_is_exclusive(x_7);
-if (x_30 == 0)
+x_31 = !lean_is_exclusive(x_7);
+if (x_31 == 0)
 {
 return x_7;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_7, 0);
-x_32 = lean_ctor_get(x_7, 1);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_7, 0);
+x_33 = lean_ctor_get(x_7, 1);
+lean_inc(x_33);
 lean_inc(x_32);
-lean_inc(x_31);
 lean_dec(x_7);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
 }
 }
 }
@@ -36925,7 +36926,7 @@ lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12690_(lean_object* x_1) {
+LEAN_EXPORT lean_object* l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12694_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; lean_object* x_4; 
@@ -37388,7 +37389,7 @@ l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec_
 l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__2 = _init_l_Std_PersistentHashMap_findAux___at_Lean_Meta_Match_getEquationsForImpl___spec__2___closed__2();
 l_Lean_Meta_Match_getEquationsForImpl___closed__1 = _init_l_Lean_Meta_Match_getEquationsForImpl___closed__1();
 lean_mark_persistent(l_Lean_Meta_Match_getEquationsForImpl___closed__1);
-res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12690_(lean_io_mk_world());
+res = l_Lean_Meta_Match_initFn____x40_Lean_Meta_Match_MatchEqs___hyg_12694_(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/Meta/RecursorInfo.c b/stage0/stdlib/Lean/Meta/RecursorInfo.c
index 10cb17f0dc..8e11bbdc52 100644
--- a/stage0/stdlib/Lean/Meta/RecursorInfo.c
+++ b/stage0/stdlib/Lean/Meta/RecursorInfo.c
@@ -34,7 +34,6 @@ static lean_object* l_Lean_Meta_Attribute_Recursor_getMajorPos___closed__13;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Name_str___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Expr_withAppAux___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_mkRecursorInfoAux___spec__2___lambda__1___boxed(lean_object**);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_getIdx_x3f___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__1___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_RecursorInfo___hyg_2880____closed__6;
@@ -352,6 +351,7 @@ uint8_t l_Lean_Expr_isSort(lean_object*);
 static lean_object* l_Lean_Meta_RecursorInfo_instToStringRecursorInfo___closed__11;
 LEAN_EXPORT lean_object* l_Lean_Meta_RecursorInfo_numIndices___boxed(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Meta_RecursorInfo_0__Lean_Meta_getMajorPosDepElim___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Meta_RecursorInfo_0__Lean_Meta_checkMotiveResultType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -9093,7 +9093,7 @@ x_7 = lean_ctor_get(x_3, 5);
 x_8 = l_Lean_replaceRef(x_1, x_7);
 lean_dec(x_7);
 lean_ctor_set(x_3, 5, x_8);
-x_9 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_2, x_3, x_4, x_5);
+x_9 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_2, x_3, x_4, x_5);
 lean_dec(x_3);
 return x_9;
 }
@@ -9137,7 +9137,7 @@ lean_ctor_set(x_22, 7, x_17);
 lean_ctor_set(x_22, 8, x_18);
 lean_ctor_set(x_22, 9, x_19);
 lean_ctor_set(x_22, 10, x_20);
-x_23 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_2, x_22, x_4, x_5);
+x_23 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_2, x_22, x_4, x_5);
 lean_dec(x_22);
 return x_23;
 }
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Injection.c b/stage0/stdlib/Lean/Meta/Tactic/Injection.c
index 20946086ad..6bc9c443df 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Injection.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Injection.c
@@ -32,7 +32,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_getCtorNumPropFields(lean_object*, lean_obj
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_injectionCore___lambda__1___closed__11;
-LEAN_EXPORT lean_object* l_Lean_Meta_injections___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_injections___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appFn_x21(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
@@ -40,12 +40,12 @@ static lean_object* l_Lean_Meta_injections_go___closed__2;
 static lean_object* l_Std_Range_forIn_loop___at_Lean_Meta_getCtorNumPropFields___spec__1___closed__4;
 lean_object* l_Lean_MVarId_withContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appArg_x21(lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_injections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_injectionIntro_go___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_Std_Range_forIn_loop___at_Lean_Meta_getCtorNumPropFields___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_injections_go___closed__4;
 static lean_object* l_Lean_Meta_injectionCore___lambda__1___closed__12;
-LEAN_EXPORT lean_object* l_Lean_Meta_injections_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Meta_injections_go(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Meta_injectionIntro(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_intro1Core(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -3170,162 +3170,163 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_injections_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_EXPORT lean_object* l_Lean_Meta_injections_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) {
 _start:
 {
-lean_object* x_10; uint8_t x_11; 
-x_10 = lean_unsigned_to_nat(0u);
-x_11 = lean_nat_dec_eq(x_2, x_10);
-if (x_11 == 0)
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_unsigned_to_nat(0u);
+x_12 = lean_nat_dec_eq(x_2, x_11);
+if (x_12 == 0)
 {
 if (lean_obj_tag(x_3) == 0)
 {
-lean_object* x_12; lean_object* x_13; 
+lean_object* x_13; lean_object* x_14; 
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
-x_12 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_12, 0, x_4);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_9);
-return x_13;
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_4);
+lean_ctor_set(x_13, 1, x_5);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_10);
+return x_14;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_14 = lean_ctor_get(x_3, 0);
-lean_inc(x_14);
-x_15 = lean_ctor_get(x_3, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_15 = lean_ctor_get(x_3, 0);
 lean_inc(x_15);
+x_16 = lean_ctor_get(x_3, 1);
+lean_inc(x_16);
 lean_dec(x_3);
-x_16 = lean_unsigned_to_nat(1u);
-x_17 = lean_nat_sub(x_2, x_16);
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = lean_nat_sub(x_2, x_17);
 lean_dec(x_2);
-x_18 = lean_nat_add(x_17, x_16);
-lean_inc(x_5);
-lean_inc(x_14);
-x_19 = l_Lean_FVarId_getType(x_14, x_5, x_6, x_7, x_8, x_9);
-if (lean_obj_tag(x_19) == 0)
+x_19 = lean_nat_add(x_18, x_17);
+lean_inc(x_6);
+lean_inc(x_15);
+x_20 = l_Lean_FVarId_getType(x_15, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_20) == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_ctor_get(x_19, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 1);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
-lean_dec(x_19);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
-x_22 = l_Lean_Meta_matchEqHEq_x3f(x_20, x_5, x_6, x_7, x_8, x_21);
-if (lean_obj_tag(x_22) == 0)
-{
-lean_object* x_23; 
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
+x_23 = l_Lean_Meta_matchEqHEq_x3f(x_21, x_6, x_7, x_8, x_9, x_22);
 if (lean_obj_tag(x_23) == 0)
 {
 lean_object* x_24; 
-lean_dec(x_17);
-lean_dec(x_14);
-x_24 = lean_ctor_get(x_22, 1);
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-x_2 = x_18;
-x_3 = x_15;
-x_9 = x_24;
-goto _start;
-}
-else
+if (lean_obj_tag(x_24) == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_26 = lean_ctor_get(x_23, 0);
-lean_inc(x_26);
+lean_object* x_25; 
+lean_dec(x_18);
+lean_dec(x_15);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
 lean_dec(x_23);
-x_27 = lean_ctor_get(x_26, 1);
+x_2 = x_19;
+x_3 = x_16;
+x_10 = x_25;
+goto _start;
+}
+else
+{
+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_27 = lean_ctor_get(x_24, 0);
 lean_inc(x_27);
-lean_dec(x_26);
-x_28 = lean_ctor_get(x_22, 1);
+lean_dec(x_24);
+x_28 = lean_ctor_get(x_27, 1);
 lean_inc(x_28);
-lean_dec(x_22);
-x_29 = lean_ctor_get(x_27, 0);
-lean_inc(x_29);
-x_30 = lean_ctor_get(x_27, 1);
-lean_inc(x_30);
 lean_dec(x_27);
+x_29 = lean_ctor_get(x_23, 1);
+lean_inc(x_29);
+lean_dec(x_23);
+x_30 = lean_ctor_get(x_28, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_28, 1);
+lean_inc(x_31);
+lean_dec(x_28);
+lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
-x_31 = lean_whnf(x_29, x_5, x_6, x_7, x_8, x_28);
-if (lean_obj_tag(x_31) == 0)
+x_32 = lean_whnf(x_30, x_6, x_7, x_8, x_9, x_29);
+if (lean_obj_tag(x_32) == 0)
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_31, 0);
-lean_inc(x_32);
-x_33 = lean_ctor_get(x_31, 1);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_32, 0);
 lean_inc(x_33);
-lean_dec(x_31);
+x_34 = lean_ctor_get(x_32, 1);
+lean_inc(x_34);
+lean_dec(x_32);
+lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
-x_34 = lean_whnf(x_30, x_5, x_6, x_7, x_8, x_33);
-if (lean_obj_tag(x_34) == 0)
+x_35 = lean_whnf(x_31, x_6, x_7, x_8, x_9, x_34);
+if (lean_obj_tag(x_35) == 0)
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_79; 
-x_35 = lean_ctor_get(x_34, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_34, 1);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_80; 
+x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
-lean_dec(x_34);
-x_79 = l_Lean_Expr_isNatLit(x_32);
-lean_dec(x_32);
-if (x_79 == 0)
-{
-lean_object* x_80; 
+x_37 = lean_ctor_get(x_35, 1);
+lean_inc(x_37);
 lean_dec(x_35);
-x_80 = lean_box(0);
-x_37 = x_80;
-goto block_78;
+x_80 = l_Lean_Expr_isNatLit(x_33);
+lean_dec(x_33);
+if (x_80 == 0)
+{
+lean_object* x_81; 
+lean_dec(x_36);
+x_81 = lean_box(0);
+x_38 = x_81;
+goto block_79;
 }
 else
 {
-uint8_t x_81; 
-x_81 = l_Lean_Expr_isNatLit(x_35);
-lean_dec(x_35);
-if (x_81 == 0)
+uint8_t x_82; 
+x_82 = l_Lean_Expr_isNatLit(x_36);
+lean_dec(x_36);
+if (x_82 == 0)
 {
-lean_object* x_82; 
-x_82 = lean_box(0);
-x_37 = x_82;
-goto block_78;
+lean_object* x_83; 
+x_83 = lean_box(0);
+x_38 = x_83;
+goto block_79;
 }
 else
 {
-lean_dec(x_17);
-lean_dec(x_14);
-x_2 = x_18;
-x_3 = x_15;
-x_9 = x_36;
+lean_dec(x_18);
+lean_dec(x_15);
+x_2 = x_19;
+x_3 = x_16;
+x_10 = x_37;
 goto _start;
 }
 }
-block_78:
+block_79:
 {
-lean_object* x_38; lean_object* x_39; 
-lean_dec(x_37);
-x_38 = lean_box(0);
+lean_object* x_39; 
+lean_dec(x_38);
+lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_39 = l_Lean_Meta_injection(x_4, x_14, x_38, x_5, x_6, x_7, x_8, x_36);
+x_39 = l_Lean_Meta_injection(x_4, x_15, x_5, x_6, x_7, x_8, x_9, x_37);
 if (lean_obj_tag(x_39) == 0)
 {
 lean_object* x_40; 
@@ -3334,9 +3335,10 @@ lean_inc(x_40);
 if (lean_obj_tag(x_40) == 0)
 {
 uint8_t x_41; 
+lean_dec(x_19);
 lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
+lean_dec(x_16);
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@@ -3368,7 +3370,7 @@ return x_46;
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
 x_47 = lean_ctor_get(x_39, 1);
 lean_inc(x_47);
 lean_dec(x_39);
@@ -3376,333 +3378,343 @@ x_48 = lean_ctor_get(x_40, 0);
 lean_inc(x_48);
 x_49 = lean_ctor_get(x_40, 1);
 lean_inc(x_49);
+x_50 = lean_ctor_get(x_40, 2);
+lean_inc(x_50);
 lean_dec(x_40);
-x_50 = lean_array_to_list(lean_box(0), x_49);
-lean_inc(x_15);
-x_51 = l_List_appendTR___rarg(x_50, x_15);
+x_51 = lean_array_to_list(lean_box(0), x_49);
+lean_inc(x_16);
+x_52 = l_List_appendTR___rarg(x_51, x_16);
 lean_inc(x_48);
 lean_inc(x_1);
-x_52 = lean_alloc_closure((void*)(l_Lean_Meta_injections_go), 9, 4);
-lean_closure_set(x_52, 0, x_1);
-lean_closure_set(x_52, 1, x_17);
-lean_closure_set(x_52, 2, x_51);
-lean_closure_set(x_52, 3, x_48);
+x_53 = lean_alloc_closure((void*)(l_Lean_Meta_injections_go), 10, 5);
+lean_closure_set(x_53, 0, x_1);
+lean_closure_set(x_53, 1, x_18);
+lean_closure_set(x_53, 2, x_52);
+lean_closure_set(x_53, 3, x_48);
+lean_closure_set(x_53, 4, x_50);
+lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
-x_53 = l_Lean_MVarId_withContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__2___rarg(x_48, x_52, x_5, x_6, x_7, x_8, x_47);
-if (lean_obj_tag(x_53) == 0)
+x_54 = l_Lean_MVarId_withContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__2___rarg(x_48, x_53, x_6, x_7, x_8, x_9, x_47);
+if (lean_obj_tag(x_54) == 0)
 {
-uint8_t x_54; 
-lean_dec(x_18);
-lean_dec(x_15);
-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_54 = !lean_is_exclusive(x_53);
-if (x_54 == 0)
-{
-return x_53;
-}
-else
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-x_55 = lean_ctor_get(x_53, 0);
-x_56 = lean_ctor_get(x_53, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_53);
-x_57 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_57, 0, x_55);
-lean_ctor_set(x_57, 1, x_56);
-return x_57;
-}
-}
-else
-{
-lean_object* x_58; lean_object* x_59; 
-x_58 = lean_ctor_get(x_53, 1);
-lean_inc(x_58);
-lean_dec(x_53);
-x_59 = l_Lean_Meta_injections_go(x_1, x_18, x_15, x_4, x_5, x_6, x_7, x_8, x_58);
-if (lean_obj_tag(x_59) == 0)
-{
-uint8_t x_60; 
-x_60 = !lean_is_exclusive(x_59);
-if (x_60 == 0)
-{
-return x_59;
-}
-else
-{
-lean_object* x_61; lean_object* x_62; lean_object* x_63; 
-x_61 = lean_ctor_get(x_59, 0);
-x_62 = lean_ctor_get(x_59, 1);
-lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_59);
-x_63 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_63, 0, x_61);
-lean_ctor_set(x_63, 1, x_62);
-return x_63;
-}
-}
-else
-{
-uint8_t x_64; 
-x_64 = !lean_is_exclusive(x_59);
-if (x_64 == 0)
-{
-return x_59;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_65 = lean_ctor_get(x_59, 0);
-x_66 = lean_ctor_get(x_59, 1);
-lean_inc(x_66);
-lean_inc(x_65);
-lean_dec(x_59);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_66);
-return x_67;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_68; lean_object* x_69; 
-lean_dec(x_17);
-x_68 = lean_ctor_get(x_39, 1);
-lean_inc(x_68);
-lean_dec(x_39);
-x_69 = l_Lean_Meta_injections_go(x_1, x_18, x_15, x_4, x_5, x_6, x_7, x_8, x_68);
-if (lean_obj_tag(x_69) == 0)
-{
-uint8_t x_70; 
-x_70 = !lean_is_exclusive(x_69);
-if (x_70 == 0)
-{
-return x_69;
-}
-else
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = lean_ctor_get(x_69, 0);
-x_72 = lean_ctor_get(x_69, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_69);
-x_73 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-else
-{
-uint8_t x_74; 
-x_74 = !lean_is_exclusive(x_69);
-if (x_74 == 0)
-{
-return x_69;
-}
-else
-{
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_69, 0);
-x_76 = lean_ctor_get(x_69, 1);
-lean_inc(x_76);
-lean_inc(x_75);
-lean_dec(x_69);
-x_77 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_77, 0, x_75);
-lean_ctor_set(x_77, 1, x_76);
-return x_77;
-}
-}
-}
-}
-}
-else
-{
-uint8_t x_84; 
-lean_dec(x_32);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-lean_dec(x_14);
-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_84 = !lean_is_exclusive(x_34);
-if (x_84 == 0)
-{
-return x_34;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_34, 0);
-x_86 = lean_ctor_get(x_34, 1);
-lean_inc(x_86);
-lean_inc(x_85);
-lean_dec(x_34);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
-}
-}
-}
-else
-{
-uint8_t x_88; 
-lean_dec(x_30);
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-lean_dec(x_14);
-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_88 = !lean_is_exclusive(x_31);
-if (x_88 == 0)
-{
-return x_31;
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_31, 0);
-x_90 = lean_ctor_get(x_31, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_31);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
-lean_ctor_set(x_91, 1, x_90);
-return x_91;
-}
-}
-}
-}
-else
-{
-uint8_t x_92; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-lean_dec(x_14);
-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_92 = !lean_is_exclusive(x_22);
-if (x_92 == 0)
-{
-return x_22;
-}
-else
-{
-lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_22, 0);
-x_94 = lean_ctor_get(x_22, 1);
-lean_inc(x_94);
-lean_inc(x_93);
-lean_dec(x_22);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_93);
-lean_ctor_set(x_95, 1, x_94);
-return x_95;
-}
-}
-}
-else
-{
-uint8_t x_96; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_15);
-lean_dec(x_14);
-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_96 = !lean_is_exclusive(x_19);
-if (x_96 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-x_97 = lean_ctor_get(x_19, 0);
-x_98 = lean_ctor_get(x_19, 1);
-lean_inc(x_98);
-lean_inc(x_97);
+uint8_t x_55; 
 lean_dec(x_19);
-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;
+lean_dec(x_16);
+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_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
+{
+return x_54;
+}
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_54, 0);
+x_57 = lean_ctor_get(x_54, 1);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_54);
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_56);
+lean_ctor_set(x_58, 1, x_57);
+return x_58;
+}
+}
+else
+{
+lean_object* x_59; lean_object* x_60; 
+x_59 = lean_ctor_get(x_54, 1);
+lean_inc(x_59);
+lean_dec(x_54);
+x_60 = l_Lean_Meta_injections_go(x_1, x_19, x_16, x_4, x_5, x_6, x_7, x_8, x_9, x_59);
+if (lean_obj_tag(x_60) == 0)
+{
+uint8_t x_61; 
+x_61 = !lean_is_exclusive(x_60);
+if (x_61 == 0)
+{
+return x_60;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_60, 0);
+x_63 = lean_ctor_get(x_60, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_60);
+x_64 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_64, 0, x_62);
+lean_ctor_set(x_64, 1, x_63);
+return x_64;
+}
+}
+else
+{
+uint8_t x_65; 
+x_65 = !lean_is_exclusive(x_60);
+if (x_65 == 0)
+{
+return x_60;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_66 = lean_ctor_get(x_60, 0);
+x_67 = lean_ctor_get(x_60, 1);
+lean_inc(x_67);
+lean_inc(x_66);
+lean_dec(x_60);
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+return x_68;
+}
 }
 }
 }
 }
 else
 {
-lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+lean_object* x_69; lean_object* x_70; 
+lean_dec(x_18);
+x_69 = lean_ctor_get(x_39, 1);
+lean_inc(x_69);
+lean_dec(x_39);
+x_70 = l_Lean_Meta_injections_go(x_1, x_19, x_16, x_4, x_5, x_6, x_7, x_8, x_9, x_69);
+if (lean_obj_tag(x_70) == 0)
+{
+uint8_t x_71; 
+x_71 = !lean_is_exclusive(x_70);
+if (x_71 == 0)
+{
+return x_70;
+}
+else
+{
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_70, 0);
+x_73 = lean_ctor_get(x_70, 1);
+lean_inc(x_73);
+lean_inc(x_72);
+lean_dec(x_70);
+x_74 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
+}
+}
+else
+{
+uint8_t x_75; 
+x_75 = !lean_is_exclusive(x_70);
+if (x_75 == 0)
+{
+return x_70;
+}
+else
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_76 = lean_ctor_get(x_70, 0);
+x_77 = lean_ctor_get(x_70, 1);
+lean_inc(x_77);
+lean_inc(x_76);
+lean_dec(x_70);
+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;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_85; 
+lean_dec(x_33);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_16);
+lean_dec(x_15);
+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_85 = !lean_is_exclusive(x_35);
+if (x_85 == 0)
+{
+return x_35;
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_86 = lean_ctor_get(x_35, 0);
+x_87 = lean_ctor_get(x_35, 1);
+lean_inc(x_87);
+lean_inc(x_86);
+lean_dec(x_35);
+x_88 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_88, 0, x_86);
+lean_ctor_set(x_88, 1, x_87);
+return x_88;
+}
+}
+}
+else
+{
+uint8_t x_89; 
+lean_dec(x_31);
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_16);
+lean_dec(x_15);
+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_89 = !lean_is_exclusive(x_32);
+if (x_89 == 0)
+{
+return x_32;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_32, 0);
+x_91 = lean_ctor_get(x_32, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_32);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
+}
+}
+}
+}
+else
+{
+uint8_t x_93; 
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_16);
+lean_dec(x_15);
+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_93 = !lean_is_exclusive(x_23);
+if (x_93 == 0)
+{
+return x_23;
+}
+else
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; 
+x_94 = lean_ctor_get(x_23, 0);
+x_95 = lean_ctor_get(x_23, 1);
+lean_inc(x_95);
+lean_inc(x_94);
+lean_dec(x_23);
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+return x_96;
+}
+}
+}
+else
+{
+uint8_t x_97; 
+lean_dec(x_19);
+lean_dec(x_18);
+lean_dec(x_16);
+lean_dec(x_15);
+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_97 = !lean_is_exclusive(x_20);
+if (x_97 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_98 = lean_ctor_get(x_20, 0);
+x_99 = lean_ctor_get(x_20, 1);
+lean_inc(x_99);
+lean_inc(x_98);
+lean_dec(x_20);
+x_100 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_100, 0, x_98);
+lean_ctor_set(x_100, 1, x_99);
+return x_100;
+}
+}
+}
+}
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_100 = l_Lean_Meta_injections_go___closed__2;
-x_101 = l_Lean_Meta_injections_go___closed__5;
-x_102 = l_Lean_Meta_throwTacticEx___rarg(x_100, x_1, x_101, x_5, x_6, x_7, x_8, x_9);
-return x_102;
+x_101 = l_Lean_Meta_injections_go___closed__2;
+x_102 = l_Lean_Meta_injections_go___closed__5;
+x_103 = l_Lean_Meta_throwTacticEx___rarg(x_101, x_1, x_102, x_6, x_7, x_8, x_9, x_10);
+return x_103;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_injections___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+LEAN_EXPORT lean_object* l_Lean_Meta_injections___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_ctor_get(x_3, 1);
-lean_inc(x_8);
-x_9 = l_Lean_LocalContext_getFVarIds(x_8);
-x_10 = lean_array_to_list(lean_box(0), x_9);
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = lean_ctor_get(x_4, 1);
+lean_inc(x_9);
+x_10 = l_Lean_LocalContext_getFVarIds(x_9);
+x_11 = lean_array_to_list(lean_box(0), x_10);
 lean_inc(x_1);
-x_11 = l_Lean_Meta_injections_go(x_1, x_2, x_10, x_1, x_3, x_4, x_5, x_6, x_7);
-return x_11;
+x_12 = l_Lean_Meta_injections_go(x_1, x_2, x_11, x_1, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_12;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Meta_injections(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_EXPORT lean_object* l_Lean_Meta_injections(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
-lean_object* x_8; lean_object* x_9; 
+lean_object* x_9; lean_object* x_10; 
 lean_inc(x_1);
-x_8 = lean_alloc_closure((void*)(l_Lean_Meta_injections___lambda__1), 7, 2);
-lean_closure_set(x_8, 0, x_1);
-lean_closure_set(x_8, 1, x_2);
-x_9 = l_Lean_MVarId_withContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__2___rarg(x_1, x_8, x_3, x_4, x_5, x_6, x_7);
-return x_9;
+x_9 = lean_alloc_closure((void*)(l_Lean_Meta_injections___lambda__1), 8, 3);
+lean_closure_set(x_9, 0, x_1);
+lean_closure_set(x_9, 1, x_3);
+lean_closure_set(x_9, 2, x_2);
+x_10 = l_Lean_MVarId_withContext___at___private_Lean_Meta_SynthInstance_0__Lean_Meta_synthPendingImp___spec__2___rarg(x_1, x_9, x_4, x_5, x_6, x_7, x_8);
+return x_10;
 }
 }
 lean_object* initialize_Init(uint8_t builtin, lean_object*);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c
index bd69a47ca3..b1bb92e7d4 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c
@@ -2017,7 +2017,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_Meta_Tactic_Simp_Main_0__Lean_Meta_Simp_mkImpCongr___closed__1;
 x_2 = l___private_Lean_Meta_Tactic_Simp_Main_0__Lean_Meta_Simp_mkImpCongr___closed__2;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l___private_Lean_Meta_Tactic_Simp_Main_0__Lean_Meta_Simp_mkImpCongr___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -37977,7 +37977,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_Meta_Tactic_Simp_Main_0__Lean_Meta_Simp_mkImpCongr___closed__1;
 x_2 = l_Lean_Meta_Simp_simp_simpProj___lambda__1___closed__1;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Meta_Simp_simp_simpProj___lambda__1___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
index 616db94fe7..ada9ef306b 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpTheorems.c
@@ -50,7 +50,6 @@ lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta____root____Lean__Parser__Command__registerSimpAttr__1___closed__25;
 static lean_object* l_Lean_Meta_SimpTheorems_erase___rarg___closed__4;
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta____root____Lean__Parser__Command__registerSimpAttr__1___closed__86;
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta____root____Lean__Parser__Command__registerSimpAttr__1___closed__97;
 lean_object* l_Lean_throwError___at_Lean_Meta_setInlineAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -645,6 +644,7 @@ LEAN_EXPORT lean_object* l_Lean_Meta_SimpTheorem_levelParams___default;
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Meta_DiscrTree_insertCore___at_Lean_Meta_addSimpTheoremEntry___spec__1___closed__8;
 static lean_object* l_Lean_Meta___aux__Lean__Meta__Tactic__Simp__SimpTheorems______macroRules__Lean__Meta____root____Lean__Parser__Command__registerSimpAttr__1___closed__37;
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forIn_loop___at___private_Lean_Meta_Tactic_Simp_SimpTheorems_0__Lean_Meta_mkSimpTheoremsFromConst___spec__1(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*);
 static lean_object* l_Lean_Meta_instInhabitedSimpTheorem___closed__1;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -11927,7 +11927,7 @@ x_13 = l_Lean_Meta_SimpTheorems_erase___rarg___closed__4;
 x_14 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_14, 0, x_12);
 lean_ctor_set(x_14, 1, x_13);
-x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_14, x_3, x_4, x_5);
+x_15 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_14, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 x_16 = !lean_is_exclusive(x_15);
@@ -14040,7 +14040,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_Meta_SimpTheorem_getValue___closed__1;
 x_2 = l_Lean_Meta_SimpTheorem_getValue___closed__2;
-x_3 = lean_unsigned_to_nat(1430u);
+x_3 = lean_unsigned_to_nat(1474u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Meta_SimpTheorem_getValue___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/Meta/Transform.c b/stage0/stdlib/Lean/Meta/Transform.c
index 8b855e7959..616b650261 100644
--- a/stage0/stdlib/Lean/Meta/Transform.c
+++ b/stage0/stdlib/Lean/Meta/Transform.c
@@ -782,7 +782,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_Core_transform_visit___rarg___lambda__2___closed__1;
 x_2 = l_Lean_Core_transform_visit___rarg___lambda__2___closed__2;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_Lean_Core_transform_visit___rarg___lambda__2___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -920,7 +920,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_Core_transform_visit___rarg___lambda__2___closed__1;
 x_2 = l_Lean_Core_transform_visit___rarg___lambda__4___closed__1;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l_Lean_Core_transform_visit___rarg___lambda__4___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -1058,7 +1058,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_Core_transform_visit___rarg___lambda__2___closed__1;
 x_2 = l_Lean_Core_transform_visit___rarg___lambda__6___closed__1;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Lean_Core_transform_visit___rarg___lambda__6___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -1230,7 +1230,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_Core_transform_visit___rarg___lambda__2___closed__1;
 x_2 = l_Lean_Core_transform_visit___rarg___lambda__9___closed__1;
-x_3 = lean_unsigned_to_nat(1452u);
+x_3 = lean_unsigned_to_nat(1496u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_Core_transform_visit___rarg___lambda__9___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -1302,7 +1302,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_Core_transform_visit___rarg___lambda__2___closed__1;
 x_2 = l_Lean_Core_transform_visit___rarg___lambda__10___closed__1;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_Core_transform_visit___rarg___lambda__10___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/MetavarContext.c b/stage0/stdlib/Lean/MetavarContext.c
index 2439add349..e928c8df7b 100644
--- a/stage0/stdlib/Lean/MetavarContext.c
+++ b/stage0/stdlib/Lean/MetavarContext.c
@@ -12763,7 +12763,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__9___closed__2;
-x_3 = lean_unsigned_to_nat(1441u);
+x_3 = lean_unsigned_to_nat(1485u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__9___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -12844,7 +12844,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__10___closed__1;
-x_3 = lean_unsigned_to_nat(1430u);
+x_3 = lean_unsigned_to_nat(1474u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__10___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -12926,7 +12926,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__11___closed__1;
-x_3 = lean_unsigned_to_nat(1509u);
+x_3 = lean_unsigned_to_nat(1553u);
 x_4 = lean_unsigned_to_nat(20u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__11___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13064,7 +13064,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__13___closed__1;
-x_3 = lean_unsigned_to_nat(1489u);
+x_3 = lean_unsigned_to_nat(1533u);
 x_4 = lean_unsigned_to_nat(24u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__13___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13202,7 +13202,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__15___closed__1;
-x_3 = lean_unsigned_to_nat(1518u);
+x_3 = lean_unsigned_to_nat(1562u);
 x_4 = lean_unsigned_to_nat(22u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__15___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13370,7 +13370,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__18___closed__1;
-x_3 = lean_unsigned_to_nat(1452u);
+x_3 = lean_unsigned_to_nat(1496u);
 x_4 = lean_unsigned_to_nat(17u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__18___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -13454,7 +13454,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_instantiateExprMVars___rarg___lambda__9___closed__1;
 x_2 = l_Lean_instantiateExprMVars___rarg___lambda__19___closed__1;
-x_3 = lean_unsigned_to_nat(1463u);
+x_3 = lean_unsigned_to_nat(1507u);
 x_4 = lean_unsigned_to_nat(18u);
 x_5 = l_Lean_instantiateExprMVars___rarg___lambda__19___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
diff --git a/stage0/stdlib/Lean/Parser/Extension.c b/stage0/stdlib/Lean/Parser/Extension.c
index aa667a62c4..a935664322 100644
--- a/stage0/stdlib/Lean/Parser/Extension.c
+++ b/stage0/stdlib/Lean/Parser/Extension.c
@@ -48,7 +48,6 @@ LEAN_EXPORT lean_object* l_Std_PersistentHashMap_foldlMAux___at___private_Lean_P
 LEAN_EXPORT lean_object* l_Lean_Parser_parserOfStack___elambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Parser_Extension_0__Lean_Parser_addBuiltinParserCategory___closed__1;
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_mkModuleData___spec__3___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Parser_ParserExtension_instInhabitedOLeanEntry___closed__1;
 static lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Extension___hyg_3903____closed__8;
 LEAN_EXPORT lean_object* l_Lean_Parser_instCoeParserParserAliasValue(lean_object*);
@@ -661,6 +660,7 @@ static lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Extension___hyg_3693
 static lean_object* l___private_Lean_Parser_Extension_0__Lean_Parser_BuiltinParserAttribute_add___lambda__2___closed__15;
 static lean_object* l___private_Lean_Parser_Extension_0__Lean_Parser_BuiltinParserAttribute_add___lambda__2___closed__18;
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_RBNode_find___at_Lean_Parser_getAlias___spec__1(lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Parser_evalInsideQuot(lean_object*, lean_object*);
@@ -11171,7 +11171,7 @@ x_17 = l___private_Lean_Parser_Extension_0__Lean_Parser_BuiltinParserAttribute_a
 x_18 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_18, x_6, x_7, x_11);
+x_19 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_18, x_6, x_7, x_11);
 lean_dec(x_7);
 lean_dec(x_6);
 x_20 = !lean_is_exclusive(x_19);
@@ -11661,7 +11661,7 @@ x_23 = l_List_forM___at___private_Lean_Parser_Extension_0__Lean_Parser_ParserAtt
 x_24 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_24, 0, x_22);
 lean_ctor_set(x_24, 1, x_23);
-x_25 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__3(x_24, x_4, x_5, x_15);
+x_25 = l_Lean_throwError___at_Lean_registerTagAttribute___spec__2(x_24, x_4, x_5, x_15);
 lean_dec(x_5);
 lean_dec(x_4);
 x_26 = !lean_is_exclusive(x_25);
diff --git a/stage0/stdlib/Lean/ParserCompiler/Attribute.c b/stage0/stdlib/Lean/ParserCompiler/Attribute.c
index a1e1752673..f492704e6d 100644
--- a/stage0/stdlib/Lean/ParserCompiler/Attribute.c
+++ b/stage0/stdlib/Lean/ParserCompiler/Attribute.c
@@ -78,6 +78,7 @@ lean_object* l_Std_RBNode_find___at___private_Lean_Hygiene_0__Lean_sanitizeSynta
 static lean_object* l_Lean_ParserCompiler_registerCombinatorAttribute___closed__7;
 lean_object* l_Lean_registerBuiltinAttribute(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_AttributeImpl_erase___default___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_ParserCompiler_instInhabitedCombinatorAttribute___closed__3;
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
@@ -85,7 +86,6 @@ lean_object* l_Lean_SimplePersistentEnvExtension_getState___rarg(lean_object*, l
 LEAN_EXPORT lean_object* l_Lean_ofExcept___at_Lean_ParserCompiler_CombinatorAttribute_runDeclFor___spec__3(lean_object*);
 lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___lambda__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_ParserCompiler_instInhabitedCombinatorAttribute___lambda__4___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_list_to_array(lean_object*, lean_object*);
 static lean_object* l_Lean_ParserCompiler_instInhabitedCombinatorAttribute___closed__7;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
@@ -597,7 +597,7 @@ x_17 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_17, 0, x_13);
 lean_ctor_set(x_17, 1, x_2);
 x_18 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_1, x_11, x_17);
-x_19 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_18, x_5, x_6, x_16);
+x_19 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_18, x_5, x_6, x_16);
 lean_dec(x_6);
 lean_dec(x_5);
 return x_19;
diff --git a/stage0/stdlib/Lean/Server/References.c b/stage0/stdlib/Lean/Server/References.c
index f6cbb0a128..a48bfa62eb 100644
--- a/stage0/stdlib/Lean/Server/References.c
+++ b/stage0/stdlib/Lean/Server/References.c
@@ -259,6 +259,7 @@ size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Std_AssocList_find_x3f___at_Lean_Server_dedupReferences___spec__3___boxed(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Server_dedupReferences___spec__2(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Lsp_RefInfo_merge(lean_object*, lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_instBEqProd___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_foldl___at_Lean_Server_References_allRefs___spec__12(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_filterTRAux___at_Lean_Server_References_removeIlean___spec__4___boxed(lean_object*, lean_object*, lean_object*);
@@ -561,17 +562,19 @@ return x_5;
 static lean_object* _init_l_Lean_Server_instInhabitedReference___closed__11() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Server_instInhabitedReference___closed__4;
 x_2 = l_Lean_Server_instInhabitedReference___closed__8;
 x_3 = l_Lean_Server_Reference_aliases___default___closed__1;
-x_4 = l_Lean_Server_instInhabitedReference___closed__10;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Server_instInhabitedReference___closed__10;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Server_instInhabitedReference___closed__12() {
diff --git a/stage0/stdlib/Lean/Server/Snapshots.c b/stage0/stdlib/Lean/Server/Snapshots.c
index c11c128c76..0e65bc6fd8 100644
--- a/stage0/stdlib/Lean/Server/Snapshots.c
+++ b/stage0/stdlib/Lean/Server/Snapshots.c
@@ -90,6 +90,7 @@ LEAN_EXPORT lean_object* l_Lean_Server_Snapshots_initFn____x40_Lean_Server_Snaps
 LEAN_EXPORT lean_object* l_Lean_Server_Snapshots_initFn____x40_Lean_Server_Snapshots___hyg_6_(lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Server_Snapshots_Snapshot_runCommandElabM(lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_Lean_Widget_InteractiveDiagnostic_toDiagnostic(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Server_Snapshots_Snapshot_diagnostics(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Server_Snapshots_parseNextCmd(lean_object*, lean_object*, lean_object*);
@@ -310,17 +311,19 @@ return x_5;
 static lean_object* _init_l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__8() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Server_Snapshots_instInhabitedSnapshot___closed__2;
 x_2 = l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__4;
 x_3 = l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__5;
-x_4 = l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__7;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__7;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Server_Snapshots_instInhabitedSnapshot___closed__9() {
diff --git a/stage0/stdlib/Lean/Widget/Basic.c b/stage0/stdlib/Lean/Widget/Basic.c
index c399e0ea76..c93639eb2e 100644
--- a/stage0/stdlib/Lean/Widget/Basic.c
+++ b/stage0/stdlib/Lean/Widget/Basic.c
@@ -43,6 +43,7 @@ static uint32_t l_Lean_Widget_instInhabitedInfoWithCtx___closed__7;
 static lean_object* l_Lean_Widget_instFromJsonFVarId___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Widget_instImpl____x40_Lean_Widget_Basic___hyg_33_;
 LEAN_EXPORT lean_object* l_Lean_Widget_instImpl____x40_Lean_Widget_Basic___hyg_53_;
+extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT lean_object* l_Lean_Widget_instToJsonMVarId(lean_object*);
 static lean_object* l_Lean_Widget_instInhabitedInfoWithCtx___closed__16;
 static lean_object* l_Lean_Widget_instImpl____x40_Lean_Widget_Basic___hyg_33____closed__6;
@@ -159,17 +160,19 @@ return x_5;
 static lean_object* _init_l_Lean_Widget_instInhabitedInfoWithCtx___closed__9() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Widget_instInhabitedInfoWithCtx___closed__1;
 x_2 = l_Lean_Widget_instInhabitedInfoWithCtx___closed__5;
 x_3 = l_Lean_Widget_instInhabitedInfoWithCtx___closed__6;
-x_4 = l_Lean_Widget_instInhabitedInfoWithCtx___closed__8;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Widget_instInhabitedInfoWithCtx___closed__8;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Widget_instInhabitedInfoWithCtx___closed__10() {
diff --git a/stage0/stdlib/Lean/Widget/InteractiveCode.c b/stage0/stdlib/Lean/Widget/InteractiveCode.c
index df295708ff..fa3fb5f94a 100644
--- a/stage0/stdlib/Lean/Widget/InteractiveCode.c
+++ b/stage0/stdlib/Lean/Widget/InteractiveCode.c
@@ -72,6 +72,7 @@ LEAN_EXPORT lean_object* l_Lean_Widget_CodeWithInfos_pretty(lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Widget_InteractiveCode_0__Lean_Widget_toJsonRpcEncodablePacket____x40_Lean_Widget_InteractiveCode___hyg_113____boxed(lean_object*);
 static lean_object* l_Lean_Widget_instInhabitedSubexprInfo___closed__9;
 extern lean_object* l_Lean_pp_explicit;
+extern lean_object* l_Lean_NameSet_empty;
 static lean_object* l_Lean_Widget_instRpcEncodableSubexprInfo___closed__3;
 static lean_object* l_Lean_Widget_instInhabitedSubexprInfo___closed__3;
 static lean_object* l_Lean_Widget_instInhabitedSubexprInfo___closed__15;
@@ -195,17 +196,19 @@ return x_5;
 static lean_object* _init_l_Lean_Widget_instInhabitedSubexprInfo___closed__9() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Widget_instInhabitedSubexprInfo___closed__1;
 x_2 = l_Lean_Widget_instInhabitedSubexprInfo___closed__5;
 x_3 = l_Lean_Widget_instInhabitedSubexprInfo___closed__6;
-x_4 = l_Lean_Widget_instInhabitedSubexprInfo___closed__8;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Widget_instInhabitedSubexprInfo___closed__8;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Widget_instInhabitedSubexprInfo___closed__10() {
diff --git a/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c b/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
index e71d144d58..aa49d46f46 100644
--- a/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
+++ b/stage0/stdlib/Lean/Widget/InteractiveDiagnostic.c
@@ -196,6 +196,7 @@ static lean_object* l_Lean_Widget_instRpcEncodableDiagnosticWith_dec____x40_Lean
 static lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_msgToInteractiveAux___closed__1;
 size_t lean_usize_of_nat(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Widget_msgToInteractive(lean_object*, uint8_t, lean_object*, lean_object*);
+extern lean_object* l_Lean_NameSet_empty;
 LEAN_EXPORT lean_object* l_Lean_Widget_InteractiveDiagnostic_toDiagnostic(lean_object*);
 static lean_object* l_Lean_Widget_instRpcEncodableDiagnosticWith_enc____x40_Lean_Widget_InteractiveDiagnostic___hyg_1523____rarg___closed__3;
 static lean_object* l___private_Lean_Widget_InteractiveDiagnostic_0__Lean_Widget_fromJsonRpcEncodablePacket____x40_Lean_Widget_InteractiveDiagnostic___hyg_1597____closed__5;
@@ -15577,17 +15578,19 @@ return x_5;
 static lean_object* _init_l_Lean_Widget_instInhabitedEmbedFmt___closed__9() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+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_Widget_instInhabitedEmbedFmt___closed__1;
 x_2 = l_Lean_Widget_instInhabitedEmbedFmt___closed__5;
 x_3 = l_Lean_Widget_instInhabitedEmbedFmt___closed__6;
-x_4 = l_Lean_Widget_instInhabitedEmbedFmt___closed__8;
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+x_4 = l_Lean_NameSet_empty;
+x_5 = l_Lean_Widget_instInhabitedEmbedFmt___closed__8;
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 static lean_object* _init_l_Lean_Widget_instInhabitedEmbedFmt___closed__10() {
diff --git a/stage0/stdlib/Lean/Widget/UserWidget.c b/stage0/stdlib/Lean/Widget/UserWidget.c
index 78497dc780..7faf6121c4 100644
--- a/stage0/stdlib/Lean/Widget/UserWidget.c
+++ b/stage0/stdlib/Lean/Widget/UserWidget.c
@@ -186,6 +186,7 @@ LEAN_EXPORT lean_object* l_Lean_ofExcept___at___private_Lean_Widget_UserWidget_0
 static lean_object* l_Lean_Elab_pushInfoLeaf___at_Lean_Widget_elabWidgetCmd___spec__3___closed__2;
 static lean_object* l_Lean_Widget_widgetCmd___closed__2;
 static lean_object* l___private_Lean_Widget_UserWidget_0__Lean_Widget_attributeImpl___closed__6;
+lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Widget_instFromJsonGetWidgetSourceParams___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Widget_UserWidget_0__Lean_Widget_fromJsonUserWidgetDefinition____x40_Lean_Widget_UserWidget___hyg_162_(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Server_wrapRpcProcedure___at_Lean_Widget_getWidgets___rpc__wrapped___spec__1(lean_object*, lean_object*);
@@ -202,7 +203,6 @@ LEAN_EXPORT lean_object* l_Lean_Elab_pushInfoLeaf___at_Lean_Widget_elabWidgetCmd
 static lean_object* l_Lean_Widget_getWidgetSource___closed__1;
 LEAN_EXPORT lean_object* l_Lean_Widget_initFn____x40_Lean_Widget_UserWidget___hyg_423____lambda__2___boxed(lean_object*);
 static lean_object* l_Lean_Widget_instFromJsonGetWidgetsResponse___closed__1;
-lean_object* l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Widget_initFn____x40_Lean_Widget_UserWidget___hyg_423____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Widget_getWidgets___spec__2___closed__1;
 static lean_object* l_Lean_Widget_instFromJsonUserWidgetInstance___closed__1;
@@ -4022,7 +4022,7 @@ lean_ctor_set(x_21, 0, x_20);
 lean_ctor_set(x_21, 1, x_1);
 x_22 = l___private_Lean_Widget_UserWidget_0__Lean_Widget_attributeImpl___elambda__2___closed__2;
 x_23 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_22, x_19, x_21);
-x_24 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__2(x_23, x_4, x_5, x_13);
+x_24 = l_Lean_setEnv___at_Lean_registerTagAttribute___spec__1(x_23, x_4, x_5, x_13);
 lean_dec(x_5);
 lean_dec(x_4);
 return x_24;