diff --git a/stage0/src/Init/Data/Array/Basic.lean b/stage0/src/Init/Data/Array/Basic.lean
index a7ec43b635..a24ee3b74d 100644
--- a/stage0/src/Init/Data/Array/Basic.lean
+++ b/stage0/src/Init/Data/Array/Basic.lean
@@ -793,4 +793,8 @@ def allDiff [BEq α] (as : Array α) : Bool :=
 def zip (as : Array α) (bs : Array β) : Array (α × β) :=
   zipWith as bs Prod.mk
 
+def split (as : Array α) (p : α → Bool) : Array α × Array α :=
+  as.foldl (init := (#[], #[])) fun (as, bs) a =>
+    if p a then (as.push a, bs) else (as, bs.push a)
+
 end Array
diff --git a/stage0/src/Init/Meta.lean b/stage0/src/Init/Meta.lean
index d7673fd02b..bf1f28d811 100644
--- a/stage0/src/Init/Meta.lean
+++ b/stage0/src/Init/Meta.lean
@@ -866,6 +866,10 @@ structure Config where
   decide     : Bool := true
   deriving Inhabited, BEq, Repr
 
+-- Configuration object for `simp_all`
+structure ConfigCtx extends Config where
+  contextual := true
+
 end Meta.Simp
 
 end Lean
diff --git a/stage0/src/Init/SimpLemmas.lean b/stage0/src/Init/SimpLemmas.lean
index 57651d34c9..9a239a0ed4 100644
--- a/stage0/src/Init/SimpLemmas.lean
+++ b/stage0/src/Init/SimpLemmas.lean
@@ -86,5 +86,8 @@ namespace Lean.Simp
 @[simp] theorem Or_False (p : Prop) : (p ∨ False) = p := propext <| Iff.intro (fun | Or.inl h => h | Or.inr h => False.elim h) (fun h => Or.inl h)
 @[simp] theorem False_Or (p : Prop) : (False ∨ p) = p := propext <| Iff.intro (fun | Or.inr h => h | Or.inl h => False.elim h) (fun h => Or.inr h)
 @[simp] theorem Iff_self (p : Prop) : (p ↔ p) = True := propext <| Iff.intro (fun h => trivial) (fun _ => Iff.intro id id)
+@[simp] theorem False_arrow (p : Prop) : (False → p) = True := propext <| Iff.intro (fun _ => trivial) (by intros; trivial)
+@[simp] theorem arrow_True (p : Prop) : (p → True) = True := propext <| Iff.intro (fun _ => trivial) (by intros; trivial)
+@[simp] theorem True_arrow (p : Prop) : (True → p) = p := propext <| Iff.intro (fun h => h trivial) (by intros; trivial)
 
 end Lean.Simp
diff --git a/stage0/src/Lean/Elab/App.lean b/stage0/src/Lean/Elab/App.lean
index 4707f5ef07..a705abb518 100644
--- a/stage0/src/Lean/Elab/App.lean
+++ b/stage0/src/Lean/Elab/App.lean
@@ -69,12 +69,12 @@ private def tryCoeFun? (α : Expr) (a : Expr) : TermElabM (Option Expr) := do
   let type ← mkArrow α (mkSort v)
   let γ ← mkFreshExprMVar type
   let u ← getLevel α
-  let coeFunInstType := mkAppN (Lean.mkConst `CoeFun [u, v]) #[α, γ]
+  let coeFunInstType := mkAppN (Lean.mkConst ``CoeFun [u, v]) #[α, γ]
   let mvar ← mkFreshExprMVar coeFunInstType MetavarKind.synthetic
   let mvarId := mvar.mvarId!
   try
     if (← synthesizeCoeInstMVarCore mvarId) then
-      expandCoe <| mkAppN (Lean.mkConst `coeFun [u, v]) #[α, γ, a, mvar]
+      expandCoe <| mkAppN (Lean.mkConst ``coeFun [u, v]) #[α, γ, a, mvar]
     else
       return none
   catch _ =>
@@ -217,9 +217,9 @@ private def shouldPropagateExpectedTypeFor (nextArg : Arg) : Bool :=
   | Arg.expr _  => false -- it has already been elaborated
   | Arg.stx stx =>
     -- TODO: make this configurable?
-    stx.getKind != `Lean.Parser.Term.hole &&
-    stx.getKind != `Lean.Parser.Term.syntheticHole &&
-    stx.getKind != `Lean.Parser.Term.byTactic
+    stx.getKind != ``Lean.Parser.Term.hole &&
+    stx.getKind != ``Lean.Parser.Term.syntheticHole &&
+    stx.getKind != ``Lean.Parser.Term.byTactic
 
 /-
   Auxiliary method for propagating the expected type. We call it as soon as we find the first explict
@@ -422,7 +422,7 @@ private def processImplicitArg (k : M Expr) : M Expr := do
 /- Return true if the next argument at `args` is of the form `_` -/
 private def isNextArgHole : M Bool := do
   match (← get).args with
-  | Arg.stx (Syntax.node `Lean.Parser.Term.hole _) :: _ => pure true
+  | Arg.stx (Syntax.node ``Lean.Parser.Term.hole _) :: _ => pure true
   | _ => pure false
 
 /-
@@ -897,18 +897,18 @@ partial def expandArgs (args : Array Syntax) (pattern := false) : TermElabM (Arr
   let (args, ellipsis) :=
     if args.isEmpty then
       (args, false)
-    else if args.back.isOfKind `Lean.Parser.Term.ellipsis then
+    else if args.back.isOfKind ``Lean.Parser.Term.ellipsis then
       (args.pop, true)
     else
       (args, false)
   let (namedArgs, args) ← args.foldlM (init := (#[], #[])) fun (namedArgs, args) stx => do
-    if stx.getKind == `Lean.Parser.Term.namedArgument then
+    if stx.getKind == ``Lean.Parser.Term.namedArgument then
       -- trailing_tparser try ("(" >> ident >> " := ") >> termParser >> ")"
       let name := stx[1].getId.eraseMacroScopes
       let val  := stx[3]
       let namedArgs ← addNamedArg namedArgs { ref := stx, name := name, val := Arg.stx val }
       return (namedArgs, args)
-    else if stx.getKind == `Lean.Parser.Term.ellipsis then
+    else if stx.getKind == ``Lean.Parser.Term.ellipsis then
       throwErrorAt stx "unexpected '..'"
     else
       return (namedArgs, args.push $ Arg.stx stx)
diff --git a/stage0/src/Lean/Elab/Attributes.lean b/stage0/src/Lean/Elab/Attributes.lean
index cca9d0b5a9..55065b7b18 100644
--- a/stage0/src/Lean/Elab/Attributes.lean
+++ b/stage0/src/Lean/Elab/Attributes.lean
@@ -33,7 +33,7 @@ instance : Inhabited Attribute where
 def toAttributeKind [Monad m] [MonadResolveName m] [MonadError m] (attrKindStx : Syntax) : m AttributeKind := do
   if attrKindStx[0].isNone then
     return AttributeKind.global
-  else if attrKindStx[0][0].getKind == `Lean.Parser.Term.scoped then
+  else if attrKindStx[0][0].getKind == ``Lean.Parser.Term.scoped then
     if (← getCurrNamespace).isAnonymous then
       throwError "scoped attributes must be used inside namespaces"
     return AttributeKind.scoped
@@ -41,7 +41,7 @@ def toAttributeKind [Monad m] [MonadResolveName m] [MonadError m] (attrKindStx :
     return AttributeKind.local
 
 def mkAttrKindGlobal : Syntax :=
-  Syntax.node `Lean.Parser.Term.attrKind #[mkNullNode]
+  Syntax.node ``Lean.Parser.Term.attrKind #[mkNullNode]
 
 def elabAttr {m} [Monad m] [MonadEnv m] [MonadResolveName m] [MonadError m] [MonadMacroAdapter m] [MonadRecDepth m] (attrInstance : Syntax) : m Attribute := do
   /- attrInstance     := ppGroup $ leading_parser attrKind >> attrParser -/
diff --git a/stage0/src/Lean/Elab/Command.lean b/stage0/src/Lean/Elab/Command.lean
index 1d248e0116..8669ed1c6a 100644
--- a/stage0/src/Lean/Elab/Command.lean
+++ b/stage0/src/Lean/Elab/Command.lean
@@ -219,7 +219,7 @@ instance : MonadRecDepth CommandElabM where
 
 builtin_initialize registerTraceClass `Elab.command
 
-partial def elabCommand (stx : Syntax) : CommandElabM Unit :=
+partial def elabCommand (stx : Syntax) : CommandElabM Unit := do
   let mkInfoTree := do
     let ctx ← read
     let s ← get
@@ -252,6 +252,10 @@ partial def elabCommand (stx : Syntax) : CommandElabM Unit :=
           | some elabFns => elabCommandUsing s stx elabFns
           | none         => throwError "elaboration function for '{k}' has not been implemented"
     | _ => throwError "unexpected command"
+  if checkTraceOption (← getOptions) `Elab.info then
+    let trees ← getInfoTrees
+    for t in trees do
+      logTrace `Elab.info m!"{← t.format}"
 
 /-- Adapt a syntax transformation to a regular, command-producing elaborator. -/
 def adaptExpander (exp : Syntax → CommandElabM Syntax) : CommandElab := fun stx => do
diff --git a/stage0/src/Lean/Elab/Frontend.lean b/stage0/src/Lean/Elab/Frontend.lean
index cf6e316ea1..cebd5772c6 100644
--- a/stage0/src/Lean/Elab/Frontend.lean
+++ b/stage0/src/Lean/Elab/Frontend.lean
@@ -39,9 +39,6 @@ def elabCommandAtFrontend (stx : Syntax) : FrontendM Unit := do
       enableInfoTree
     Command.elabCommand stx
     enableInfoTree infoTreeEnabled
-    let trees ← getInfoTrees
-    for t in trees do
-      trace `Elab.info fun _ => m!"{← t.format}"
 
 def updateCmdPos : FrontendM Unit := do
   modify fun s => { s with cmdPos := s.parserState.pos }
diff --git a/stage0/src/Lean/Elab/Match.lean b/stage0/src/Lean/Elab/Match.lean
index e60704f8be..f5f72d47f1 100644
--- a/stage0/src/Lean/Elab/Match.lean
+++ b/stage0/src/Lean/Elab/Match.lean
@@ -3,6 +3,7 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
+import Lean.Util.CollectFVars
 import Lean.Meta.Match.MatchPatternAttr
 import Lean.Meta.Match.Match
 import Lean.Meta.SortLocalDecls
@@ -576,10 +577,9 @@ private def elabPatterns (patternStxs : Array Syntax) (matchType : Expr) : Excep
       matchType ← whnf matchType
       match matchType with
       | Expr.forallE _ d b _ =>
-          let pattern ← elabTerm patternStx d
           let pattern ←
             try
-              withRef patternStx <| ensureHasType d pattern
+              liftM <| withSynthesize <| withoutErrToSorry <| elabTermEnsuringType patternStx d
             catch ex =>
               -- Wrap the type mismatch exception for the "discriminant refinement" feature.
               throwThe PatternElabException { ex := ex, idx := idx }
@@ -767,28 +767,73 @@ where
     | Except.error { idx := idx, ex := ex } =>
       let indices ← getIndicesToInclude discrs idx
       if indices.isEmpty then
-        match first? with
-        | none => throw ex
-        | some (s, ex) => s.restore; throw ex
+        throwEx (← updateFirst first? ex)
       else
-        let first? ← updateFirst first? ex
+        let first ← updateFirst first? ex
         s.restore
-        let matchType ← updateMatchType indices matchType
+        let indices ← collectDeps indices discrs
+        let matchType ←
+          try
+            updateMatchType indices matchType
+          catch ex =>
+            throwEx first
         let altViews  ← addWildcardPatterns indices.size altViews
         let discrs    := indices ++ discrs
-        loop discrs matchType altViews first?
+        loop discrs matchType altViews first
 
-  updateFirst (first? : Option (SavedState × Exception)) (ex : Exception) : TermElabM (Option (SavedState × Exception)) := do
+  throwEx {α} (p : SavedState × Exception) : TermElabM α := do
+    p.1.restore; throw p.2
+
+  updateFirst (first? : Option (SavedState × Exception)) (ex : Exception) : TermElabM (SavedState × Exception) := do
     match first? with
-    | none   => return some (← saveAllState, ex)
-    | some _ => return first?
+    | none       => return (← saveAllState, ex)
+    | some first => return first
 
-  updateMatchType (indices : Array Expr) (matchType : Expr) : TermElabM Expr :=
-    indices.foldrM (init := matchType) fun index matchType => do
+  containsFVar (es : Array Expr) (fvarId : FVarId) : Bool :=
+    es.any fun e => e.isFVar && e.fvarId! == fvarId
+
+  /- Update `indices` by including any free variable `x` s.t.
+     - Type of some `discr` depends on `x`.
+     - Type of `x` depends on some free variable in `indices`.
+
+     If we don't include these extra variables in indices, then
+     `updateMatchType` will generate a type incorrect term.
+     For example, suppose `discr` contains `h : @HEq α a α b`, and
+     `indices` is `#[α, b]`, and `matchType` is `@HEq α a α b → B`.
+     `updateMatchType indices matchType` produces the type
+     `(α' : Type) → (b : α') → @HEq α' a α' b → B` which is type incorrect
+     because we have `a : α`.
+     The method `collectDeps` will include `a` into `indices`.
+
+     This method does not handle dependencies among non-free variables.
+     We rely on the type checking method `check` at `updateMatchType`. -/
+  collectDeps (indices : Array Expr) (discrs : Array Expr) : TermElabM (Array Expr) := do
+    let mut s : CollectFVars.State := {}
+    for discr in discrs do
+      s := collectFVars s (← instantiateMVars (← inferType discr))
+    let (indicesFVar, indicesNonFVar) := indices.split Expr.isFVar
+    let indicesFVar := indicesFVar.map Expr.fvarId!
+    let mut toAdd := #[]
+    for fvarId in s.fvarSet.toList do
+      unless containsFVar discrs fvarId || containsFVar indices fvarId do
+        let localDecl ← getLocalDecl fvarId
+        let mctx ← getMCtx
+        for indexFVarId in indicesFVar do
+          if mctx.localDeclDependsOn localDecl indexFVarId then
+            toAdd := toAdd.push fvarId
+    let lctx ← getLCtx
+    let indicesFVar := (indicesFVar ++ toAdd).qsort fun fvarId₁ fvarId₂ =>
+      (lctx.get! fvarId₁).index < (lctx.get! fvarId₂).index
+    return indicesFVar.map mkFVar ++ indicesNonFVar
+
+  updateMatchType (indices : Array Expr) (matchType : Expr) : TermElabM Expr := do
+    let matchType ← indices.foldrM (init := matchType) fun index matchType => do
       let indexType ← inferType index
       let matchTypeBody ← kabstract matchType index
       let userName ← mkUserNameFor index
       return Lean.mkForall userName BinderInfo.default indexType matchTypeBody
+    check matchType
+    return matchType
 
   addWildcardPatterns (num : Nat) (altViews : Array MatchAltView) : TermElabM (Array MatchAltView) := do
     let hole := mkHole (← getRef)
@@ -1050,7 +1095,7 @@ builtin_initialize
   match stx with
   | `(nomatch $discrExpr) => do
       let expectedType ← waitExpectedType expectedType?
-      let discr := Syntax.node `Lean.Parser.Term.matchDiscr #[mkNullNode, discrExpr]
+      let discr := Syntax.node ``Lean.Parser.Term.matchDiscr #[mkNullNode, discrExpr]
       elabMatchAux #[discr] #[] mkNullNode expectedType
   | _ => throwUnsupportedSyntax
 
diff --git a/stage0/src/Lean/Elab/Tactic/Simp.lean b/stage0/src/Lean/Elab/Tactic/Simp.lean
index 08d95e729c..614a624b43 100644
--- a/stage0/src/Lean/Elab/Tactic/Simp.lean
+++ b/stage0/src/Lean/Elab/Tactic/Simp.lean
@@ -12,20 +12,30 @@ import Lean.Meta.Tactic.Replace
 namespace Lean.Elab.Tactic
 open Meta
 
-
 unsafe def evalSimpConfigUnsafe (e : Expr) : TermElabM Meta.Simp.Config :=
   Term.evalExpr Meta.Simp.Config ``Meta.Simp.Config e
-
 @[implementedBy evalSimpConfigUnsafe] constant evalSimpConfig (e : Expr) : TermElabM Meta.Simp.Config
 
-/- `optConfig` is of the form `("(" "config" ":=" term ")")?` -/
-def elabSimpConfig (optConfig : Syntax) : TermElabM Meta.Simp.Config := do
+unsafe def evalSimpConfigCtxUnsafe (e : Expr) : TermElabM Meta.Simp.ConfigCtx :=
+  Term.evalExpr Meta.Simp.ConfigCtx ``Meta.Simp.ConfigCtx e
+@[implementedBy evalSimpConfigCtxUnsafe] constant evalSimpConfigCtx (e : Expr) : TermElabM Meta.Simp.ConfigCtx
+
+/-
+  `optConfig` is of the form `("(" "config" ":=" term ")")?`
+  If `ctx == false`, the argument is assumed to have type `Meta.Simp.Config`, and `Meta.Simp.ConfigCtx` otherwise. -/
+def elabSimpConfig (optConfig : Syntax) (ctx : Bool) : TermElabM Meta.Simp.Config := do
   if optConfig.isNone then
-    return {}
+    if ctx then
+      return { : Meta.Simp.ConfigCtx }.toConfig
+    else
+      return {}
   else
     withLCtx {} {} <| withNewMCtxDepth <| Term.withSynthesize do
-      let c ← Term.elabTermEnsuringType optConfig[3] (Lean.mkConst ``Meta.Simp.Config)
-      evalSimpConfig (← instantiateMVars c)
+      let c ← Term.elabTermEnsuringType optConfig[3] (Lean.mkConst (if ctx then ``Meta.Simp.ConfigCtx else ``Meta.Simp.Config))
+      if ctx then
+        return (← evalSimpConfigCtx (← instantiateMVars c)).toConfig
+      else
+        evalSimpConfig (← instantiateMVars c)
 
 /--
   Elaborate extra simp lemmas provided to `simp`. `stx` is of the `simpLemma,*`
@@ -84,10 +94,11 @@ where
     else
       return none
 
-private def mkSimpContext (stx : Syntax) (eraseLocal : Bool) : TacticM Simp.Context := do
+--  If `ctx == false`, the argument is assumed to have type `Meta.Simp.Config`, and `Meta.Simp.ConfigCtx` otherwise. -/
+private def mkSimpContext (stx : Syntax) (eraseLocal : Bool) (ctx := false) : TacticM Simp.Context := do
   let simpOnly := !stx[2].isNone
   elabSimpLemmas stx[3] (eraseLocal := eraseLocal) {
-    config      := (← elabSimpConfig stx[1])
+    config      := (← elabSimpConfig stx[1] (ctx := ctx))
     simpLemmas  := if simpOnly then {} else (← getSimpLemmas)
     congrLemmas := (← getCongrLemmas)
   }
@@ -125,7 +136,7 @@ where
     replaceMainGoal [mvarIdNew]
 
 @[builtinTactic Lean.Parser.Tactic.simpAll] def evalSimpAll : Tactic := fun stx => do
-  let ctx  ← mkSimpContext stx (eraseLocal := true)
+  let ctx  ← mkSimpContext stx (eraseLocal := true) (ctx := true)
   match (← simpAll (← getMainGoal) ctx) with
   | none => replaceMainGoal []
   | some mvarId => replaceMainGoal [mvarId]
diff --git a/stage0/src/Lean/Elab/Term.lean b/stage0/src/Lean/Elab/Term.lean
index 12bbc25a18..25d98fb3aa 100644
--- a/stage0/src/Lean/Elab/Term.lean
+++ b/stage0/src/Lean/Elab/Term.lean
@@ -111,6 +111,7 @@ structure SavedContext where
   options    : Options
   openDecls  : List OpenDecl
   macroStack : MacroStack
+  errToSorry : Bool
 
 /-- We use synthetic metavariables as placeholders for pending elaboration steps. -/
 inductive SyntheticMVarKind where
@@ -474,7 +475,7 @@ def ensureNoUnassignedMVars (decl : Declaration) : TermElabM Unit := do
 
 /-- Creates syntax for `(` <ident> `:` <type> `)` -/
 def mkExplicitBinder (ident : Syntax) (type : Syntax) : Syntax :=
-  mkNode `Lean.Parser.Term.explicitBinder #[mkAtom "(", mkNullNode #[ident], mkNullNode #[mkAtom ":", type], mkNullNode, mkAtom ")"]
+  mkNode ``Lean.Parser.Term.explicitBinder #[mkAtom "(", mkNullNode #[ident], mkNullNode #[mkAtom ":", type], mkNullNode, mkAtom ")"]
 
 /--
   Convert unassigned universe level metavariables into parameters.
@@ -606,9 +607,9 @@ The coercion from `α` to `Thunk α` cannot be implemented using an instance bec
 eagerly evaluate `e` -/
 def tryCoeThunk? (expectedType : Expr) (eType : Expr) (e : Expr) : TermElabM (Option Expr) := do
   match expectedType with
-  | Expr.app (Expr.const `Thunk u _) arg _ =>
+  | Expr.app (Expr.const ``Thunk u _) arg _ =>
     if (← isDefEq eType arg) then
-      pure (some (mkApp2 (mkConst `Thunk.mk u) arg (mkSimpleThunk e)))
+      pure (some (mkApp2 (mkConst ``Thunk.mk u) arg (mkSimpleThunk e)))
     else
       pure none
   | _ =>
@@ -630,9 +631,9 @@ private def tryCoe (errorMsgHeader? : Option String) (expectedType : Expr) (eTyp
     | none   =>
       let u ← getLevel eType
       let v ← getLevel expectedType
-      let coeTInstType := mkAppN (mkConst `CoeT [u, v]) #[eType, e, expectedType]
+      let coeTInstType := mkAppN (mkConst ``CoeT [u, v]) #[eType, e, expectedType]
       let mvar ← mkFreshExprMVar coeTInstType MetavarKind.synthetic
-      let eNew := mkAppN (mkConst `coe [u, v]) #[eType, expectedType, e, mvar]
+      let eNew := mkAppN (mkConst ``coe [u, v]) #[eType, expectedType, e, mvar]
       let mvarId := mvar.mvarId!
       try
         withoutMacroStackAtErr do
@@ -785,16 +786,16 @@ private def tryLiftAndCoe (errorMsgHeader? : Option String) (expectedType : Expr
   let some (m, α) ← isTypeApp? eType | tryPureCoeAndSimple
   if (← isDefEq m n) then
     let some monadInst ← isMonad? n | tryCoeSimple
-    try expandCoe (← mkAppOptM `coeM #[m, α, β, none, monadInst, e]) catch _ => throwMismatch
+    try expandCoe (← mkAppOptM ``coeM #[m, α, β, none, monadInst, e]) catch _ => throwMismatch
   else if autoLift.get (← getOptions) then
     try
       -- Construct lift from `m` to `n`
-      let monadLiftType ← mkAppM `MonadLiftT #[m, n]
+      let monadLiftType ← mkAppM ``MonadLiftT #[m, n]
       let monadLiftVal  ← synthesizeInst monadLiftType
       let u_1 ← getDecLevel α
       let u_2 ← getDecLevel eType
       let u_3 ← getDecLevel expectedType
-      let eNew := mkAppN (Lean.mkConst `liftM [u_1, u_2, u_3]) #[m, n, monadLiftVal, α, e]
+      let eNew := mkAppN (Lean.mkConst ``liftM [u_1, u_2, u_3]) #[m, n, monadLiftVal, α, e]
       let eNewType ← inferType eNew
       if (← isDefEq expectedType eNewType) then
         return eNew -- approach 2 worked
@@ -802,9 +803,9 @@ private def tryLiftAndCoe (errorMsgHeader? : Option String) (expectedType : Expr
         let some monadInst ← isMonad? n | tryCoeSimple
         let u ← getLevel α
         let v ← getLevel β
-        let coeTInstType := Lean.mkForall `a BinderInfo.default α $ mkAppN (mkConst `CoeT [u, v]) #[α, mkBVar 0, β]
+        let coeTInstType := Lean.mkForall `a BinderInfo.default α $ mkAppN (mkConst ``CoeT [u, v]) #[α, mkBVar 0, β]
         let coeTInstVal ← synthesizeInst coeTInstType
-        let eNew ← expandCoe (← mkAppN (Lean.mkConst `liftCoeM [u_1, u_2, u_3]) #[m, n, α, β, monadLiftVal, coeTInstVal, monadInst, e])
+        let eNew ← expandCoe (← mkAppN (Lean.mkConst ``liftCoeM [u_1, u_2, u_3]) #[m, n, α, β, monadLiftVal, coeTInstVal, monadInst, e])
         let eNewType ← inferType eNew
         unless (← isDefEq expectedType eNewType) do throwMismatch
         return eNew -- approach 3 worked
@@ -885,10 +886,11 @@ private def saveContext : TermElabM SavedContext :=
     declName?  := (← read).declName?
     options    := (← getOptions)
     openDecls  := (← getOpenDecls)
+    errToSorry := (← read).errToSorry
   }
 
 def withSavedContext (savedCtx : SavedContext) (x : TermElabM α) : TermElabM α := do
-  withReader (fun ctx => { ctx with declName? := savedCtx.declName?, macroStack := savedCtx.macroStack }) <|
+  withReader (fun ctx => { ctx with declName? := savedCtx.declName?, macroStack := savedCtx.macroStack, errToSorry := savedCtx.errToSorry }) <|
     withTheReader Core.Context (fun ctx => { ctx with options := savedCtx.options, openDecls := savedCtx.openDecls })
       x
 
@@ -959,14 +961,14 @@ private def isExplicit (stx : Syntax) : Bool :=
   | _      => false
 
 private def isExplicitApp (stx : Syntax) : Bool :=
-  stx.getKind == `Lean.Parser.Term.app && isExplicit stx[0]
+  stx.getKind == ``Lean.Parser.Term.app && isExplicit stx[0]
 
 /--
   Return true if `stx` if a lambda abstraction containing a `{}` or `[]` binder annotation.
   Example: `fun {α} (a : α) => a` -/
 private def isLambdaWithImplicit (stx : Syntax) : Bool :=
   match stx with
-  | `(fun $binders* => $body) => binders.any fun b => b.isOfKind `Lean.Parser.Term.implicitBinder || b.isOfKind `Lean.Parser.Term.instBinder
+  | `(fun $binders* => $body) => binders.any fun b => b.isOfKind ``Lean.Parser.Term.implicitBinder || b.isOfKind `Lean.Parser.Term.instBinder
   | _                         => false
 
 private partial def dropTermParens : Syntax → Syntax := fun stx =>
@@ -1097,13 +1099,13 @@ private def tryCoeSort (α : Expr) (a : Expr) : TermElabM Expr := do
   let β ← mkFreshTypeMVar
   let u ← getLevel α
   let v ← getLevel β
-  let coeSortInstType := mkAppN (Lean.mkConst `CoeSort [u, v]) #[α, β]
+  let coeSortInstType := mkAppN (Lean.mkConst ``CoeSort [u, v]) #[α, β]
   let mvar ← mkFreshExprMVar coeSortInstType MetavarKind.synthetic
   let mvarId := mvar.mvarId!
   try
     withoutMacroStackAtErr do
       if (← synthesizeCoeInstMVarCore mvarId) then
-        expandCoe <| mkAppN (Lean.mkConst `coeSort [u, v]) #[α, β, a, mvar]
+        expandCoe <| mkAppN (Lean.mkConst ``coeSort [u, v]) #[α, β, a, mvar]
       else
         throwError "type expected"
   catch
@@ -1389,8 +1391,8 @@ private def mkFreshTypeMVarFor (expectedType? : Option Expr) : TermElabM Expr :=
     | none     => throwIllFormedSyntax
   let typeMVar ← mkFreshTypeMVarFor expectedType?
   let u ← getDecLevel typeMVar
-  let mvar ← mkInstMVar (mkApp2 (Lean.mkConst `OfNat [u]) typeMVar (mkNatLit val))
-  let r := mkApp3 (Lean.mkConst `OfNat.ofNat [u]) typeMVar (mkNatLit val) mvar
+  let mvar ← mkInstMVar (mkApp2 (Lean.mkConst ``OfNat [u]) typeMVar (mkNatLit val))
+  let r := mkApp3 (Lean.mkConst ``OfNat.ofNat [u]) typeMVar (mkNatLit val) mvar
   registerMVarErrorImplicitArgInfo mvar.mvarId! stx r
   return r
 
@@ -1406,12 +1408,12 @@ def elabScientificLit : TermElab := fun stx expectedType? => do
   | some (m, sign, e) =>
     let typeMVar ← mkFreshTypeMVarFor expectedType?
     let u ← getDecLevel typeMVar
-    let mvar ← mkInstMVar (mkApp (Lean.mkConst `OfScientific [u]) typeMVar)
-    return mkApp5 (Lean.mkConst `OfScientific.ofScientific [u]) typeMVar mvar (mkNatLit m) (toExpr sign) (mkNatLit e)
+    let mvar ← mkInstMVar (mkApp (Lean.mkConst ``OfScientific [u]) typeMVar)
+    return mkApp5 (Lean.mkConst ``OfScientific.ofScientific [u]) typeMVar mvar (mkNatLit m) (toExpr sign) (mkNatLit e)
 
 @[builtinTermElab charLit] def elabCharLit : TermElab := fun stx _ => do
   match stx.isCharLit? with
-  | some val => return mkApp (Lean.mkConst `Char.ofNat) (mkNatLit val.toNat)
+  | some val => return mkApp (Lean.mkConst ``Char.ofNat) (mkNatLit val.toNat)
   | none     => throwIllFormedSyntax
 
 @[builtinTermElab quotedName] def elabQuotedName : TermElab := fun stx _ =>
diff --git a/stage0/src/Lean/Meta/DiscrTree.lean b/stage0/src/Lean/Meta/DiscrTree.lean
index f9e9563969..86dd79215b 100644
--- a/stage0/src/Lean/Meta/DiscrTree.lean
+++ b/stage0/src/Lean/Meta/DiscrTree.lean
@@ -54,6 +54,7 @@ def Key.ctorIdx : Key → Nat
   | Key.lit _     => 2
   | Key.fvar _ _  => 3
   | Key.const _ _ => 4
+  | Key.arrow     => 5
 
 def Key.lt : Key → Key → Bool
   | Key.lit v₁,      Key.lit v₂      => v₁ < v₂
@@ -71,40 +72,42 @@ def Key.format : Key → Format
   | Key.lit (Literal.strVal v) => repr v
   | Key.const k _              => fmt k
   | Key.fvar k _               => fmt k
+  | Key.arrow                  => "→"
 
 instance : ToFormat Key := ⟨Key.format⟩
 
 def Key.arity : Key → Nat
   | Key.const _ a => a
   | Key.fvar _ a  => a
+  | Key.arrow     => 2
   | _             => 0
 
-instance {α} : Inhabited (Trie α) := ⟨Trie.node #[] #[]⟩
+instance : Inhabited (Trie α) := ⟨Trie.node #[] #[]⟩
 
-def empty {α} : DiscrTree α := { root := {} }
+def empty : DiscrTree α := { root := {} }
 
-partial def Trie.format {α} [ToFormat α] : Trie α → Format
+partial def Trie.format [ToFormat α] : Trie α → Format
   | Trie.node vs cs => Format.group $ Format.paren $
     "node" ++ (if vs.isEmpty then Format.nil else " " ++ fmt vs)
     ++ Format.join (cs.toList.map $ fun ⟨k, c⟩ => Format.line ++ Format.paren (fmt k ++ " => " ++ format c))
 
-instance {α} [ToFormat α] : ToFormat (Trie α) := ⟨Trie.format⟩
+instance [ToFormat α] : ToFormat (Trie α) := ⟨Trie.format⟩
 
-partial def format {α} [ToFormat α] (d : DiscrTree α) : Format :=
+partial def format [ToFormat α] (d : DiscrTree α) : Format :=
   let (_, r) := d.root.foldl
     (fun (p : Bool × Format) k c =>
       (false, p.2 ++ (if p.1 then Format.nil else Format.line) ++ Format.paren (fmt k ++ " => " ++ fmt c)))
     (true, Format.nil)
   Format.group r
 
-instance {α} [ToFormat α] : ToFormat (DiscrTree α) := ⟨format⟩
+instance [ToFormat α] : ToFormat (DiscrTree α) := ⟨format⟩
 
 /- The discrimination tree ignores implicit arguments and proofs.
    We use the following auxiliary id as a "mark". -/
 private def tmpMVarId : MVarId := `_discr_tree_tmp
 private def tmpStar := mkMVar tmpMVarId
 
-instance {α} : Inhabited (DiscrTree α) where
+instance : Inhabited (DiscrTree α) where
   default := {}
 
 /--
@@ -137,13 +140,13 @@ instance {α} : Inhabited (DiscrTree α) where
   Remark: if users have problems with the solution above, we may provide a `noIndexing` annotation,
   and `ignoreArg` would return true for any term of the form `noIndexing t`.
 -/
-private def ignoreArg (a : Expr) (i : Nat) (infos : Array ParamInfo) : MetaM Bool :=
+private def ignoreArg (a : Expr) (i : Nat) (infos : Array ParamInfo) : MetaM Bool := do
   if h : i < infos.size then
     let info := infos.get ⟨i, h⟩
     if info.instImplicit then
-      pure true
+      return true
     else if info.implicit then
-      not <$> isType a
+      return not (← isType a)
     else
       isProof a
   else
@@ -155,13 +158,13 @@ private partial def pushArgsAux (infos : Array ParamInfo) : Nat → Expr → Arr
       pushArgsAux infos (i-1) f (todo.push tmpStar)
     else
       pushArgsAux infos (i-1) f (todo.push a)
-  | _, _, todo => pure todo
+  | _, _, todo => return todo
 
 private partial def whnfEta (e : Expr) : MetaM Expr := do
   let e ← whnf e
   match e.etaExpandedStrict? with
   | some e => whnfEta e
-  | none   => pure e
+  | none   => return e
 
 /--
   Return true if `e` is one of the following
@@ -254,12 +257,17 @@ private def pushArgs (root : Bool) (todo : Array Expr) (e : Expr) : MetaM (Key 
         return (Key.other, todo)
       else
         return (Key.star, todo)
+    | Expr.forallE _ d b _ =>
+      if b.hasLooseBVars then
+        return (Key.other, todo)
+      else
+        return (Key.arrow, todo.push d |>.push b)
     | _ =>
       return (Key.other, todo)
 
 partial def mkPathAux (root : Bool) (todo : Array Expr) (keys : Array Key) : MetaM (Array Key) := do
   if todo.isEmpty then
-    pure keys
+    return keys
   else
     let e    := todo.back
     let todo := todo.pop
@@ -274,7 +282,7 @@ def mkPath (e : Expr) : MetaM (Array Key) := do
     let keys : Array Key  := Array.mkEmpty initCapacity
     mkPathAux (root := true) (todo.push e) keys
 
-private partial def createNodes {α} (keys : Array Key) (v : α) (i : Nat) : Trie α :=
+private partial def createNodes (keys : Array Key) (v : α) (i : Nat) : Trie α :=
   if h : i < keys.size then
     let k := keys.get ⟨i, h⟩
     let c := createNodes keys v (i+1)
@@ -282,10 +290,10 @@ private partial def createNodes {α} (keys : Array Key) (v : α) (i : Nat) : Tri
   else
     Trie.node #[v] #[]
 
-private def insertVal {α} [BEq α] (vs : Array α) (v : α) : Array α :=
+private def insertVal [BEq α] (vs : Array α) (v : α) : Array α :=
   if vs.contains v then vs else vs.push v
 
-private partial def insertAux {α} [BEq α] (keys : Array Key) (v : α) : Nat → Trie α → Trie α
+private partial def insertAux [BEq α] (keys : Array Key) (v : α) : Nat → Trie α → Trie α
   | i, Trie.node vs cs =>
     if h : i < keys.size then
       let k := keys.get ⟨i, h⟩
@@ -298,7 +306,7 @@ private partial def insertAux {α} [BEq α] (keys : Array Key) (v : α) : Nat 
     else
       Trie.node (insertVal vs v) cs
 
-def insertCore {α} [BEq α] (d : DiscrTree α) (keys : Array Key) (v : α) : DiscrTree α :=
+def insertCore [BEq α] (d : DiscrTree α) (keys : Array Key) (v : α) : DiscrTree α :=
   if keys.isEmpty then panic! "invalid key sequence"
   else
     let k := keys[0]
@@ -310,23 +318,23 @@ def insertCore {α} [BEq α] (d : DiscrTree α) (keys : Array Key) (v : α) : Di
       let c := insertAux keys v 1 c
       { root := d.root.insert k c }
 
-def insert {α} [BEq α] (d : DiscrTree α) (e : Expr) (v : α) : MetaM (DiscrTree α) := do
+def insert [BEq α] (d : DiscrTree α) (e : Expr) (v : α) : MetaM (DiscrTree α) := do
   let keys ← mkPath e
   return d.insertCore keys v
 
 private def getKeyArgs (e : Expr) (isMatch : Bool) : MetaM (Key × Array Expr) := do
   let e ← whnfEta e
   match e.getAppFn with
-  | Expr.lit v _       => pure (Key.lit v, #[])
+  | Expr.lit v _       => return (Key.lit v, #[])
   | Expr.const c _ _   =>
     let nargs := e.getAppNumArgs
-    pure (Key.const c nargs, e.getAppRevArgs)
+    return (Key.const c nargs, e.getAppRevArgs)
   | Expr.fvar fvarId _ =>
     let nargs := e.getAppNumArgs
-    pure (Key.fvar fvarId nargs, e.getAppRevArgs)
+    return (Key.fvar fvarId nargs, e.getAppRevArgs)
   | Expr.mvar mvarId _ =>
     if isMatch then
-      pure (Key.other, #[])
+      return (Key.other, #[])
     else do
       let ctx ← read
       if ctx.config.isDefEqStuckEx then
@@ -344,12 +352,18 @@ private def getKeyArgs (e : Expr) (isMatch : Bool) : MetaM (Key × Array Expr) :
           a regular metavariable here, otherwise we return the empty set of candidates.
           This is incorrect because it is equivalent to saying that there is no solution even if
           the caller assigns `?m` and try again. -/
-        pure (Key.star, #[])
+        return (Key.star, #[])
       else if (← isReadOnlyOrSyntheticOpaqueExprMVar mvarId) then
-        pure (Key.other, #[])
+        return (Key.other, #[])
       else
-        pure (Key.star, #[])
-  | _ => pure (Key.other, #[])
+        return (Key.star, #[])
+  | Expr.forallE _ d b _ =>
+    if b.hasLooseBVars then
+      return (Key.other, #[])
+    else
+      return (Key.arrow, #[d, b])
+  | _ =>
+    return (Key.other, #[])
 
 private abbrev getMatchKeyArgs (e : Expr) : MetaM (Key × Array Expr) :=
   getKeyArgs e (isMatch := true)
@@ -357,21 +371,21 @@ private abbrev getMatchKeyArgs (e : Expr) : MetaM (Key × Array Expr) :=
 private abbrev getUnifyKeyArgs (e : Expr) : MetaM (Key × Array Expr) :=
   getKeyArgs e (isMatch := false)
 
-private def getStarResult {α} (d : DiscrTree α) : Array α :=
+private def getStarResult (d : DiscrTree α) : Array α :=
   let result : Array α := Array.mkEmpty initCapacity
   match d.root.find? Key.star with
   | none                  => result
   | some (Trie.node vs _) => result ++ vs
 
-partial def getMatch {α} (d : DiscrTree α) (e : Expr) : MetaM (Array α) :=
+partial def getMatch (d : DiscrTree α) (e : Expr) : MetaM (Array α) :=
   withReducible do
     let result := getStarResult d
     let (k, args) ← getMatchKeyArgs e
     match k with
-    | Key.star => pure result
+    | Key.star => return result
     | _        =>
       match d.root.find? k with
-      | none   => pure result
+      | none   => return result
       | some c => process args c result
 where
   process (todo : Array Expr) (c : Trie α) (result : Array α) : MetaM (Array α) := do
@@ -403,7 +417,7 @@ where
             let result ← visitStarChild result
             process (todo ++ args) c.2 result
 
-partial def getUnify {α} (d : DiscrTree α) (e : Expr) : MetaM (Array α) :=
+partial def getUnify (d : DiscrTree α) (e : Expr) : MetaM (Array α) :=
   withReducible do
     let (k, args) ← getUnifyKeyArgs e
     match k with
diff --git a/stage0/src/Lean/Meta/DiscrTreeTypes.lean b/stage0/src/Lean/Meta/DiscrTreeTypes.lean
index ef0d149a1f..bacbeb219d 100644
--- a/stage0/src/Lean/Meta/DiscrTreeTypes.lean
+++ b/stage0/src/Lean/Meta/DiscrTreeTypes.lean
@@ -17,6 +17,7 @@ inductive Key where
   | lit   : Literal → Key
   | star  : Key
   | other : Key
+  | arrow : Key
   deriving Inhabited, BEq
 
 protected def Key.hash : Key → USize
@@ -25,6 +26,7 @@ protected def Key.hash : Key → USize
   | Key.lit v     => mixHash 1879 $ hash v
   | Key.star      => 7883
   | Key.other     => 2411
+  | Key.arrow     => 17
 
 instance : Hashable Key := ⟨Key.hash⟩
 
diff --git a/stage0/src/Lean/Meta/Tactic/Simp/SimpAll.lean b/stage0/src/Lean/Meta/Tactic/Simp/SimpAll.lean
index 4b0e5ed0c6..5e15e6983a 100644
--- a/stage0/src/Lean/Meta/Tactic/Simp/SimpAll.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/SimpAll.lean
@@ -91,6 +91,7 @@ def main : M (Option MVarId) := do
 end SimpAll
 
 def simpAll (mvarId : MVarId) (ctx : Simp.Context) : MetaM (Option MVarId) := do
-  SimpAll.main.run' { mvarId := mvarId, ctx := ctx }
+  withMVarContext mvarId do
+    SimpAll.main.run' { mvarId := mvarId, ctx := ctx }
 
 end Lean.Meta
diff --git a/stage0/stdlib/Init/Data/Array/Basic.c b/stage0/stdlib/Init/Data/Array/Basic.c
index 7b988e6c15..b815a34049 100644
--- a/stage0/stdlib/Init/Data/Array/Basic.c
+++ b/stage0/stdlib/Init/Data/Array/Basic.c
@@ -42,11 +42,14 @@ lean_object* lean_nat_div(lean_object*, lean_object*);
 extern lean_object* l_addParenHeuristic___closed__2;
 lean_object* l_Array_reverse_rev___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mkArray___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_split___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Array_split___rarg___closed__1;
 lean_object* l_Array_findSome_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_term_x5b___x5d___closed__9;
 lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAux___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_split(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Array_toListLitAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
@@ -60,6 +63,7 @@ lean_object* l_term_x23_x5b___x2c_x5d;
 lean_object* l_Array_filterMapM___at_Array_filterMap___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Array_all___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
+lean_object* l_Array_split_match__1(lean_object*, lean_object*);
 lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findRev_x3f___spec__1(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_getEvenElems___spec__1(lean_object*);
 lean_object* l_Array_findM_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -112,6 +116,7 @@ uint8_t l_Array_isEqvAux___rarg(lean_object*, lean_object*, lean_object*, lean_o
 lean_object* l_Array_mapMUnsafe___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_instToStringArray___rarg(lean_object*, lean_object*);
 lean_object* l_term_x23_x5b___x2c_x5d___closed__4;
+lean_object* l_Array_split___rarg(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Array_findSomeRevM_x3f___rarg(lean_object*, lean_object*, lean_object*);
@@ -164,6 +169,7 @@ lean_object* l_Array_foldlM_loop___rarg___lambda__1___boxed(lean_object*, lean_o
 lean_object* l_Array_allM(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Array_map___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_allM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_isEqvAux(lean_object*);
 lean_object* l_Array_forIn(lean_object*, lean_object*, lean_object*);
@@ -510,6 +516,7 @@ lean_object* l_Array_instReprArray___rarg___closed__2;
 lean_object* lean_mk_array(lean_object*, lean_object*);
 lean_object* l_Array_anyM_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
+lean_object* l_Array_split_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isPrefixOfAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMapM___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -555,6 +562,7 @@ lean_object* l_Array_findSome_x21___rarg(lean_object*, lean_object*, lean_object
 lean_object* l_Array_findSomeRevM_x3f_find(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__2___rarg(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_instEmptyCollectionArray(lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_foldrMUnsafe(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_instReprArray___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_swapAt_x21(lean_object*);
@@ -597,6 +605,7 @@ lean_object* l_List_toArrayAux_match__1___rarg(lean_object*, lean_object*, lean_
 lean_object* l_Array_findSomeM_x3f___rarg___closed__1;
 lean_object* l_Array_zipWithAux___at_Array_zip___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_forM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1(lean_object*);
 lean_object* l_Array_mapIdxM_map___at_Array_mapIdx___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findSomeM_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findIdxM_x3f___rarg___closed__1;
@@ -10155,6 +10164,199 @@ lean_dec(x_1);
 return x_3;
 }
 }
+lean_object* l_Array_split_match__1___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_1, 1);
+lean_inc(x_4);
+lean_dec(x_1);
+x_5 = lean_apply_2(x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Array_split_match__1(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Array_split_match__1___rarg), 2, 0);
+return x_3;
+}
+}
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5) {
+_start:
+{
+uint8_t x_6; 
+x_6 = x_3 == x_4;
+if (x_6 == 0)
+{
+lean_object* x_7; size_t x_8; size_t x_9; uint8_t x_10; 
+x_7 = lean_array_uget(x_2, x_3);
+x_8 = 1;
+x_9 = x_3 + x_8;
+x_10 = !lean_is_exclusive(x_5);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_11 = lean_ctor_get(x_5, 0);
+x_12 = lean_ctor_get(x_5, 1);
+lean_inc(x_1);
+lean_inc(x_7);
+x_13 = lean_apply_1(x_1, x_7);
+x_14 = lean_unbox(x_13);
+lean_dec(x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; 
+x_15 = lean_array_push(x_12, x_7);
+lean_ctor_set(x_5, 1, x_15);
+x_3 = x_9;
+goto _start;
+}
+else
+{
+lean_object* x_17; 
+x_17 = lean_array_push(x_11, x_7);
+lean_ctor_set(x_5, 0, x_17);
+x_3 = x_9;
+goto _start;
+}
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_19 = lean_ctor_get(x_5, 0);
+x_20 = lean_ctor_get(x_5, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_5);
+lean_inc(x_1);
+lean_inc(x_7);
+x_21 = lean_apply_1(x_1, x_7);
+x_22 = lean_unbox(x_21);
+lean_dec(x_21);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_array_push(x_20, x_7);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_19);
+lean_ctor_set(x_24, 1, x_23);
+x_3 = x_9;
+x_5 = x_24;
+goto _start;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_array_push(x_19, x_7);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_20);
+x_3 = x_9;
+x_5 = x_27;
+goto _start;
+}
+}
+}
+else
+{
+lean_dec(x_1);
+return x_5;
+}
+}
+}
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+static lean_object* _init_l_Array_split___rarg___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_empty___closed__1;
+x_2 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_2, 0, x_1);
+lean_ctor_set(x_2, 1, x_1);
+return x_2;
+}
+}
+lean_object* l_Array_split___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = lean_array_get_size(x_1);
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = lean_nat_dec_lt(x_4, x_3);
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_6 = l_Array_split___rarg___closed__1;
+return x_6;
+}
+else
+{
+uint8_t x_7; 
+x_7 = lean_nat_dec_le(x_3, x_3);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_3);
+lean_dec(x_2);
+x_8 = l_Array_split___rarg___closed__1;
+return x_8;
+}
+else
+{
+size_t x_9; size_t x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = 0;
+x_10 = lean_usize_of_nat(x_3);
+lean_dec(x_3);
+x_11 = l_Array_split___rarg___closed__1;
+x_12 = l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg(x_2, x_1, x_9, x_10, x_11);
+return x_12;
+}
+}
+}
+}
+lean_object* l_Array_split(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_split___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+size_t x_6; size_t x_7; lean_object* x_8; 
+x_6 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_7 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_8 = l_Array_foldlMUnsafe_fold___at_Array_split___spec__1___rarg(x_1, x_2, x_6, x_7, x_5);
+lean_dec(x_2);
+return x_8;
+}
+}
+lean_object* l_Array_split___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Array_split___rarg(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
 lean_object* initialize_Init_Data_Nat_Basic(lean_object*);
 lean_object* initialize_Init_Data_Fin_Basic(lean_object*);
 lean_object* initialize_Init_Data_UInt(lean_object*);
@@ -10258,6 +10460,8 @@ l_Array_insertAt___rarg___closed__2 = _init_l_Array_insertAt___rarg___closed__2(
 lean_mark_persistent(l_Array_insertAt___rarg___closed__2);
 l_Array_insertAt___rarg___closed__3 = _init_l_Array_insertAt___rarg___closed__3();
 lean_mark_persistent(l_Array_insertAt___rarg___closed__3);
+l_Array_split___rarg___closed__1 = _init_l_Array_split___rarg___closed__1();
+lean_mark_persistent(l_Array_split___rarg___closed__1);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Meta.c b/stage0/stdlib/Init/Meta.c
index 0228b5340e..a3d30f21e4 100644
--- a/stage0/stdlib/Init/Meta.c
+++ b/stage0/stdlib/Init/Meta.c
@@ -255,6 +255,7 @@ lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta
 lean_object* l_Lean_Syntax_structEq___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId___boxed(lean_object*);
 uint8_t l___private_Init_Meta_0__Lean_Meta_Simp_beqConfig____x40_Init_Meta___hyg_6032_(lean_object*, lean_object*);
+uint8_t l_Lean_Meta_Simp_ConfigCtx_contextual___default;
 lean_object* l___private_Init_Meta_0__Lean_quoteList___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isFieldIdx_x3f(lean_object*);
 lean_object* l_Lean_Syntax_setTailInfo_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -14401,6 +14402,14 @@ x_1 = l_Lean_Meta_Simp_instReprConfig___closed__1;
 return x_1;
 }
 }
+static uint8_t _init_l_Lean_Meta_Simp_ConfigCtx_contextual___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
 lean_object* initialize_Init_Data_Array_Basic(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Meta(lean_object* w) {
@@ -14682,6 +14691,7 @@ l_Lean_Meta_Simp_instReprConfig___closed__1 = _init_l_Lean_Meta_Simp_instReprCon
 lean_mark_persistent(l_Lean_Meta_Simp_instReprConfig___closed__1);
 l_Lean_Meta_Simp_instReprConfig = _init_l_Lean_Meta_Simp_instReprConfig();
 lean_mark_persistent(l_Lean_Meta_Simp_instReprConfig);
+l_Lean_Meta_Simp_ConfigCtx_contextual___default = _init_l_Lean_Meta_Simp_ConfigCtx_contextual___default();
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Compiler/IR/Boxing.c b/stage0/stdlib/Lean/Compiler/IR/Boxing.c
index 91627b586b..5af97d2025 100644
--- a/stage0/stdlib/Lean/Compiler/IR/Boxing.c
+++ b/stage0/stdlib/Lean/Compiler/IR/Boxing.c
@@ -20,6 +20,7 @@ size_t l_USize_add(size_t, size_t);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_IR_ExplicitBoxing_getScrutineeType___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_castResultIfNeeded___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_IR_ExplicitBoxing_castArgsIfNeeded___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Array_split___rarg___closed__1;
 lean_object* l_Lean_IR_ExplicitBoxing_addBoxedVersions(lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed(lean_object*, lean_object*);
@@ -194,7 +195,6 @@ lean_object* l_Lean_IR_ExplicitBoxing_castVarIfNeeded(lean_object*, lean_object*
 extern lean_object* l_Lean_mkSepArray___closed__1;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_IR_ExplicitBoxing_addBoxedVersions___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_BoxingContext_localCtx___default;
-lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1;
 lean_object* l_Lean_IR_ExplicitBoxing_mkCast___closed__3;
 lean_object* l_Lean_IR_Decl_params(lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_getJPParams(lean_object*, lean_object*, lean_object*);
@@ -776,17 +776,6 @@ lean_ctor_set(x_11, 1, x_5);
 return x_11;
 }
 }
-static lean_object* _init_l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_empty___closed__1;
-x_2 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_2, 0, x_1);
-lean_ctor_set(x_2, 1, x_1);
-return x_2;
-}
-}
 static lean_object* _init_l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed__const__1() {
 _start:
 {
@@ -820,7 +809,7 @@ x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
 x_14 = lean_array_get_size(x_12);
-x_15 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1;
+x_15 = l_Array_split___rarg___closed__1;
 lean_inc(x_14);
 x_16 = l_Nat_foldM_loop___at_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___spec__2(x_3, x_12, x_14, x_14, x_15, x_13);
 lean_dec(x_14);
@@ -8813,8 +8802,6 @@ if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_IR_ExplicitBoxing_mkBoxedName___closed__1 = _init_l_Lean_IR_ExplicitBoxing_mkBoxedName___closed__1();
 lean_mark_persistent(l_Lean_IR_ExplicitBoxing_mkBoxedName___closed__1);
-l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1 = _init_l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1();
-lean_mark_persistent(l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1);
 l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed__const__1 = _init_l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed__const__1();
 lean_mark_persistent(l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed__const__1);
 l_Lean_IR_ExplicitBoxing_BoxingContext_f___default = _init_l_Lean_IR_ExplicitBoxing_BoxingContext_f___default();
diff --git a/stage0/stdlib/Lean/Elab/App.c b/stage0/stdlib/Lean/Elab/App.c
index a0efa1a2e8..bcfc276a88 100644
--- a/stage0/stdlib/Lean/Elab/App.c
+++ b/stage0/stdlib/Lean/Elab/App.c
@@ -50,6 +50,7 @@ lean_object* l_Lean_mkSort(lean_object*);
 lean_object* l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_addNewArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
+extern lean_object* l_Array_split___rarg___closed__1;
 lean_object* l_Lean_Meta_whnfForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_findMethod_x3f___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -567,7 +568,6 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn(lean_object*,
 uint8_t l_Lean_Expr_isOptParam(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_expandArgs___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_mergeFailures_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_expandArgs___closed__1;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop_match__3___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_resolveLValAux___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* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -31121,17 +31121,6 @@ return x_89;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_expandArgs___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_empty___closed__1;
-x_2 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_2, 0, x_1);
-lean_ctor_set(x_2, 1, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Term_expandArgs(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
@@ -31234,7 +31223,7 @@ size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27;
 x_24 = 0;
 x_25 = lean_usize_of_nat(x_14);
 lean_dec(x_14);
-x_26 = l_Lean_Elab_Term_expandArgs___closed__1;
+x_26 = l_Array_split___rarg___closed__1;
 x_27 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3(x_12, x_24, x_25, x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_12);
 if (lean_obj_tag(x_27) == 0)
@@ -31396,7 +31385,7 @@ 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_49);
 lean_dec(x_49);
-x_63 = l_Lean_Elab_Term_expandArgs___closed__1;
+x_63 = l_Array_split___rarg___closed__1;
 x_64 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3(x_47, x_61, x_62, x_63, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_47);
 if (lean_obj_tag(x_64) == 0)
@@ -32975,8 +32964,6 @@ l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3___closed__1 =
 lean_mark_persistent(l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3___closed__1);
 l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3___closed__2 = _init_l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3___closed__2();
 lean_mark_persistent(l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_expandArgs___spec__3___closed__2);
-l_Lean_Elab_Term_expandArgs___closed__1 = _init_l_Lean_Elab_Term_expandArgs___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_expandArgs___closed__1);
 l___regBuiltin_Lean_Elab_Term_elabApp___closed__1 = _init_l___regBuiltin_Lean_Elab_Term_elabApp___closed__1();
 lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabApp___closed__1);
 res = l___regBuiltin_Lean_Elab_Term_elabApp(lean_io_mk_world());
diff --git a/stage0/stdlib/Lean/Elab/Command.c b/stage0/stdlib/Lean/Elab/Command.c
index ede136bc9b..86a8cf1a82 100644
--- a/stage0/stdlib/Lean/Elab/Command.c
+++ b/stage0/stdlib/Lean/Elab/Command.c
@@ -14,12 +14,14 @@
 extern "C" {
 #endif
 lean_object* l_Lean_Elab_elabSetOption_setOption___at_Lean_Elab_Command_elabSetOption___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_scopes___default___closed__1;
 extern lean_object* l_List_foldlM___at___private_Lean_MonadEnv_0__Lean_checkUnsupported___spec__2___rarg___lambda__2___closed__4;
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabSetOption___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDecl___at_Lean_Elab_Command_elabEvalUnsafe___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___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* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadQuotationCommandElabM___closed__4;
 lean_object* l_Lean_resolveNamespace___at_Lean_Elab_Command_elabExport___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
@@ -40,11 +42,13 @@ size_t l_USize_add(size_t, size_t);
 extern lean_object* l_Lean_Name_getString_x21___closed__3;
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at_Lean_Elab_Command_expandDeclId___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_get_num_heartbeats(lean_object*);
 lean_object* l_Lean_Elab_Command_catchExceptions(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* lean_erase_macro_scopes(lean_object*);
 lean_object* l_Lean_Elab_mkDeclName___at_Lean_Elab_Command_expandDeclId___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_check___closed__1;
 lean_object* l_Lean_throwKernelException___at_Lean_Elab_Command_elabEvalUnsafe___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
@@ -74,6 +78,7 @@ extern lean_object* l_Char_quote___closed__1;
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__2;
 lean_object* l_Lean_Elab_Command_elabReduce___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11(lean_object*, size_t, lean_object*);
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -88,7 +93,6 @@ lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__7___closed__2;
 extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1090____closed__1;
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabNamespace___closed__1;
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadMacroAdapterCommandElabM___closed__4;
 lean_object* l_Lean_Elab_logException___at_Lean_Elab_Command_runLinters___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -109,7 +113,6 @@ lean_object* l_Lean_Elab_Command_liftIO(lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___lambda__1___closed__4;
 lean_object* l_Lean_Elab_Command_instMonadOptionsCommandElabM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SourceInfo_fromRef(lean_object*);
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logUnknownDecl___at_Lean_Elab_Command_elabOpen___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute;
@@ -124,9 +127,12 @@ extern lean_object* l_Lean_initFn____x40_Lean_Util_PPExt___hyg_3____closed__3;
 lean_object* l_Lean_Elab_Command_elabCommand___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_elabVariable___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__2(lean_object*);
 lean_object* l_Lean_popScope___at___private_Lean_Elab_Command_0__Lean_Elab_Command_popScopes___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabCommand___closed__2;
 lean_object* l_Lean_Elab_Command_elabCheck_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Context_macroStack___default;
 lean_object* l_Lean_Elab_Command_modifyScope_match__1(lean_object*);
@@ -156,7 +162,6 @@ lean_object* l_Lean_compileDecl___at_Lean_Elab_Command_elabEvalUnsafe___spec__4(
 lean_object* l_Lean_Elab_Command_instMonadEnvCommandElabM___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadMacroAdapterCommandElabM;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___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* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6(lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_failIfSucceeds___lambda__1___closed__1;
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
@@ -183,6 +188,7 @@ lean_object* l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___at_Lean_Elab_Comman
 lean_object* l_Lean_Elab_Command_elabInitQuot___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ensureNoUnassignedMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Context_cmdPos___default;
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabVariable(lean_object*);
 lean_object* l_Lean_Elab_Command_liftTermElabM(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabSection(lean_object*);
@@ -194,6 +200,7 @@ lean_object* l_Lean_Elab_Command_runTermElabM___rarg___lambda__1(lean_object*, l
 lean_object* l_Lean_Elab_Command_liftEIO(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDocString_x27___at_Lean_Elab_Command_expandDeclId___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_reduce(lean_object*, uint8_t, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_addLinter(lean_object*, lean_object*);
 extern lean_object* l_Lean_Core_instMonadEnvCoreM___closed__1;
@@ -233,20 +240,18 @@ lean_object* l_Lean_Elab_Command_Scope_opts___default;
 lean_object* l_Lean_Elab_Command_failIfSucceeds(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadRecDepthCommandElabM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkTermContext_match__2(lean_object*);
+lean_object* l_Lean_Elab_InfoTree_format(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM___closed__1;
 lean_object* l_Lean_Elab_Command_withLogging_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_Elab_Command_elabCommand_match__2(lean_object*);
 lean_object* l_Std_PersistentArray_mapM___at_Lean_Elab_Command_liftTermElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Command_runLinters___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames___rarg(lean_object*, lean_object*);
-lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadRefCommandElabM___closed__2;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Command_0__Lean_Elab_Command_mkTermContext___spec__1(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Command_getScopes___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenHiding___at_Lean_Elab_Command_elabOpen___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_messages___default;
 uint8_t l___private_Lean_Message_0__Lean_beqMessageSeverity____x40_Lean_Message___hyg_99_(uint8_t, uint8_t);
@@ -269,7 +274,6 @@ lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_popScopes(lean_o
 lean_object* l_Lean_Elab_Command_elabSynth___closed__2;
 lean_object* l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Command_elabOpen___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM___closed__2;
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_liftTermElabM___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__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* l_Lean_Elab_Command_elabUniverses___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -289,18 +293,19 @@ lean_object* l_Lean_Elab_Command_elabCheck___closed__3;
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlMAux___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__10___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Command_0__Lean_Elab_Command_popScopes___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabUniverses(lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkTermContext_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabCheckFailure___closed__1;
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM___closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabOpen___spec__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_maxRecDepth;
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_popScope___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftTermElabM_match__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenOnly___at_Lean_Elab_Command_elabOpen___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -309,10 +314,12 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_runLinters___spec__
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_myMacro____x40_Init_Notation___hyg_113____spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Command_runLinters___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCommand_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_initFn____x40_Lean_Parser_Extension___hyg_4005____closed__3;
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_addOpenDecl___at_Lean_Elab_Command_elabOpen___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCheckFailure___closed__1;
 lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM;
 lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -384,13 +391,14 @@ lean_object* l_Lean_Elab_Command_elabCommand_match__1___rarg(lean_object*, lean_
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_mkTermContext___spec__2(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadOptionsCommandElabM___closed__1;
 lean_object* l_Lean_Elab_mkDeclName___at_Lean_Elab_Command_expandDeclId___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Scope_varDecls___default;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_elabCommand___closed__1;
 lean_object* l_Lean_Elab_Command_Scope_openDecls___default;
 lean_object* l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___at_Lean_Elab_Command_addUnivLevel___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSection___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_nextInstIdx___default;
 extern lean_object* l_Lean_Parser_Command_eval___elambda__1___closed__2;
@@ -412,16 +420,17 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabOpen___spec__11
 extern lean_object* l_instReprBool___closed__3;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabUniverses___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabSetOption___at_Lean_Elab_Command_elabSetOption___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_MonadEnv_0__Lean_checkUnsupported___at_Lean_Elab_Command_elabEvalUnsafe___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
 lean_object* l_Lean_Elab_Command_liftCoreM_match__1(lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkMetaContext___closed__1;
 lean_object* l_Lean_Elab_Command_instMonadEnvCommandElabM___closed__3;
 lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM___closed__3;
 lean_object* l_Lean_activateScoped___at_Lean_Elab_Command_elabOpen___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkState(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftCoreM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_pushScope___rarg(lean_object*, lean_object*);
@@ -431,6 +440,7 @@ lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__3___rarg(lean_object*, le
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_liftTermElabM___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_addScope___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Command_elabOpen___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__6(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_getBracketedBinderIds___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabOpen___spec__17(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabSetOption(lean_object*);
@@ -466,7 +476,6 @@ lean_object* l_Lean_Elab_expandDeclId___at_Lean_Elab_Command_expandDeclId___spec
 lean_object* l_Lean_Elab_Term_synthesizeSyntheticMVars_loop(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__5;
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg___closed__3;
-lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_runTermElabM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__13(lean_object*, lean_object*, size_t, size_t, lean_object*);
@@ -488,7 +497,6 @@ extern lean_object* l_Lean_protectedExt;
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenSimple___at_Lean_Elab_Command_elabOpen___spec__14(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elbChoice(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Context_currRecDepth___default;
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -531,6 +539,7 @@ lean_object* l_Lean_Elab_Command_instMonadQuotationCommandElabM;
 lean_object* l_Lean_Elab_Command_elabSetOption___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_firstFrontendMacroScope;
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_WHNF___hyg_13____closed__2;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_expandDeclId___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Unhygienic_run___rarg___closed__2;
@@ -541,12 +550,10 @@ lean_object* l_Lean_Elab_Command_instMonadRecDepthCommandElabM___lambda__1(lean_
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__2;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_runLinters___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4(lean_object*, size_t, lean_object*);
 uint8_t l_Lean_MessageData_hasSyntheticSorry(lean_object*);
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___closed__2;
 lean_object* l_Lean_Elab_Command_liftIO___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadEnvCommandElabM;
 lean_object* l___regBuiltin_Lean_Elab_Command_elabSection___closed__1;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__5___closed__2;
@@ -569,6 +576,7 @@ lean_object* l_Lean_Elab_Command_instMonadResolveNameCommandElabM___closed__6;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftCoreM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabOpen___spec__16(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at_Lean_Elab_Command_expandDeclId___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabEval___closed__1;
 extern lean_object* l_Lean_KernelException_toMessageData___closed__3;
@@ -587,9 +595,11 @@ lean_object* l_Lean_Elab_mkDeclName___at_Lean_Elab_Command_expandDeclId___spec__
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabReduce___closed__1;
 lean_object* l_Lean_Elab_Command_elabInitQuot___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_foldlM___at_Lean_Elab_Command_elabEvalUnsafe___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabReduce___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_hasNoErrorMessages___rarg(lean_object*, lean_object*);
+lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabChoiceAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 size_t l_USize_land(size_t, size_t);
@@ -599,6 +609,7 @@ lean_object* l_Lean_Elab_log___at_Lean_Elab_Command_elabOpen___spec__6___boxed(l
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__3(lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Lean_resolveNamespace___at_Lean_Elab_Command_elabOpen___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MonadQuotation_addMacroScope___at_Lean_Elab_Command_elabVariable___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_Context_ref___default;
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -623,7 +634,6 @@ lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__4;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabNamespace___spec__1___rarg(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabOpen___spec__13(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_mkApp___closed__1;
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__11(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabCheck___closed__1;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__4(lean_object*);
@@ -637,15 +647,18 @@ lean_object* l_Lean_Elab_Command_elabExport___closed__2;
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15378____closed__10;
 extern lean_object* l_Lean_Parser_Command_end___elambda__1___closed__2;
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__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_Elab_mkDeclName___rarg___lambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_instMonadRefCommandElabM___closed__3;
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_expandDeclId___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_macroAttribute;
 lean_object* l_Lean_Elab_Command_elabCommand_match__3(lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftTermElabM_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withMacroExpansion___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_environment_main_module(lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCommand___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_resetTraceState___rarg___lambda__1___closed__1;
 lean_object* l_Lean_Elab_logException___at_Lean_Elab_Command_runLinters___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -656,6 +669,7 @@ lean_object* l_Lean_Elab_Command_elabExport___closed__1;
 lean_object* l_Lean_Elab_addMacroStack___at_Lean_Elab_Command_instAddErrorMessageContextCommandElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabReduce(lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__1;
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getScope(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addScope___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -693,9 +707,11 @@ lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_ioErrorToMessage
 lean_object* l_ReaderT_bind___at_Lean_Elab_Command_instMonadInfoTreeCommandElabM___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__2;
 lean_object* l_Lean_Elab_Command_instInhabitedScope;
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___closed__6;
 lean_object* l_Lean_Elab_Term_elabTerm___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_Array_mapMUnsafe_map___at_Lean_Elab_Command_elabVariable___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20(lean_object*);
 extern lean_object* l_Lean_resolveNamespace___rarg___lambda__1___closed__1;
 lean_object* l_Lean_KVMap_insertCore(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_elabSetOption_setOption___rarg___lambda__4___closed__2;
@@ -704,6 +720,7 @@ lean_object* l_Lean_Elab_Command_elabEvalUnsafe___closed__4;
 lean_object* l_Lean_Syntax_getOptionalIdent_x3f(lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabOpen___spec__18___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Command_elabInitQuot___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_runTermElabM_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_elbChoice___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkTermContext___boxed(lean_object*, lean_object*, lean_object*);
@@ -711,25 +728,27 @@ lean_object* l_Lean_Elab_Command_elabNamespace(lean_object*, lean_object*, lean_
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_State_infoState___default___closed__1;
 lean_object* l_List_foldlM___at_Lean_Elab_Command_elabEvalUnsafe___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* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_pp_macroStack;
 lean_object* l_Lean_Elab_Command_getMainModule___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadLiftTIOCommandElabM(lean_object*);
-lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabOpen(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabExport___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_pushScope___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addScope___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withNamespace___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlMAux___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__10(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(lean_object*, lean_object*);
 extern lean_object* l_List_head_x21___rarg___closed__3;
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10___boxed(lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__5___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_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__2;
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instInhabitedCommandElabM___closed__1;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__7___closed__3;
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__3;
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlMAux___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getRef(lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_universes___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM___closed__3;
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___closed__1;
@@ -752,9 +771,9 @@ lean_object* l___regBuiltin_Lean_Elab_Command_elabNamespace(lean_object*);
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenHiding___at_Lean_Elab_Command_elabOpen___spec__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___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*);
 extern lean_object* l_Lean_ScopedEnvExtension_getState___rarg___closed__3;
+lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM;
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(lean_object*);
 lean_object* l_List_foldl___at_Lean_Elab_Command_elabExport___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames(lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__2___closed__1;
@@ -768,18 +787,20 @@ lean_object* l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__13___rarg(lea
 lean_object* l___regBuiltin_Lean_Elab_Command_elabInitQuot___closed__1;
 extern lean_object* l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_instMonadRecDepthCommandElabM___closed__5;
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getMainModule___boxed(lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__4___closed__1;
 uint8_t l___private_Lean_Elab_Command_0__Lean_Elab_Command_checkEndHeader(lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern size_t l_Std_PersistentHashMap_insertAux___rarg___closed__2;
+lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabEnd___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabCheckFailure(lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg___boxed(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabSynth(lean_object*);
 lean_object* l_Lean_Elab_Command_instInhabitedCommandElabM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getTailPos_x3f(lean_object*, uint8_t);
@@ -792,8 +813,10 @@ lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_checkEndHeader__
 extern lean_object* l_Lean_Parser_Command_openSimple___elambda__1___closed__2;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_getBracketedBinderIds___spec__1(size_t, size_t, lean_object*);
 extern lean_object* l_Lean_Core_instInhabitedState___closed__1;
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getScopes___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_throwKernelException___at_Lean_Elab_Command_elabEvalUnsafe___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instAddMessageContextCommandElabM;
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Command_withLogging___spec__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkMessageAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -815,7 +838,7 @@ lean_object* l_Lean_Elab_Command_elabSynth___lambda__2___boxed(lean_object*, lea
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___closed__5;
 lean_object* l_Lean_Elab_Command_instInhabitedCommandElabM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
-lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3(lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__7(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_expandDeclId___at_Lean_Elab_Command_expandDeclId___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabChoiceAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadEnvCommandElabM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -823,7 +846,6 @@ extern lean_object* l_Lean_Core_State_ngen___default___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_liftTermElabM___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkMetaContext;
-lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_addScopes_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__7;
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___closed__4;
@@ -833,27 +855,27 @@ lean_object* l_Lean_Elab_Command_elabEvalUnsafe___closed__3;
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_expandDeclId___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__9(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Declaration_foldExprM___at_Lean_Elab_Command_elabEvalUnsafe___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___boxed(lean_object*);
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg(lean_object*, lean_object*);
 lean_object* lean_compile_decl(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_mkMacroAttributeUnsafe___closed__2;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabExport___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* l_Lean_Elab_expandDeclId___at_Lean_Elab_Command_expandDeclId___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__8(lean_object*, lean_object*, size_t, size_t, lean_object*);
 uint8_t l_Std_PersistentArray_anyM___at_Lean_MessageLog_hasErrors___spec__1(lean_object*);
-lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___lambda__1___closed__2;
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabSetOption___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_read___at_Lean_Elab_Command_instMonadLogCommandElabM___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_nextMacroScope___default;
 extern lean_object* l_Lean_scopedEnvExtensionsRef;
-lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7___boxed(lean_object*, lean_object*);
 lean_object* l_List_lengthAux___rarg(lean_object*, lean_object*);
+lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabInitQuot(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabUniverse___closed__1;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Command_elabCheckFailure___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_OpenDecl_elabOpenDecl___at_Lean_Elab_Command_elabOpen___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCheck_match__1(lean_object*);
-lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getScope___rarg(lean_object*, lean_object*);
 uint8_t l_Lean_Elab_isFreshInstanceName(lean_object*);
 lean_object* l_Lean_Elab_Command_instAddErrorMessageContextCommandElabM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -876,12 +898,12 @@ lean_object* l_Lean_Elab_Command_hasNoErrorMessages___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_getScopes___boxed(lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Command_elabInitQuot___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___at_Lean_Elab_Command_expandDeclId___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___boxed(lean_object*);
 lean_object* l_List_foldlM___at_Lean_Elab_Command_elabEvalUnsafe___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_infoState___default;
 extern lean_object* l_Lean_Parser_Command_synth___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabInitQuot_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_withAutoBoundImplicit___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth___closed__3;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__5(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Command_mkMessageAux(lean_object*, lean_object*, lean_object*, uint8_t);
@@ -891,11 +913,11 @@ lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_addScopes(uint8_
 lean_object* l_Lean_Elab_Command_elabNamespace___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabOpen___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_liftTermElabM___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlFromMAux___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at_Lean_Elab_Command_expandDeclId___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getBracketedBinderIds___closed__1;
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg___closed__1;
 lean_object* l_IO_mkRef___at_Lean_Elab_Command_initFn____x40_Lean_Elab_Command___hyg_162____spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_addDocString___at_Lean_Elab_Command_expandDeclId___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -933,7 +955,6 @@ uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Lean_addAndCompile___at_Lean_Elab_Command_elabEvalUnsafe___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_instInhabitedInfoState___closed__1;
 extern lean_object* l_Lean_mkAnnotation___closed__1;
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getRef___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Std_PersistentArray_getAux___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_instMonadMacroAdapterCommandElabM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -8166,7 +8187,782 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabCommand_match__3___rarg
 return x_2;
 }
 }
-lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; uint8_t x_4; 
+x_3 = lean_st_ref_get(x_1, x_2);
+x_4 = !lean_is_exclusive(x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_ctor_get(x_3, 0);
+x_6 = lean_ctor_get(x_5, 7);
+lean_inc(x_6);
+lean_dec(x_5);
+x_7 = lean_ctor_get(x_6, 1);
+lean_inc(x_7);
+lean_dec(x_6);
+lean_ctor_set(x_3, 0, x_7);
+return x_3;
+}
+else
+{
+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_3, 0);
+x_9 = lean_ctor_get(x_3, 1);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_dec(x_3);
+x_10 = lean_ctor_get(x_8, 7);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(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_9);
+return x_12;
+}
+}
+}
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___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_6; uint8_t x_7; lean_object* x_8; 
+x_6 = lean_alloc_ctor(11, 2, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+x_7 = 0;
+x_8 = l_Lean_Elab_log___at_Lean_Elab_Command_runLinters___spec__3(x_6, x_7, x_3, x_4, x_5);
+return x_8;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__5(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) {
+_start:
+{
+uint8_t x_11; 
+x_11 = x_6 < x_5;
+if (x_11 == 0)
+{
+lean_object* x_12; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_7);
+lean_ctor_set(x_12, 1, x_10);
+return x_12;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_array_uget(x_4, x_6);
+x_14 = lean_ctor_get(x_7, 1);
+lean_inc(x_14);
+lean_dec(x_7);
+lean_inc(x_1);
+x_15 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4(x_1, x_2, x_13, x_14, x_8, x_9, x_10);
+lean_dec(x_13);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; 
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+if (lean_obj_tag(x_16) == 0)
+{
+uint8_t x_17; 
+lean_dec(x_3);
+lean_dec(x_1);
+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; 
+x_18 = lean_ctor_get(x_15, 0);
+lean_dec(x_18);
+x_19 = lean_ctor_get(x_16, 0);
+lean_inc(x_19);
+x_20 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_20, 0, x_16);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+lean_ctor_set(x_15, 0, x_21);
+return x_15;
+}
+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_15, 1);
+lean_inc(x_22);
+lean_dec(x_15);
+x_23 = lean_ctor_get(x_16, 0);
+lean_inc(x_23);
+x_24 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_24, 0, x_16);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_24);
+lean_ctor_set(x_25, 1, x_23);
+x_26 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_22);
+return x_26;
+}
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; size_t x_30; size_t x_31; 
+x_27 = lean_ctor_get(x_15, 1);
+lean_inc(x_27);
+lean_dec(x_15);
+x_28 = lean_ctor_get(x_16, 0);
+lean_inc(x_28);
+lean_dec(x_16);
+lean_inc(x_3);
+x_29 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_29, 0, x_3);
+lean_ctor_set(x_29, 1, x_28);
+x_30 = 1;
+x_31 = x_6 + x_30;
+x_6 = x_31;
+x_7 = x_29;
+x_10 = x_27;
+goto _start;
+}
+}
+else
+{
+uint8_t x_33; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_33 = !lean_is_exclusive(x_15);
+if (x_33 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_15, 0);
+x_35 = lean_ctor_get(x_15, 1);
+lean_inc(x_35);
+lean_inc(x_34);
+lean_dec(x_15);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_34);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
+}
+}
+}
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; 
+x_10 = x_5 < x_4;
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_6);
+lean_ctor_set(x_11, 1, x_9);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_6);
+x_12 = lean_array_uget(x_3, x_5);
+x_13 = lean_box(0);
+x_14 = l_Lean_Elab_InfoTree_format(x_12, x_13, x_9);
+if (lean_obj_tag(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; size_t x_25; size_t x_26; 
+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_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_15);
+x_18 = l_Lean_KernelException_toMessageData___closed__15;
+x_19 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_17);
+x_20 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+lean_inc(x_1);
+x_21 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_1, x_20, x_7, x_8, x_16);
+x_22 = lean_ctor_get(x_21, 1);
+lean_inc(x_22);
+lean_dec(x_21);
+x_23 = lean_box(0);
+lean_inc(x_2);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_2);
+lean_ctor_set(x_24, 1, x_23);
+x_25 = 1;
+x_26 = x_5 + x_25;
+x_5 = x_26;
+x_6 = x_24;
+x_9 = x_22;
+goto _start;
+}
+else
+{
+uint8_t x_28; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_28 = !lean_is_exclusive(x_14);
+if (x_28 == 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; 
+x_29 = lean_ctor_get(x_14, 0);
+x_30 = lean_ctor_get(x_7, 6);
+x_31 = lean_io_error_to_string(x_29);
+x_32 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_32, 0, x_31);
+x_33 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_inc(x_30);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_30);
+lean_ctor_set(x_34, 1, x_33);
+lean_ctor_set(x_14, 0, x_34);
+return x_14;
+}
+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; 
+x_35 = lean_ctor_get(x_14, 0);
+x_36 = lean_ctor_get(x_14, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_14);
+x_37 = lean_ctor_get(x_7, 6);
+x_38 = lean_io_error_to_string(x_35);
+x_39 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_39, 0, x_38);
+x_40 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_inc(x_37);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_37);
+lean_ctor_set(x_41, 1, x_40);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_36);
+return x_42;
+}
+}
+}
+}
+}
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__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; 
+x_6 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_6, 0, x_1);
+x_7 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_7, 0, x_6);
+lean_ctor_set(x_7, 1, x_5);
+return x_7;
+}
+}
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___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:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; size_t x_12; size_t x_13; lean_object* x_14; 
+x_8 = lean_ctor_get(x_3, 0);
+x_9 = lean_box(0);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_9);
+lean_ctor_set(x_10, 1, x_4);
+x_11 = lean_array_get_size(x_8);
+x_12 = lean_usize_of_nat(x_11);
+lean_dec(x_11);
+x_13 = 0;
+x_14 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__5(x_1, x_2, x_9, x_8, x_12, x_13, x_10, x_5, x_6, x_7);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+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_19; lean_object* x_20; 
+x_17 = lean_ctor_get(x_14, 1);
+lean_inc(x_17);
+lean_dec(x_14);
+x_18 = lean_ctor_get(x_15, 1);
+lean_inc(x_18);
+lean_dec(x_15);
+x_19 = lean_box(0);
+x_20 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__1(x_18, x_19, x_5, x_6, x_17);
+return x_20;
+}
+else
+{
+uint8_t x_21; 
+lean_dec(x_15);
+x_21 = !lean_is_exclusive(x_14);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_ctor_get(x_14, 0);
+lean_dec(x_22);
+x_23 = lean_ctor_get(x_16, 0);
+lean_inc(x_23);
+lean_dec(x_16);
+lean_ctor_set(x_14, 0, x_23);
+return x_14;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_14, 1);
+lean_inc(x_24);
+lean_dec(x_14);
+x_25 = lean_ctor_get(x_16, 0);
+lean_inc(x_25);
+lean_dec(x_16);
+x_26 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_24);
+return x_26;
+}
+}
+}
+else
+{
+uint8_t x_27; 
+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;
+}
+}
+}
+else
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; size_t x_35; size_t x_36; lean_object* x_37; 
+x_31 = lean_ctor_get(x_3, 0);
+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_4);
+x_34 = lean_array_get_size(x_31);
+x_35 = lean_usize_of_nat(x_34);
+lean_dec(x_34);
+x_36 = 0;
+x_37 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__6(x_1, x_32, x_31, x_35, x_36, x_33, x_5, x_6, x_7);
+if (lean_obj_tag(x_37) == 0)
+{
+lean_object* x_38; lean_object* x_39; 
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+if (lean_obj_tag(x_39) == 0)
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_40 = lean_ctor_get(x_37, 1);
+lean_inc(x_40);
+lean_dec(x_37);
+x_41 = lean_ctor_get(x_38, 1);
+lean_inc(x_41);
+lean_dec(x_38);
+x_42 = lean_box(0);
+x_43 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__1(x_41, x_42, x_5, x_6, x_40);
+return x_43;
+}
+else
+{
+uint8_t x_44; 
+lean_dec(x_38);
+x_44 = !lean_is_exclusive(x_37);
+if (x_44 == 0)
+{
+lean_object* x_45; lean_object* x_46; 
+x_45 = lean_ctor_get(x_37, 0);
+lean_dec(x_45);
+x_46 = lean_ctor_get(x_39, 0);
+lean_inc(x_46);
+lean_dec(x_39);
+lean_ctor_set(x_37, 0, x_46);
+return x_37;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_37, 1);
+lean_inc(x_47);
+lean_dec(x_37);
+x_48 = lean_ctor_get(x_39, 0);
+lean_inc(x_48);
+lean_dec(x_39);
+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;
+}
+}
+}
+else
+{
+uint8_t x_50; 
+x_50 = !lean_is_exclusive(x_37);
+if (x_50 == 0)
+{
+return x_37;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_37, 0);
+x_52 = lean_ctor_get(x_37, 1);
+lean_inc(x_52);
+lean_inc(x_51);
+lean_dec(x_37);
+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* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+uint8_t x_10; 
+x_10 = x_5 < x_4;
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_6);
+lean_ctor_set(x_11, 1, x_9);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_6);
+x_12 = lean_array_uget(x_3, x_5);
+x_13 = lean_box(0);
+x_14 = l_Lean_Elab_InfoTree_format(x_12, x_13, x_9);
+if (lean_obj_tag(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; size_t x_25; size_t x_26; 
+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_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_15);
+x_18 = l_Lean_KernelException_toMessageData___closed__15;
+x_19 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_17);
+x_20 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+lean_inc(x_1);
+x_21 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_1, x_20, x_7, x_8, x_16);
+x_22 = lean_ctor_get(x_21, 1);
+lean_inc(x_22);
+lean_dec(x_21);
+x_23 = lean_box(0);
+lean_inc(x_2);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_2);
+lean_ctor_set(x_24, 1, x_23);
+x_25 = 1;
+x_26 = x_5 + x_25;
+x_5 = x_26;
+x_6 = x_24;
+x_9 = x_22;
+goto _start;
+}
+else
+{
+uint8_t x_28; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_28 = !lean_is_exclusive(x_14);
+if (x_28 == 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; 
+x_29 = lean_ctor_get(x_14, 0);
+x_30 = lean_ctor_get(x_7, 6);
+x_31 = lean_io_error_to_string(x_29);
+x_32 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_32, 0, x_31);
+x_33 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_inc(x_30);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_30);
+lean_ctor_set(x_34, 1, x_33);
+lean_ctor_set(x_14, 0, x_34);
+return x_14;
+}
+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; 
+x_35 = lean_ctor_get(x_14, 0);
+x_36 = lean_ctor_get(x_14, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_14);
+x_37 = lean_ctor_get(x_7, 6);
+x_38 = lean_io_error_to_string(x_35);
+x_39 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_39, 0, x_38);
+x_40 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_inc(x_37);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_37);
+lean_ctor_set(x_41, 1, x_40);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_36);
+return x_42;
+}
+}
+}
+}
+}
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___lambda__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; 
+x_6 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_5);
+return x_6;
+}
+}
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___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 = lean_ctor_get(x_2, 0);
+lean_inc(x_3);
+lean_inc(x_1);
+x_8 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4(x_1, x_3, x_7, x_3, x_4, x_5, x_6);
+lean_dec(x_3);
+if (lean_obj_tag(x_8) == 0)
+{
+lean_object* x_9; 
+x_9 = lean_ctor_get(x_8, 0);
+lean_inc(x_9);
+if (lean_obj_tag(x_9) == 0)
+{
+uint8_t x_10; 
+lean_dec(x_1);
+x_10 = !lean_is_exclusive(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_ctor_get(x_8, 0);
+lean_dec(x_11);
+x_12 = lean_ctor_get(x_9, 0);
+lean_inc(x_12);
+lean_dec(x_9);
+lean_ctor_set(x_8, 0, x_12);
+return x_8;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_ctor_get(x_8, 1);
+lean_inc(x_13);
+lean_dec(x_8);
+x_14 = lean_ctor_get(x_9, 0);
+lean_inc(x_14);
+lean_dec(x_9);
+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;
+}
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; size_t x_22; size_t x_23; lean_object* x_24; 
+x_16 = lean_ctor_get(x_8, 1);
+lean_inc(x_16);
+lean_dec(x_8);
+x_17 = lean_ctor_get(x_9, 0);
+lean_inc(x_17);
+lean_dec(x_9);
+x_18 = lean_ctor_get(x_2, 1);
+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_17);
+x_21 = lean_array_get_size(x_18);
+x_22 = lean_usize_of_nat(x_21);
+lean_dec(x_21);
+x_23 = 0;
+x_24 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__7(x_1, x_19, x_18, x_22, x_23, x_20, x_4, x_5, x_16);
+if (lean_obj_tag(x_24) == 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_25, 0);
+lean_inc(x_26);
+if (lean_obj_tag(x_26) == 0)
+{
+uint8_t x_27; 
+x_27 = !lean_is_exclusive(x_24);
+if (x_27 == 0)
+{
+lean_object* x_28; lean_object* x_29; 
+x_28 = lean_ctor_get(x_24, 0);
+lean_dec(x_28);
+x_29 = lean_ctor_get(x_25, 1);
+lean_inc(x_29);
+lean_dec(x_25);
+lean_ctor_set(x_24, 0, x_29);
+return x_24;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_24, 1);
+lean_inc(x_30);
+lean_dec(x_24);
+x_31 = lean_ctor_get(x_25, 1);
+lean_inc(x_31);
+lean_dec(x_25);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+return x_32;
+}
+}
+else
+{
+uint8_t x_33; 
+lean_dec(x_25);
+x_33 = !lean_is_exclusive(x_24);
+if (x_33 == 0)
+{
+lean_object* x_34; lean_object* x_35; 
+x_34 = lean_ctor_get(x_24, 0);
+lean_dec(x_34);
+x_35 = lean_ctor_get(x_26, 0);
+lean_inc(x_35);
+lean_dec(x_26);
+lean_ctor_set(x_24, 0, x_35);
+return x_24;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_36 = lean_ctor_get(x_24, 1);
+lean_inc(x_36);
+lean_dec(x_24);
+x_37 = lean_ctor_get(x_26, 0);
+lean_inc(x_37);
+lean_dec(x_26);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+return x_38;
+}
+}
+}
+else
+{
+uint8_t x_39; 
+x_39 = !lean_is_exclusive(x_24);
+if (x_39 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_24, 0);
+x_41 = lean_ctor_get(x_24, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_24);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+}
+else
+{
+uint8_t x_43; 
+lean_dec(x_1);
+x_43 = !lean_is_exclusive(x_8);
+if (x_43 == 0)
+{
+return x_8;
+}
+else
+{
+lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_44 = lean_ctor_get(x_8, 0);
+x_45 = lean_ctor_get(x_8, 1);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_dec(x_8);
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_44);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
+}
+}
+}
+}
+lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
@@ -8196,7 +8992,7 @@ return x_10;
 }
 }
 }
-lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12(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; 
@@ -8238,7 +9034,7 @@ return x_15;
 }
 }
 }
-lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4(lean_object* x_1, size_t x_2, lean_object* x_3) {
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11(lean_object* x_1, size_t x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -8309,14 +9105,14 @@ x_21 = lean_ctor_get(x_1, 1);
 lean_inc(x_21);
 lean_dec(x_1);
 x_22 = lean_unsigned_to_nat(0u);
-x_23 = l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__5(x_20, x_21, lean_box(0), x_22, x_3);
+x_23 = l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12(x_20, x_21, lean_box(0), x_22, x_3);
 lean_dec(x_21);
 lean_dec(x_20);
 return x_23;
 }
 }
 }
-lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; size_t x_4; lean_object* x_5; 
@@ -8324,11 +9120,11 @@ x_3 = lean_ctor_get(x_1, 0);
 lean_inc(x_3);
 lean_dec(x_1);
 x_4 = l_Lean_Name_hash(x_2);
-x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4(x_3, x_4, x_2);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11(x_3, x_4, x_2);
 return x_5;
 }
 }
-lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -8360,7 +9156,7 @@ return x_9;
 }
 }
 }
-lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
@@ -8370,12 +9166,12 @@ x_5 = l_Lean_Name_hash(x_2);
 x_6 = lean_usize_modn(x_5, x_4);
 lean_dec(x_4);
 x_7 = lean_array_uget(x_3, x_6);
-x_8 = l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7(x_2, x_7);
+x_8 = l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14(x_2, x_7);
 lean_dec(x_7);
 return x_8;
 }
 }
-lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; 
@@ -8388,11 +9184,11 @@ lean_inc(x_4);
 x_5 = lean_ctor_get(x_1, 1);
 lean_inc(x_5);
 lean_dec(x_1);
-x_6 = l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3(x_5, x_2);
+x_6 = l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10(x_5, x_2);
 if (lean_obj_tag(x_6) == 0)
 {
 lean_object* x_7; 
-x_7 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6(x_4, x_2);
+x_7 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13(x_4, x_2);
 lean_dec(x_4);
 return x_7;
 }
@@ -8423,13 +9219,13 @@ lean_object* x_11; lean_object* x_12;
 x_11 = lean_ctor_get(x_1, 0);
 lean_inc(x_11);
 lean_dec(x_1);
-x_12 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6(x_11, x_2);
+x_12 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13(x_11, x_2);
 lean_dec(x_11);
 return x_12;
 }
 }
 }
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(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; 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; 
@@ -8483,7 +9279,7 @@ return x_20;
 }
 }
 }
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(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; uint8_t x_10; 
@@ -8502,7 +9298,7 @@ lean_object* x_11; lean_object* x_12;
 x_11 = lean_ctor_get(x_3, 6);
 lean_dec(x_11);
 lean_ctor_set(x_3, 6, x_9);
-x_12 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(x_2, x_3, x_4, x_8);
+x_12 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(x_2, x_3, x_4, x_8);
 return x_12;
 }
 else
@@ -8529,12 +9325,12 @@ lean_ctor_set(x_19, 3, x_16);
 lean_ctor_set(x_19, 4, x_17);
 lean_ctor_set(x_19, 5, x_18);
 lean_ctor_set(x_19, 6, x_9);
-x_20 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(x_2, x_19, x_4, x_8);
+x_20 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(x_2, x_19, x_4, x_8);
 return x_20;
 }
 }
 }
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(lean_object* x_1) {
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -8545,27 +9341,15 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg), 1, 0);
+x_3 = lean_alloc_closure((void*)(l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg), 1, 0);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(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; lean_object* x_8; 
-x_6 = lean_alloc_ctor(11, 2, 0);
-lean_ctor_set(x_6, 0, x_1);
-lean_ctor_set(x_6, 1, x_2);
-x_7 = 0;
-x_8 = l_Lean_Elab_log___at_Lean_Elab_Command_runLinters___spec__3(x_6, x_7, x_3, x_4, x_5);
-return x_8;
-}
-}
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 uint8_t x_8; 
@@ -8627,7 +9411,7 @@ return x_20;
 }
 }
 }
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(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; 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; 
@@ -8681,7 +9465,7 @@ return x_20;
 }
 }
 }
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg(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; lean_object* x_11; uint8_t x_12; 
@@ -8844,11 +9628,11 @@ return x_46;
 }
 }
 }
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14(lean_object* x_1) {
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg___boxed), 2, 0);
 return x_2;
 }
 }
@@ -8953,7 +9737,7 @@ lean_object* x_134; lean_object* x_135; lean_object* x_136;
 lean_inc(x_2);
 x_134 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_134, 0, x_2);
-x_135 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_132, x_134, x_4, x_5, x_128);
+x_135 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_132, x_134, x_4, x_5, x_128);
 x_136 = lean_ctor_get(x_135, 1);
 lean_inc(x_136);
 lean_dec(x_135);
@@ -9009,7 +9793,7 @@ x_143 = 0;
 x_144 = lean_usize_of_nat(x_137);
 lean_dec(x_137);
 x_145 = lean_box(0);
-x_146 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(x_123, x_143, x_144, x_145, x_4, x_5, x_120);
+x_146 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(x_123, x_143, x_144, x_145, x_4, x_5, x_120);
 lean_dec(x_4);
 lean_dec(x_123);
 return x_146;
@@ -9062,7 +9846,7 @@ lean_object* x_160; lean_object* x_161; lean_object* x_162;
 lean_inc(x_2);
 x_160 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_160, 0, x_2);
-x_161 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_158, x_160, x_4, x_5, x_154);
+x_161 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_158, x_160, x_4, x_5, x_154);
 x_162 = lean_ctor_get(x_161, 1);
 lean_inc(x_162);
 lean_dec(x_161);
@@ -9121,7 +9905,7 @@ x_171 = 0;
 x_172 = lean_usize_of_nat(x_163);
 lean_dec(x_163);
 x_173 = lean_box(0);
-x_174 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(x_149, x_171, x_172, x_173, x_4, x_5, x_147);
+x_174 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(x_149, x_171, x_172, x_173, x_4, x_5, x_147);
 lean_dec(x_4);
 lean_dec(x_149);
 return x_174;
@@ -9343,7 +10127,7 @@ lean_ctor_set(x_109, 0, x_108);
 x_110 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_110, 0, x_109);
 lean_inc(x_4);
-x_111 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_107, x_110, x_4, x_5, x_78);
+x_111 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_107, x_110, x_4, x_5, x_78);
 lean_dec(x_107);
 x_112 = lean_ctor_get(x_111, 0);
 lean_inc(x_112);
@@ -9357,7 +10141,7 @@ goto block_61;
 else
 {
 lean_object* x_114; lean_object* x_115; lean_object* x_116; 
-x_114 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_78);
+x_114 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_78);
 x_115 = lean_ctor_get(x_114, 0);
 lean_inc(x_115);
 x_116 = lean_ctor_get(x_114, 1);
@@ -9383,7 +10167,7 @@ lean_dec(x_8);
 x_33 = l_Lean_Elab_Command_commandElabAttribute;
 x_34 = lean_ctor_get(x_33, 2);
 lean_inc(x_34);
-x_35 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(x_34, x_30);
+x_35 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(x_34, x_30);
 lean_dec(x_30);
 lean_dec(x_34);
 x_36 = lean_ctor_get(x_35, 1);
@@ -9391,7 +10175,7 @@ lean_inc(x_36);
 lean_dec(x_35);
 lean_inc(x_2);
 x_37 = l_Lean_Syntax_getKind(x_2);
-x_38 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(x_36, x_37);
+x_38 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(x_36, x_37);
 if (lean_obj_tag(x_38) == 0)
 {
 lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
@@ -9627,7 +10411,7 @@ lean_object* x_298; lean_object* x_299; lean_object* x_300;
 lean_inc(x_2);
 x_298 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_298, 0, x_2);
-x_299 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_296, x_298, x_4, x_5, x_292);
+x_299 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_296, x_298, x_4, x_5, x_292);
 x_300 = lean_ctor_get(x_299, 1);
 lean_inc(x_300);
 lean_dec(x_299);
@@ -9695,7 +10479,7 @@ x_309 = 0;
 x_310 = lean_usize_of_nat(x_301);
 lean_dec(x_301);
 x_311 = lean_box(0);
-x_312 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(x_287, x_309, x_310, x_311, x_4, x_5, x_284);
+x_312 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(x_287, x_309, x_310, x_311, x_4, x_5, x_284);
 lean_dec(x_4);
 lean_dec(x_287);
 return x_312;
@@ -9914,7 +10698,7 @@ lean_ctor_set(x_274, 0, x_273);
 x_275 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_275, 0, x_274);
 lean_inc(x_4);
-x_276 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_272, x_275, x_4, x_5, x_247);
+x_276 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_272, x_275, x_4, x_5, x_247);
 lean_dec(x_272);
 x_277 = lean_ctor_get(x_276, 0);
 lean_inc(x_277);
@@ -9928,7 +10712,7 @@ goto block_230;
 else
 {
 lean_object* x_279; lean_object* x_280; lean_object* x_281; 
-x_279 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_247);
+x_279 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_247);
 x_280 = lean_ctor_get(x_279, 0);
 lean_inc(x_280);
 x_281 = lean_ctor_get(x_279, 1);
@@ -9954,7 +10738,7 @@ lean_dec(x_8);
 x_202 = l_Lean_Elab_Command_commandElabAttribute;
 x_203 = lean_ctor_get(x_202, 2);
 lean_inc(x_203);
-x_204 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(x_203, x_199);
+x_204 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(x_203, x_199);
 lean_dec(x_199);
 lean_dec(x_203);
 x_205 = lean_ctor_get(x_204, 1);
@@ -9962,7 +10746,7 @@ lean_inc(x_205);
 lean_dec(x_204);
 lean_inc(x_2);
 x_206 = l_Lean_Syntax_getKind(x_2);
-x_207 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(x_205, x_206);
+x_207 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(x_205, x_206);
 if (lean_obj_tag(x_207) == 0)
 {
 lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; 
@@ -10239,7 +11023,7 @@ lean_object* x_446; lean_object* x_447; lean_object* x_448;
 lean_inc(x_2);
 x_446 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_446, 0, x_2);
-x_447 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_444, x_446, x_341, x_5, x_440);
+x_447 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_444, x_446, x_341, x_5, x_440);
 x_448 = lean_ctor_get(x_447, 1);
 lean_inc(x_448);
 lean_dec(x_447);
@@ -10307,7 +11091,7 @@ x_457 = 0;
 x_458 = lean_usize_of_nat(x_449);
 lean_dec(x_449);
 x_459 = lean_box(0);
-x_460 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(x_435, x_457, x_458, x_459, x_341, x_5, x_432);
+x_460 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(x_435, x_457, x_458, x_459, x_341, x_5, x_432);
 lean_dec(x_341);
 lean_dec(x_435);
 return x_460;
@@ -10526,7 +11310,7 @@ lean_ctor_set(x_422, 0, x_421);
 x_423 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_423, 0, x_422);
 lean_inc(x_341);
-x_424 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_420, x_423, x_341, x_5, x_395);
+x_424 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_420, x_423, x_341, x_5, x_395);
 lean_dec(x_420);
 x_425 = lean_ctor_get(x_424, 0);
 lean_inc(x_425);
@@ -10540,7 +11324,7 @@ goto block_378;
 else
 {
 lean_object* x_427; lean_object* x_428; lean_object* x_429; 
-x_427 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_395);
+x_427 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_395);
 x_428 = lean_ctor_get(x_427, 0);
 lean_inc(x_428);
 x_429 = lean_ctor_get(x_427, 1);
@@ -10566,7 +11350,7 @@ lean_dec(x_8);
 x_350 = l_Lean_Elab_Command_commandElabAttribute;
 x_351 = lean_ctor_get(x_350, 2);
 lean_inc(x_351);
-x_352 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(x_351, x_347);
+x_352 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(x_351, x_347);
 lean_dec(x_347);
 lean_dec(x_351);
 x_353 = lean_ctor_get(x_352, 1);
@@ -10574,7 +11358,7 @@ lean_inc(x_353);
 lean_dec(x_352);
 lean_inc(x_2);
 x_354 = l_Lean_Syntax_getKind(x_2);
-x_355 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(x_353, x_354);
+x_355 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(x_353, x_354);
 if (lean_obj_tag(x_355) == 0)
 {
 lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; 
@@ -10710,1185 +11494,1481 @@ goto block_369;
 }
 }
 }
+static lean_object* _init_l_Lean_Elab_Command_elabCommand___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("info");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_Command_elabCommand___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1090____closed__1;
+x_2 = l_Lean_Elab_Command_elabCommand___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
 lean_object* l_Lean_Elab_Command_elabCommand(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_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
-x_61 = lean_st_ref_get(x_3, x_4);
-x_62 = lean_ctor_get(x_61, 0);
-lean_inc(x_62);
-x_63 = lean_ctor_get(x_62, 7);
-lean_inc(x_63);
-lean_dec(x_62);
-x_64 = lean_ctor_get_uint8(x_63, sizeof(void*)*2);
-lean_dec(x_63);
-if (x_64 == 0)
+lean_object* x_5; lean_object* x_51; lean_object* x_52; lean_object* x_110; lean_object* x_111; lean_object* x_112; uint8_t x_113; 
+x_110 = lean_st_ref_get(x_3, x_4);
+x_111 = lean_ctor_get(x_110, 0);
+lean_inc(x_111);
+x_112 = lean_ctor_get(x_111, 7);
+lean_inc(x_112);
+lean_dec(x_111);
+x_113 = lean_ctor_get_uint8(x_112, sizeof(void*)*2);
+lean_dec(x_112);
+if (x_113 == 0)
 {
-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; uint8_t x_81; 
-x_65 = lean_ctor_get(x_61, 1);
-lean_inc(x_65);
-lean_dec(x_61);
-x_66 = l_Lean_Elab_Command_getRef(x_2, x_3, x_65);
-x_67 = lean_ctor_get(x_66, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_68);
-lean_dec(x_66);
-x_69 = l_Lean_replaceRef(x_1, x_67);
-lean_dec(x_67);
-x_70 = lean_ctor_get(x_2, 0);
-x_71 = lean_ctor_get(x_2, 1);
-x_72 = lean_ctor_get(x_2, 2);
-x_73 = lean_ctor_get(x_2, 3);
-x_74 = lean_ctor_get(x_2, 4);
-x_75 = lean_ctor_get(x_2, 5);
-lean_inc(x_75);
-lean_inc(x_74);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_inc(x_70);
-x_76 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_76, 0, x_70);
-lean_ctor_set(x_76, 1, x_71);
-lean_ctor_set(x_76, 2, x_72);
-lean_ctor_set(x_76, 3, x_73);
-lean_ctor_set(x_76, 4, x_74);
-lean_ctor_set(x_76, 5, x_75);
-lean_ctor_set(x_76, 6, x_69);
-x_77 = lean_st_ref_get(x_3, x_68);
-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);
-x_80 = lean_ctor_get(x_78, 4);
-lean_inc(x_80);
-lean_dec(x_78);
-x_81 = lean_nat_dec_eq(x_72, x_80);
-lean_dec(x_80);
-if (x_81 == 0)
+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; uint8_t x_130; 
+x_114 = lean_ctor_get(x_110, 1);
+lean_inc(x_114);
+lean_dec(x_110);
+x_115 = l_Lean_Elab_Command_getRef(x_2, x_3, x_114);
+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 = l_Lean_replaceRef(x_1, x_116);
+lean_dec(x_116);
+x_119 = lean_ctor_get(x_2, 0);
+x_120 = lean_ctor_get(x_2, 1);
+x_121 = lean_ctor_get(x_2, 2);
+x_122 = lean_ctor_get(x_2, 3);
+x_123 = lean_ctor_get(x_2, 4);
+x_124 = lean_ctor_get(x_2, 5);
+lean_inc(x_124);
+lean_inc(x_123);
+lean_inc(x_122);
+lean_inc(x_121);
+lean_inc(x_120);
+lean_inc(x_119);
+x_125 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_125, 0, x_119);
+lean_ctor_set(x_125, 1, x_120);
+lean_ctor_set(x_125, 2, x_121);
+lean_ctor_set(x_125, 3, x_122);
+lean_ctor_set(x_125, 4, x_123);
+lean_ctor_set(x_125, 5, x_124);
+lean_ctor_set(x_125, 6, x_118);
+x_126 = lean_st_ref_get(x_3, x_117);
+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, 4);
+lean_inc(x_129);
+lean_dec(x_127);
+x_130 = lean_nat_dec_eq(x_121, x_129);
+lean_dec(x_129);
+if (x_130 == 0)
 {
-lean_object* x_82; lean_object* x_83; 
-x_82 = lean_box(0);
+lean_object* x_131; lean_object* x_132; 
+x_131 = lean_box(0);
 lean_inc(x_3);
-x_83 = l_Lean_Elab_Command_elabCommand___lambda__1(x_72, x_1, x_82, x_76, x_3, x_79);
-if (lean_obj_tag(x_83) == 0)
+x_132 = l_Lean_Elab_Command_elabCommand___lambda__1(x_121, x_1, x_131, x_125, x_3, x_128);
+if (lean_obj_tag(x_132) == 0)
 {
-lean_dec(x_3);
-return x_83;
+lean_object* x_133; 
+x_133 = lean_ctor_get(x_132, 1);
+lean_inc(x_133);
+lean_dec(x_132);
+x_5 = x_133;
+goto block_50;
 }
 else
 {
-lean_object* x_84; lean_object* x_85; 
-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_5 = x_84;
-x_6 = x_85;
-goto block_60;
+lean_object* x_134; lean_object* x_135; 
+x_134 = lean_ctor_get(x_132, 0);
+lean_inc(x_134);
+x_135 = lean_ctor_get(x_132, 1);
+lean_inc(x_135);
+lean_dec(x_132);
+x_51 = x_134;
+x_52 = x_135;
+goto block_109;
 }
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
 lean_dec(x_1);
-x_86 = l_Lean_withIncRecDepth___rarg___lambda__2___closed__2;
-x_87 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(x_86, x_76, x_3, x_79);
-x_88 = lean_ctor_get(x_87, 0);
-lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
-lean_inc(x_89);
-lean_dec(x_87);
-x_5 = x_88;
-x_6 = x_89;
-goto block_60;
+x_136 = l_Lean_withIncRecDepth___rarg___lambda__2___closed__2;
+x_137 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_136, x_125, x_3, x_128);
+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_51 = x_138;
+x_52 = x_139;
+goto block_109;
 }
 }
 else
 {
-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_173; lean_object* x_174; lean_object* x_247; lean_object* x_248; 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; uint8_t x_315; 
-x_90 = lean_ctor_get(x_61, 1);
-lean_inc(x_90);
-lean_dec(x_61);
-x_91 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg(x_3, x_90);
-x_92 = lean_ctor_get(x_91, 0);
-lean_inc(x_92);
-x_93 = lean_ctor_get(x_91, 1);
-lean_inc(x_93);
-lean_dec(x_91);
-x_94 = lean_st_ref_get(x_3, 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_ctor_get(x_95, 2);
-lean_inc(x_97);
-x_98 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_97);
-lean_dec(x_97);
-x_300 = l_Lean_Elab_Command_getRef(x_2, x_3, x_96);
-x_301 = lean_ctor_get(x_300, 0);
-lean_inc(x_301);
-x_302 = lean_ctor_get(x_300, 1);
-lean_inc(x_302);
-lean_dec(x_300);
-x_303 = l_Lean_replaceRef(x_1, x_301);
-lean_dec(x_301);
-x_304 = lean_ctor_get(x_2, 0);
-x_305 = lean_ctor_get(x_2, 1);
-x_306 = lean_ctor_get(x_2, 2);
-x_307 = lean_ctor_get(x_2, 3);
-x_308 = lean_ctor_get(x_2, 4);
-x_309 = lean_ctor_get(x_2, 5);
-lean_inc(x_309);
-lean_inc(x_308);
-lean_inc(x_307);
-lean_inc(x_306);
-lean_inc(x_305);
-lean_inc(x_304);
-x_310 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_310, 0, x_304);
-lean_ctor_set(x_310, 1, x_305);
-lean_ctor_set(x_310, 2, x_306);
-lean_ctor_set(x_310, 3, x_307);
-lean_ctor_set(x_310, 4, x_308);
-lean_ctor_set(x_310, 5, x_309);
-lean_ctor_set(x_310, 6, x_303);
-x_311 = lean_st_ref_get(x_3, x_302);
-x_312 = lean_ctor_get(x_311, 0);
-lean_inc(x_312);
-x_313 = lean_ctor_get(x_311, 1);
-lean_inc(x_313);
-lean_dec(x_311);
-x_314 = lean_ctor_get(x_312, 4);
-lean_inc(x_314);
-lean_dec(x_312);
-x_315 = lean_nat_dec_eq(x_306, x_314);
-lean_dec(x_314);
-if (x_315 == 0)
+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_216; lean_object* x_217; lean_object* x_290; lean_object* x_291; 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; uint8_t x_358; 
+x_140 = lean_ctor_get(x_110, 1);
+lean_inc(x_140);
+lean_dec(x_110);
+x_141 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg(x_3, x_140);
+x_142 = lean_ctor_get(x_141, 0);
+lean_inc(x_142);
+x_143 = lean_ctor_get(x_141, 1);
+lean_inc(x_143);
+lean_dec(x_141);
+x_144 = lean_st_ref_get(x_3, 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_145, 2);
+lean_inc(x_147);
+x_148 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_147);
+lean_dec(x_147);
+x_343 = l_Lean_Elab_Command_getRef(x_2, x_3, x_146);
+x_344 = lean_ctor_get(x_343, 0);
+lean_inc(x_344);
+x_345 = lean_ctor_get(x_343, 1);
+lean_inc(x_345);
+lean_dec(x_343);
+x_346 = l_Lean_replaceRef(x_1, x_344);
+lean_dec(x_344);
+x_347 = lean_ctor_get(x_2, 0);
+x_348 = lean_ctor_get(x_2, 1);
+x_349 = lean_ctor_get(x_2, 2);
+x_350 = lean_ctor_get(x_2, 3);
+x_351 = lean_ctor_get(x_2, 4);
+x_352 = lean_ctor_get(x_2, 5);
+lean_inc(x_352);
+lean_inc(x_351);
+lean_inc(x_350);
+lean_inc(x_349);
+lean_inc(x_348);
+lean_inc(x_347);
+x_353 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_353, 0, x_347);
+lean_ctor_set(x_353, 1, x_348);
+lean_ctor_set(x_353, 2, x_349);
+lean_ctor_set(x_353, 3, x_350);
+lean_ctor_set(x_353, 4, x_351);
+lean_ctor_set(x_353, 5, x_352);
+lean_ctor_set(x_353, 6, x_346);
+x_354 = lean_st_ref_get(x_3, x_345);
+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, 4);
+lean_inc(x_357);
+lean_dec(x_355);
+x_358 = lean_nat_dec_eq(x_349, x_357);
+lean_dec(x_357);
+if (x_358 == 0)
 {
-lean_object* x_316; lean_object* x_317; 
-x_316 = lean_box(0);
+lean_object* x_359; lean_object* x_360; 
+x_359 = lean_box(0);
 lean_inc(x_3);
 lean_inc(x_1);
-x_317 = l_Lean_Elab_Command_elabCommand___lambda__1(x_306, x_1, x_316, x_310, x_3, x_313);
-if (lean_obj_tag(x_317) == 0)
+x_360 = l_Lean_Elab_Command_elabCommand___lambda__1(x_349, x_1, x_359, x_353, x_3, x_356);
+if (lean_obj_tag(x_360) == 0)
 {
-lean_object* x_318; lean_object* x_319; 
-x_318 = lean_ctor_get(x_317, 0);
-lean_inc(x_318);
-x_319 = lean_ctor_get(x_317, 1);
-lean_inc(x_319);
-lean_dec(x_317);
-x_99 = x_318;
-x_100 = x_319;
-goto block_172;
+lean_object* x_361; lean_object* x_362; 
+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_149 = x_361;
+x_150 = x_362;
+goto block_215;
 }
 else
 {
-lean_object* x_320; lean_object* x_321; 
-x_320 = lean_ctor_get(x_317, 0);
-lean_inc(x_320);
-x_321 = lean_ctor_get(x_317, 1);
-lean_inc(x_321);
-lean_dec(x_317);
-x_247 = x_320;
-x_248 = x_321;
-goto block_299;
+lean_object* x_363; lean_object* x_364; 
+x_363 = lean_ctor_get(x_360, 0);
+lean_inc(x_363);
+x_364 = lean_ctor_get(x_360, 1);
+lean_inc(x_364);
+lean_dec(x_360);
+x_290 = x_363;
+x_291 = x_364;
+goto block_342;
 }
 }
 else
 {
-lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; 
-x_322 = l_Lean_withIncRecDepth___rarg___lambda__2___closed__2;
-x_323 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(x_322, x_310, x_3, x_313);
-x_324 = lean_ctor_get(x_323, 0);
-lean_inc(x_324);
-x_325 = lean_ctor_get(x_323, 1);
-lean_inc(x_325);
-lean_dec(x_323);
-x_247 = x_324;
-x_248 = x_325;
-goto block_299;
+lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; 
+x_365 = l_Lean_withIncRecDepth___rarg___lambda__2___closed__2;
+x_366 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_365, x_353, x_3, x_356);
+x_367 = lean_ctor_get(x_366, 0);
+lean_inc(x_367);
+x_368 = lean_ctor_get(x_366, 1);
+lean_inc(x_368);
+lean_dec(x_366);
+x_290 = x_367;
+x_291 = x_368;
+goto block_342;
 }
-block_172:
+block_215:
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; 
-x_101 = lean_st_ref_take(x_3, x_100);
-x_102 = lean_ctor_get(x_101, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_102, 7);
-lean_inc(x_103);
-x_104 = lean_ctor_get(x_101, 1);
-lean_inc(x_104);
-lean_dec(x_101);
-x_105 = !lean_is_exclusive(x_102);
-if (x_105 == 0)
-{
-lean_object* x_106; uint8_t x_107; 
-x_106 = lean_ctor_get(x_102, 7);
-lean_dec(x_106);
-x_107 = !lean_is_exclusive(x_103);
-if (x_107 == 0)
-{
-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; uint8_t x_121; 
-x_108 = lean_ctor_get(x_103, 1);
-x_109 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_109, 0, x_1);
-x_110 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_110, 0, x_109);
-lean_ctor_set(x_110, 1, x_108);
-x_111 = lean_ctor_get(x_95, 0);
-lean_inc(x_111);
-lean_dec(x_95);
-x_112 = lean_ctor_get(x_2, 1);
-x_113 = lean_ctor_get(x_98, 1);
-lean_inc(x_113);
-x_114 = lean_ctor_get(x_98, 2);
-lean_inc(x_114);
-x_115 = lean_ctor_get(x_98, 3);
-lean_inc(x_115);
-lean_dec(x_98);
-x_116 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
-lean_inc(x_112);
-x_117 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_117, 0, x_111);
-lean_ctor_set(x_117, 1, x_112);
-lean_ctor_set(x_117, 2, x_116);
-lean_ctor_set(x_117, 3, x_113);
-lean_ctor_set(x_117, 4, x_114);
-lean_ctor_set(x_117, 5, x_115);
-x_118 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_118, 0, x_117);
-lean_ctor_set(x_118, 1, x_110);
-x_119 = l_Std_PersistentArray_push___rarg(x_92, x_118);
-lean_ctor_set(x_103, 1, x_119);
-x_120 = lean_st_ref_set(x_3, x_102, x_104);
-lean_dec(x_3);
-x_121 = !lean_is_exclusive(x_120);
-if (x_121 == 0)
-{
-lean_object* x_122; 
-x_122 = lean_ctor_get(x_120, 0);
-lean_dec(x_122);
-lean_ctor_set(x_120, 0, x_99);
-return x_120;
-}
-else
-{
-lean_object* x_123; lean_object* x_124; 
-x_123 = lean_ctor_get(x_120, 1);
-lean_inc(x_123);
-lean_dec(x_120);
-x_124 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_124, 0, x_99);
-lean_ctor_set(x_124, 1, x_123);
-return x_124;
-}
-}
-else
-{
-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; 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; 
-x_125 = lean_ctor_get_uint8(x_103, sizeof(void*)*2);
-x_126 = lean_ctor_get(x_103, 0);
-x_127 = lean_ctor_get(x_103, 1);
-lean_inc(x_127);
-lean_inc(x_126);
-lean_dec(x_103);
-x_128 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_128, 0, x_1);
-x_129 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_129, 0, x_128);
-lean_ctor_set(x_129, 1, x_127);
-x_130 = lean_ctor_get(x_95, 0);
-lean_inc(x_130);
-lean_dec(x_95);
-x_131 = lean_ctor_get(x_2, 1);
-x_132 = lean_ctor_get(x_98, 1);
-lean_inc(x_132);
-x_133 = lean_ctor_get(x_98, 2);
-lean_inc(x_133);
-x_134 = lean_ctor_get(x_98, 3);
-lean_inc(x_134);
-lean_dec(x_98);
-x_135 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
-lean_inc(x_131);
-x_136 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_136, 0, x_130);
-lean_ctor_set(x_136, 1, x_131);
-lean_ctor_set(x_136, 2, x_135);
-lean_ctor_set(x_136, 3, x_132);
-lean_ctor_set(x_136, 4, x_133);
-lean_ctor_set(x_136, 5, x_134);
-x_137 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_137, 0, x_136);
-lean_ctor_set(x_137, 1, x_129);
-x_138 = l_Std_PersistentArray_push___rarg(x_92, x_137);
-x_139 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_139, 0, x_126);
-lean_ctor_set(x_139, 1, x_138);
-lean_ctor_set_uint8(x_139, sizeof(void*)*2, x_125);
-lean_ctor_set(x_102, 7, x_139);
-x_140 = lean_st_ref_set(x_3, x_102, x_104);
-lean_dec(x_3);
-x_141 = lean_ctor_get(x_140, 1);
-lean_inc(x_141);
-if (lean_is_exclusive(x_140)) {
- lean_ctor_release(x_140, 0);
- lean_ctor_release(x_140, 1);
- x_142 = x_140;
-} else {
- lean_dec_ref(x_140);
- x_142 = lean_box(0);
-}
-if (lean_is_scalar(x_142)) {
- x_143 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_143 = x_142;
-}
-lean_ctor_set(x_143, 0, x_99);
-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_object* x_148; lean_object* x_149; lean_object* x_150; uint8_t x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-x_144 = lean_ctor_get(x_102, 0);
-x_145 = lean_ctor_get(x_102, 1);
-x_146 = lean_ctor_get(x_102, 2);
-x_147 = lean_ctor_get(x_102, 3);
-x_148 = lean_ctor_get(x_102, 4);
-x_149 = lean_ctor_get(x_102, 5);
-x_150 = lean_ctor_get(x_102, 6);
-lean_inc(x_150);
-lean_inc(x_149);
-lean_inc(x_148);
-lean_inc(x_147);
-lean_inc(x_146);
-lean_inc(x_145);
-lean_inc(x_144);
-lean_dec(x_102);
-x_151 = lean_ctor_get_uint8(x_103, sizeof(void*)*2);
-x_152 = lean_ctor_get(x_103, 0);
+lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; uint8_t x_155; 
+lean_dec(x_149);
+x_151 = lean_st_ref_take(x_3, x_150);
+x_152 = lean_ctor_get(x_151, 0);
 lean_inc(x_152);
-x_153 = lean_ctor_get(x_103, 1);
+x_153 = lean_ctor_get(x_152, 7);
 lean_inc(x_153);
-if (lean_is_exclusive(x_103)) {
- lean_ctor_release(x_103, 0);
- lean_ctor_release(x_103, 1);
- x_154 = x_103;
-} else {
- lean_dec_ref(x_103);
- x_154 = lean_box(0);
-}
-x_155 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_155, 0, x_1);
-x_156 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_156, 0, x_155);
-lean_ctor_set(x_156, 1, x_153);
-x_157 = lean_ctor_get(x_95, 0);
-lean_inc(x_157);
-lean_dec(x_95);
-x_158 = lean_ctor_get(x_2, 1);
-x_159 = lean_ctor_get(x_98, 1);
-lean_inc(x_159);
-x_160 = lean_ctor_get(x_98, 2);
-lean_inc(x_160);
-x_161 = lean_ctor_get(x_98, 3);
+x_154 = lean_ctor_get(x_151, 1);
+lean_inc(x_154);
+lean_dec(x_151);
+x_155 = !lean_is_exclusive(x_152);
+if (x_155 == 0)
+{
+lean_object* x_156; uint8_t x_157; 
+x_156 = lean_ctor_get(x_152, 7);
+lean_dec(x_156);
+x_157 = !lean_is_exclusive(x_153);
+if (x_157 == 0)
+{
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
+x_158 = lean_ctor_get(x_153, 1);
+x_159 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_159, 0, x_1);
+x_160 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_160, 0, x_159);
+lean_ctor_set(x_160, 1, x_158);
+x_161 = lean_ctor_get(x_145, 0);
 lean_inc(x_161);
-lean_dec(x_98);
-x_162 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
-lean_inc(x_158);
-x_163 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_163, 0, x_157);
-lean_ctor_set(x_163, 1, x_158);
-lean_ctor_set(x_163, 2, x_162);
-lean_ctor_set(x_163, 3, x_159);
-lean_ctor_set(x_163, 4, x_160);
-lean_ctor_set(x_163, 5, x_161);
-x_164 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_164, 0, x_163);
-lean_ctor_set(x_164, 1, x_156);
-x_165 = l_Std_PersistentArray_push___rarg(x_92, x_164);
-if (lean_is_scalar(x_154)) {
- x_166 = lean_alloc_ctor(0, 2, 1);
-} else {
- x_166 = x_154;
+lean_dec(x_145);
+x_162 = lean_ctor_get(x_2, 1);
+x_163 = lean_ctor_get(x_148, 1);
+lean_inc(x_163);
+x_164 = lean_ctor_get(x_148, 2);
+lean_inc(x_164);
+x_165 = lean_ctor_get(x_148, 3);
+lean_inc(x_165);
+lean_dec(x_148);
+x_166 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+lean_inc(x_162);
+x_167 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_167, 0, x_161);
+lean_ctor_set(x_167, 1, x_162);
+lean_ctor_set(x_167, 2, x_166);
+lean_ctor_set(x_167, 3, x_163);
+lean_ctor_set(x_167, 4, x_164);
+lean_ctor_set(x_167, 5, x_165);
+x_168 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_168, 0, x_167);
+lean_ctor_set(x_168, 1, x_160);
+x_169 = l_Std_PersistentArray_push___rarg(x_142, x_168);
+lean_ctor_set(x_153, 1, x_169);
+x_170 = lean_st_ref_set(x_3, x_152, x_154);
+x_171 = lean_ctor_get(x_170, 1);
+lean_inc(x_171);
+lean_dec(x_170);
+x_5 = x_171;
+goto block_50;
 }
-lean_ctor_set(x_166, 0, x_152);
-lean_ctor_set(x_166, 1, x_165);
-lean_ctor_set_uint8(x_166, sizeof(void*)*2, x_151);
-x_167 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_167, 0, x_144);
-lean_ctor_set(x_167, 1, x_145);
-lean_ctor_set(x_167, 2, x_146);
-lean_ctor_set(x_167, 3, x_147);
-lean_ctor_set(x_167, 4, x_148);
-lean_ctor_set(x_167, 5, x_149);
-lean_ctor_set(x_167, 6, x_150);
-lean_ctor_set(x_167, 7, x_166);
-x_168 = lean_st_ref_set(x_3, x_167, x_104);
-lean_dec(x_3);
-x_169 = lean_ctor_get(x_168, 1);
-lean_inc(x_169);
-if (lean_is_exclusive(x_168)) {
- lean_ctor_release(x_168, 0);
- lean_ctor_release(x_168, 1);
- x_170 = x_168;
-} else {
- lean_dec_ref(x_168);
- x_170 = lean_box(0);
-}
-if (lean_is_scalar(x_170)) {
- x_171 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_171 = x_170;
-}
-lean_ctor_set(x_171, 0, x_99);
-lean_ctor_set(x_171, 1, x_169);
-return x_171;
-}
-}
-block_246:
+else
 {
-lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; uint8_t x_179; 
-x_175 = lean_st_ref_take(x_3, x_174);
-x_176 = lean_ctor_get(x_175, 0);
-lean_inc(x_176);
-x_177 = lean_ctor_get(x_176, 7);
+uint8_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; 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; 
+x_172 = lean_ctor_get_uint8(x_153, sizeof(void*)*2);
+x_173 = lean_ctor_get(x_153, 0);
+x_174 = lean_ctor_get(x_153, 1);
+lean_inc(x_174);
+lean_inc(x_173);
+lean_dec(x_153);
+x_175 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_175, 0, x_1);
+x_176 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_176, 0, x_175);
+lean_ctor_set(x_176, 1, x_174);
+x_177 = lean_ctor_get(x_145, 0);
 lean_inc(x_177);
-x_178 = lean_ctor_get(x_175, 1);
+lean_dec(x_145);
+x_178 = lean_ctor_get(x_2, 1);
+x_179 = lean_ctor_get(x_148, 1);
+lean_inc(x_179);
+x_180 = lean_ctor_get(x_148, 2);
+lean_inc(x_180);
+x_181 = lean_ctor_get(x_148, 3);
+lean_inc(x_181);
+lean_dec(x_148);
+x_182 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
 lean_inc(x_178);
-lean_dec(x_175);
-x_179 = !lean_is_exclusive(x_176);
-if (x_179 == 0)
-{
-lean_object* x_180; uint8_t x_181; 
-x_180 = lean_ctor_get(x_176, 7);
-lean_dec(x_180);
-x_181 = !lean_is_exclusive(x_177);
-if (x_181 == 0)
-{
-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; uint8_t x_195; 
-x_182 = lean_ctor_get(x_177, 1);
-x_183 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_183, 0, x_1);
-x_184 = lean_alloc_ctor(1, 2, 0);
+x_183 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_183, 0, x_177);
+lean_ctor_set(x_183, 1, x_178);
+lean_ctor_set(x_183, 2, x_182);
+lean_ctor_set(x_183, 3, x_179);
+lean_ctor_set(x_183, 4, x_180);
+lean_ctor_set(x_183, 5, x_181);
+x_184 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_184, 0, x_183);
-lean_ctor_set(x_184, 1, x_182);
-x_185 = lean_ctor_get(x_95, 0);
-lean_inc(x_185);
-lean_dec(x_95);
-x_186 = lean_ctor_get(x_2, 1);
-x_187 = lean_ctor_get(x_98, 1);
-lean_inc(x_187);
-x_188 = lean_ctor_get(x_98, 2);
+lean_ctor_set(x_184, 1, x_176);
+x_185 = l_Std_PersistentArray_push___rarg(x_142, x_184);
+x_186 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_186, 0, x_173);
+lean_ctor_set(x_186, 1, x_185);
+lean_ctor_set_uint8(x_186, sizeof(void*)*2, x_172);
+lean_ctor_set(x_152, 7, x_186);
+x_187 = lean_st_ref_set(x_3, x_152, x_154);
+x_188 = lean_ctor_get(x_187, 1);
 lean_inc(x_188);
-x_189 = lean_ctor_get(x_98, 3);
+lean_dec(x_187);
+x_5 = x_188;
+goto block_50;
+}
+}
+else
+{
+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; uint8_t 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; 
+x_189 = lean_ctor_get(x_152, 0);
+x_190 = lean_ctor_get(x_152, 1);
+x_191 = lean_ctor_get(x_152, 2);
+x_192 = lean_ctor_get(x_152, 3);
+x_193 = lean_ctor_get(x_152, 4);
+x_194 = lean_ctor_get(x_152, 5);
+x_195 = lean_ctor_get(x_152, 6);
+lean_inc(x_195);
+lean_inc(x_194);
+lean_inc(x_193);
+lean_inc(x_192);
+lean_inc(x_191);
+lean_inc(x_190);
 lean_inc(x_189);
-lean_dec(x_98);
-x_190 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
-lean_inc(x_186);
-x_191 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_191, 0, x_185);
-lean_ctor_set(x_191, 1, x_186);
-lean_ctor_set(x_191, 2, x_190);
-lean_ctor_set(x_191, 3, x_187);
-lean_ctor_set(x_191, 4, x_188);
-lean_ctor_set(x_191, 5, x_189);
-x_192 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_192, 0, x_191);
-lean_ctor_set(x_192, 1, x_184);
-x_193 = l_Std_PersistentArray_push___rarg(x_92, x_192);
-lean_ctor_set(x_177, 1, x_193);
-x_194 = lean_st_ref_set(x_3, x_176, x_178);
-lean_dec(x_3);
-x_195 = !lean_is_exclusive(x_194);
-if (x_195 == 0)
-{
-lean_object* x_196; 
-x_196 = lean_ctor_get(x_194, 0);
-lean_dec(x_196);
-lean_ctor_set_tag(x_194, 1);
-lean_ctor_set(x_194, 0, x_173);
-return x_194;
-}
-else
-{
-lean_object* x_197; lean_object* x_198; 
-x_197 = lean_ctor_get(x_194, 1);
+lean_dec(x_152);
+x_196 = lean_ctor_get_uint8(x_153, sizeof(void*)*2);
+x_197 = lean_ctor_get(x_153, 0);
 lean_inc(x_197);
-lean_dec(x_194);
-x_198 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_198, 0, x_173);
-lean_ctor_set(x_198, 1, x_197);
-return x_198;
+x_198 = lean_ctor_get(x_153, 1);
+lean_inc(x_198);
+if (lean_is_exclusive(x_153)) {
+ lean_ctor_release(x_153, 0);
+ lean_ctor_release(x_153, 1);
+ x_199 = x_153;
+} else {
+ lean_dec_ref(x_153);
+ x_199 = lean_box(0);
 }
-}
-else
-{
-uint8_t 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; 
-x_199 = lean_ctor_get_uint8(x_177, sizeof(void*)*2);
-x_200 = lean_ctor_get(x_177, 0);
-x_201 = lean_ctor_get(x_177, 1);
-lean_inc(x_201);
-lean_inc(x_200);
-lean_dec(x_177);
-x_202 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_202, 0, x_1);
-x_203 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_203, 0, x_202);
-lean_ctor_set(x_203, 1, x_201);
-x_204 = lean_ctor_get(x_95, 0);
+x_200 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_200, 0, x_1);
+x_201 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_201, 0, x_200);
+lean_ctor_set(x_201, 1, x_198);
+x_202 = lean_ctor_get(x_145, 0);
+lean_inc(x_202);
+lean_dec(x_145);
+x_203 = lean_ctor_get(x_2, 1);
+x_204 = lean_ctor_get(x_148, 1);
 lean_inc(x_204);
-lean_dec(x_95);
-x_205 = lean_ctor_get(x_2, 1);
-x_206 = lean_ctor_get(x_98, 1);
-lean_inc(x_206);
-x_207 = lean_ctor_get(x_98, 2);
-lean_inc(x_207);
-x_208 = lean_ctor_get(x_98, 3);
-lean_inc(x_208);
-lean_dec(x_98);
-x_209 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+x_205 = lean_ctor_get(x_148, 2);
 lean_inc(x_205);
-x_210 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_210, 0, x_204);
-lean_ctor_set(x_210, 1, x_205);
-lean_ctor_set(x_210, 2, x_209);
-lean_ctor_set(x_210, 3, x_206);
-lean_ctor_set(x_210, 4, x_207);
-lean_ctor_set(x_210, 5, x_208);
-x_211 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_211, 0, x_210);
-lean_ctor_set(x_211, 1, x_203);
-x_212 = l_Std_PersistentArray_push___rarg(x_92, x_211);
-x_213 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_213, 0, x_200);
-lean_ctor_set(x_213, 1, x_212);
-lean_ctor_set_uint8(x_213, sizeof(void*)*2, x_199);
-lean_ctor_set(x_176, 7, x_213);
-x_214 = lean_st_ref_set(x_3, x_176, x_178);
-lean_dec(x_3);
-x_215 = lean_ctor_get(x_214, 1);
-lean_inc(x_215);
-if (lean_is_exclusive(x_214)) {
- lean_ctor_release(x_214, 0);
- lean_ctor_release(x_214, 1);
- x_216 = x_214;
+x_206 = lean_ctor_get(x_148, 3);
+lean_inc(x_206);
+lean_dec(x_148);
+x_207 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+lean_inc(x_203);
+x_208 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_208, 0, x_202);
+lean_ctor_set(x_208, 1, x_203);
+lean_ctor_set(x_208, 2, x_207);
+lean_ctor_set(x_208, 3, x_204);
+lean_ctor_set(x_208, 4, x_205);
+lean_ctor_set(x_208, 5, x_206);
+x_209 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_209, 0, x_208);
+lean_ctor_set(x_209, 1, x_201);
+x_210 = l_Std_PersistentArray_push___rarg(x_142, x_209);
+if (lean_is_scalar(x_199)) {
+ x_211 = lean_alloc_ctor(0, 2, 1);
 } else {
- lean_dec_ref(x_214);
- x_216 = lean_box(0);
+ x_211 = x_199;
 }
-if (lean_is_scalar(x_216)) {
- x_217 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_217 = x_216;
- lean_ctor_set_tag(x_217, 1);
-}
-lean_ctor_set(x_217, 0, x_173);
-lean_ctor_set(x_217, 1, x_215);
-return x_217;
+lean_ctor_set(x_211, 0, x_197);
+lean_ctor_set(x_211, 1, x_210);
+lean_ctor_set_uint8(x_211, sizeof(void*)*2, x_196);
+x_212 = lean_alloc_ctor(0, 8, 0);
+lean_ctor_set(x_212, 0, x_189);
+lean_ctor_set(x_212, 1, x_190);
+lean_ctor_set(x_212, 2, x_191);
+lean_ctor_set(x_212, 3, x_192);
+lean_ctor_set(x_212, 4, x_193);
+lean_ctor_set(x_212, 5, x_194);
+lean_ctor_set(x_212, 6, x_195);
+lean_ctor_set(x_212, 7, x_211);
+x_213 = lean_st_ref_set(x_3, x_212, x_154);
+x_214 = lean_ctor_get(x_213, 1);
+lean_inc(x_214);
+lean_dec(x_213);
+x_5 = x_214;
+goto block_50;
 }
 }
-else
+block_289:
 {
-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; uint8_t 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; 
-x_218 = lean_ctor_get(x_176, 0);
-x_219 = lean_ctor_get(x_176, 1);
-x_220 = lean_ctor_get(x_176, 2);
-x_221 = lean_ctor_get(x_176, 3);
-x_222 = lean_ctor_get(x_176, 4);
-x_223 = lean_ctor_get(x_176, 5);
-x_224 = lean_ctor_get(x_176, 6);
-lean_inc(x_224);
-lean_inc(x_223);
-lean_inc(x_222);
-lean_inc(x_221);
-lean_inc(x_220);
+lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; uint8_t x_222; 
+x_218 = lean_st_ref_take(x_3, x_217);
+x_219 = lean_ctor_get(x_218, 0);
 lean_inc(x_219);
-lean_inc(x_218);
-lean_dec(x_176);
-x_225 = lean_ctor_get_uint8(x_177, sizeof(void*)*2);
-x_226 = lean_ctor_get(x_177, 0);
-lean_inc(x_226);
-x_227 = lean_ctor_get(x_177, 1);
-lean_inc(x_227);
-if (lean_is_exclusive(x_177)) {
- lean_ctor_release(x_177, 0);
- lean_ctor_release(x_177, 1);
- x_228 = x_177;
-} else {
- lean_dec_ref(x_177);
- x_228 = lean_box(0);
-}
-x_229 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_229, 0, x_1);
-x_230 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_230, 0, x_229);
-lean_ctor_set(x_230, 1, x_227);
-x_231 = lean_ctor_get(x_95, 0);
+x_220 = lean_ctor_get(x_219, 7);
+lean_inc(x_220);
+x_221 = lean_ctor_get(x_218, 1);
+lean_inc(x_221);
+lean_dec(x_218);
+x_222 = !lean_is_exclusive(x_219);
+if (x_222 == 0)
+{
+lean_object* x_223; uint8_t x_224; 
+x_223 = lean_ctor_get(x_219, 7);
+lean_dec(x_223);
+x_224 = !lean_is_exclusive(x_220);
+if (x_224 == 0)
+{
+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; uint8_t x_238; 
+x_225 = lean_ctor_get(x_220, 1);
+x_226 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_226, 0, x_1);
+x_227 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_227, 0, x_226);
+lean_ctor_set(x_227, 1, x_225);
+x_228 = lean_ctor_get(x_145, 0);
+lean_inc(x_228);
+lean_dec(x_145);
+x_229 = lean_ctor_get(x_2, 1);
+x_230 = lean_ctor_get(x_148, 1);
+lean_inc(x_230);
+x_231 = lean_ctor_get(x_148, 2);
 lean_inc(x_231);
-lean_dec(x_95);
-x_232 = lean_ctor_get(x_2, 1);
-x_233 = lean_ctor_get(x_98, 1);
-lean_inc(x_233);
-x_234 = lean_ctor_get(x_98, 2);
-lean_inc(x_234);
-x_235 = lean_ctor_get(x_98, 3);
-lean_inc(x_235);
-lean_dec(x_98);
-x_236 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+x_232 = lean_ctor_get(x_148, 3);
 lean_inc(x_232);
-x_237 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_237, 0, x_231);
-lean_ctor_set(x_237, 1, x_232);
-lean_ctor_set(x_237, 2, x_236);
-lean_ctor_set(x_237, 3, x_233);
-lean_ctor_set(x_237, 4, x_234);
-lean_ctor_set(x_237, 5, x_235);
-x_238 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_238, 0, x_237);
-lean_ctor_set(x_238, 1, x_230);
-x_239 = l_Std_PersistentArray_push___rarg(x_92, x_238);
-if (lean_is_scalar(x_228)) {
- x_240 = lean_alloc_ctor(0, 2, 1);
-} else {
- x_240 = x_228;
-}
-lean_ctor_set(x_240, 0, x_226);
-lean_ctor_set(x_240, 1, x_239);
-lean_ctor_set_uint8(x_240, sizeof(void*)*2, x_225);
-x_241 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_241, 0, x_218);
-lean_ctor_set(x_241, 1, x_219);
-lean_ctor_set(x_241, 2, x_220);
-lean_ctor_set(x_241, 3, x_221);
-lean_ctor_set(x_241, 4, x_222);
-lean_ctor_set(x_241, 5, x_223);
-lean_ctor_set(x_241, 6, x_224);
-lean_ctor_set(x_241, 7, x_240);
-x_242 = lean_st_ref_set(x_3, x_241, x_178);
+lean_dec(x_148);
+x_233 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+lean_inc(x_229);
+x_234 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_234, 0, x_228);
+lean_ctor_set(x_234, 1, x_229);
+lean_ctor_set(x_234, 2, x_233);
+lean_ctor_set(x_234, 3, x_230);
+lean_ctor_set(x_234, 4, x_231);
+lean_ctor_set(x_234, 5, x_232);
+x_235 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_235, 0, x_234);
+lean_ctor_set(x_235, 1, x_227);
+x_236 = l_Std_PersistentArray_push___rarg(x_142, x_235);
+lean_ctor_set(x_220, 1, x_236);
+x_237 = lean_st_ref_set(x_3, x_219, x_221);
 lean_dec(x_3);
-x_243 = lean_ctor_get(x_242, 1);
+x_238 = !lean_is_exclusive(x_237);
+if (x_238 == 0)
+{
+lean_object* x_239; 
+x_239 = lean_ctor_get(x_237, 0);
+lean_dec(x_239);
+lean_ctor_set_tag(x_237, 1);
+lean_ctor_set(x_237, 0, x_216);
+return x_237;
+}
+else
+{
+lean_object* x_240; lean_object* x_241; 
+x_240 = lean_ctor_get(x_237, 1);
+lean_inc(x_240);
+lean_dec(x_237);
+x_241 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_241, 0, x_216);
+lean_ctor_set(x_241, 1, x_240);
+return x_241;
+}
+}
+else
+{
+uint8_t 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; 
+x_242 = lean_ctor_get_uint8(x_220, sizeof(void*)*2);
+x_243 = lean_ctor_get(x_220, 0);
+x_244 = lean_ctor_get(x_220, 1);
+lean_inc(x_244);
 lean_inc(x_243);
-if (lean_is_exclusive(x_242)) {
- lean_ctor_release(x_242, 0);
- lean_ctor_release(x_242, 1);
- x_244 = x_242;
-} else {
- lean_dec_ref(x_242);
- x_244 = lean_box(0);
-}
-if (lean_is_scalar(x_244)) {
- x_245 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_245 = x_244;
- lean_ctor_set_tag(x_245, 1);
-}
-lean_ctor_set(x_245, 0, x_173);
-lean_ctor_set(x_245, 1, x_243);
-return x_245;
-}
-}
-block_299:
-{
-if (lean_obj_tag(x_247) == 0)
-{
-lean_object* x_249; 
-x_249 = l_Lean_Elab_logException___at_Lean_Elab_Command_withLogging___spec__1(x_247, x_2, x_3, x_248);
-if (lean_obj_tag(x_249) == 0)
-{
-lean_object* x_250; lean_object* x_251; 
-x_250 = lean_ctor_get(x_249, 0);
+lean_dec(x_220);
+x_245 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_245, 0, x_1);
+x_246 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_246, 0, x_245);
+lean_ctor_set(x_246, 1, x_244);
+x_247 = lean_ctor_get(x_145, 0);
+lean_inc(x_247);
+lean_dec(x_145);
+x_248 = lean_ctor_get(x_2, 1);
+x_249 = lean_ctor_get(x_148, 1);
+lean_inc(x_249);
+x_250 = lean_ctor_get(x_148, 2);
 lean_inc(x_250);
-x_251 = lean_ctor_get(x_249, 1);
+x_251 = lean_ctor_get(x_148, 3);
 lean_inc(x_251);
-lean_dec(x_249);
-x_99 = x_250;
-x_100 = x_251;
-goto block_172;
+lean_dec(x_148);
+x_252 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+lean_inc(x_248);
+x_253 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_253, 0, x_247);
+lean_ctor_set(x_253, 1, x_248);
+lean_ctor_set(x_253, 2, x_252);
+lean_ctor_set(x_253, 3, x_249);
+lean_ctor_set(x_253, 4, x_250);
+lean_ctor_set(x_253, 5, x_251);
+x_254 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_254, 0, x_253);
+lean_ctor_set(x_254, 1, x_246);
+x_255 = l_Std_PersistentArray_push___rarg(x_142, x_254);
+x_256 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_256, 0, x_243);
+lean_ctor_set(x_256, 1, x_255);
+lean_ctor_set_uint8(x_256, sizeof(void*)*2, x_242);
+lean_ctor_set(x_219, 7, x_256);
+x_257 = lean_st_ref_set(x_3, x_219, x_221);
+lean_dec(x_3);
+x_258 = lean_ctor_get(x_257, 1);
+lean_inc(x_258);
+if (lean_is_exclusive(x_257)) {
+ lean_ctor_release(x_257, 0);
+ lean_ctor_release(x_257, 1);
+ x_259 = x_257;
+} else {
+ lean_dec_ref(x_257);
+ x_259 = lean_box(0);
 }
-else
-{
-lean_object* x_252; lean_object* x_253; 
-x_252 = lean_ctor_get(x_249, 0);
-lean_inc(x_252);
-x_253 = lean_ctor_get(x_249, 1);
-lean_inc(x_253);
-lean_dec(x_249);
-x_173 = x_252;
-x_174 = x_253;
-goto block_246;
+if (lean_is_scalar(x_259)) {
+ x_260 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_260 = x_259;
+ lean_ctor_set_tag(x_260, 1);
+}
+lean_ctor_set(x_260, 0, x_216);
+lean_ctor_set(x_260, 1, x_258);
+return x_260;
 }
 }
 else
 {
-uint8_t x_254; 
-x_254 = !lean_is_exclusive(x_247);
-if (x_254 == 0)
-{
-lean_object* x_255; lean_object* x_256; uint8_t x_257; 
-x_255 = lean_ctor_get(x_247, 0);
-x_256 = lean_ctor_get(x_247, 1);
-lean_dec(x_256);
-x_257 = l_Lean_Elab_isAbortExceptionId(x_255);
-if (x_257 == 0)
-{
-lean_object* x_258; 
-x_258 = l_Lean_InternalExceptionId_getName(x_255, x_248);
-lean_dec(x_255);
-if (lean_obj_tag(x_258) == 0)
-{
-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; uint8_t x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-lean_free_object(x_247);
-x_259 = lean_ctor_get(x_258, 0);
-lean_inc(x_259);
-x_260 = lean_ctor_get(x_258, 1);
-lean_inc(x_260);
-lean_dec(x_258);
-x_261 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_261, 0, x_259);
-x_262 = l_Lean_Elab_Command_withLogging___closed__2;
-x_263 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_263, 0, x_262);
-lean_ctor_set(x_263, 1, x_261);
-x_264 = l_Lean_KernelException_toMessageData___closed__15;
-x_265 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_265, 0, x_263);
-lean_ctor_set(x_265, 1, x_264);
-x_266 = 2;
-x_267 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_265, x_266, x_2, x_3, x_260);
-x_268 = lean_ctor_get(x_267, 0);
-lean_inc(x_268);
-x_269 = lean_ctor_get(x_267, 1);
+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; uint8_t 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; 
+x_261 = lean_ctor_get(x_219, 0);
+x_262 = lean_ctor_get(x_219, 1);
+x_263 = lean_ctor_get(x_219, 2);
+x_264 = lean_ctor_get(x_219, 3);
+x_265 = lean_ctor_get(x_219, 4);
+x_266 = lean_ctor_get(x_219, 5);
+x_267 = lean_ctor_get(x_219, 6);
+lean_inc(x_267);
+lean_inc(x_266);
+lean_inc(x_265);
+lean_inc(x_264);
+lean_inc(x_263);
+lean_inc(x_262);
+lean_inc(x_261);
+lean_dec(x_219);
+x_268 = lean_ctor_get_uint8(x_220, sizeof(void*)*2);
+x_269 = lean_ctor_get(x_220, 0);
 lean_inc(x_269);
-lean_dec(x_267);
-x_99 = x_268;
-x_100 = x_269;
-goto block_172;
-}
-else
-{
-lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; 
-x_270 = lean_ctor_get(x_258, 0);
+x_270 = lean_ctor_get(x_220, 1);
 lean_inc(x_270);
-x_271 = lean_ctor_get(x_258, 1);
-lean_inc(x_271);
-lean_dec(x_258);
-x_272 = lean_ctor_get(x_2, 6);
-x_273 = lean_io_error_to_string(x_270);
-x_274 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_274, 0, x_273);
-x_275 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_275, 0, x_274);
-lean_inc(x_272);
-lean_ctor_set_tag(x_247, 0);
-lean_ctor_set(x_247, 1, x_275);
-lean_ctor_set(x_247, 0, x_272);
-x_173 = x_247;
-x_174 = x_271;
-goto block_246;
+if (lean_is_exclusive(x_220)) {
+ lean_ctor_release(x_220, 0);
+ lean_ctor_release(x_220, 1);
+ x_271 = x_220;
+} else {
+ lean_dec_ref(x_220);
+ x_271 = lean_box(0);
 }
-}
-else
-{
-lean_object* x_276; 
-lean_free_object(x_247);
-lean_dec(x_255);
-x_276 = lean_box(0);
-x_99 = x_276;
-x_100 = x_248;
-goto block_172;
-}
-}
-else
-{
-lean_object* x_277; uint8_t x_278; 
-x_277 = lean_ctor_get(x_247, 0);
+x_272 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_272, 0, x_1);
+x_273 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_273, 0, x_272);
+lean_ctor_set(x_273, 1, x_270);
+x_274 = lean_ctor_get(x_145, 0);
+lean_inc(x_274);
+lean_dec(x_145);
+x_275 = lean_ctor_get(x_2, 1);
+x_276 = lean_ctor_get(x_148, 1);
+lean_inc(x_276);
+x_277 = lean_ctor_get(x_148, 2);
 lean_inc(x_277);
-lean_dec(x_247);
-x_278 = l_Lean_Elab_isAbortExceptionId(x_277);
-if (x_278 == 0)
-{
-lean_object* x_279; 
-x_279 = l_Lean_InternalExceptionId_getName(x_277, x_248);
-lean_dec(x_277);
-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; uint8_t x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; 
-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_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_282, 0, x_280);
-x_283 = l_Lean_Elab_Command_withLogging___closed__2;
-x_284 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_284, 0, x_283);
-lean_ctor_set(x_284, 1, x_282);
-x_285 = l_Lean_KernelException_toMessageData___closed__15;
-x_286 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_286, 0, x_284);
-lean_ctor_set(x_286, 1, x_285);
-x_287 = 2;
-x_288 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_286, x_287, x_2, x_3, x_281);
-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_99 = x_289;
-x_100 = x_290;
-goto block_172;
+x_278 = lean_ctor_get(x_148, 3);
+lean_inc(x_278);
+lean_dec(x_148);
+x_279 = l_Lean_MetavarContext_instInhabitedMetavarContext___closed__1;
+lean_inc(x_275);
+x_280 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_280, 0, x_274);
+lean_ctor_set(x_280, 1, x_275);
+lean_ctor_set(x_280, 2, x_279);
+lean_ctor_set(x_280, 3, x_276);
+lean_ctor_set(x_280, 4, x_277);
+lean_ctor_set(x_280, 5, x_278);
+x_281 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_281, 0, x_280);
+lean_ctor_set(x_281, 1, x_273);
+x_282 = l_Std_PersistentArray_push___rarg(x_142, x_281);
+if (lean_is_scalar(x_271)) {
+ x_283 = lean_alloc_ctor(0, 2, 1);
+} else {
+ x_283 = x_271;
 }
-else
+lean_ctor_set(x_283, 0, x_269);
+lean_ctor_set(x_283, 1, x_282);
+lean_ctor_set_uint8(x_283, sizeof(void*)*2, x_268);
+x_284 = lean_alloc_ctor(0, 8, 0);
+lean_ctor_set(x_284, 0, x_261);
+lean_ctor_set(x_284, 1, x_262);
+lean_ctor_set(x_284, 2, x_263);
+lean_ctor_set(x_284, 3, x_264);
+lean_ctor_set(x_284, 4, x_265);
+lean_ctor_set(x_284, 5, x_266);
+lean_ctor_set(x_284, 6, x_267);
+lean_ctor_set(x_284, 7, x_283);
+x_285 = lean_st_ref_set(x_3, x_284, x_221);
+lean_dec(x_3);
+x_286 = lean_ctor_get(x_285, 1);
+lean_inc(x_286);
+if (lean_is_exclusive(x_285)) {
+ lean_ctor_release(x_285, 0);
+ lean_ctor_release(x_285, 1);
+ x_287 = x_285;
+} else {
+ lean_dec_ref(x_285);
+ x_287 = lean_box(0);
+}
+if (lean_is_scalar(x_287)) {
+ x_288 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_288 = x_287;
+ lean_ctor_set_tag(x_288, 1);
+}
+lean_ctor_set(x_288, 0, x_216);
+lean_ctor_set(x_288, 1, x_286);
+return x_288;
+}
+}
+block_342:
 {
-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; 
-x_291 = lean_ctor_get(x_279, 0);
-lean_inc(x_291);
-x_292 = lean_ctor_get(x_279, 1);
-lean_inc(x_292);
-lean_dec(x_279);
-x_293 = lean_ctor_get(x_2, 6);
-x_294 = lean_io_error_to_string(x_291);
-x_295 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_295, 0, x_294);
-x_296 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_296, 0, x_295);
+if (lean_obj_tag(x_290) == 0)
+{
+lean_object* x_292; 
+x_292 = l_Lean_Elab_logException___at_Lean_Elab_Command_withLogging___spec__1(x_290, x_2, x_3, x_291);
+if (lean_obj_tag(x_292) == 0)
+{
+lean_object* x_293; lean_object* x_294; 
+x_293 = lean_ctor_get(x_292, 0);
 lean_inc(x_293);
-x_297 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_297, 0, x_293);
-lean_ctor_set(x_297, 1, x_296);
-x_173 = x_297;
-x_174 = x_292;
-goto block_246;
+x_294 = lean_ctor_get(x_292, 1);
+lean_inc(x_294);
+lean_dec(x_292);
+x_149 = x_293;
+x_150 = x_294;
+goto block_215;
+}
+else
+{
+lean_object* x_295; lean_object* x_296; 
+x_295 = lean_ctor_get(x_292, 0);
+lean_inc(x_295);
+x_296 = lean_ctor_get(x_292, 1);
+lean_inc(x_296);
+lean_dec(x_292);
+x_216 = x_295;
+x_217 = x_296;
+goto block_289;
 }
 }
 else
 {
-lean_object* x_298; 
-lean_dec(x_277);
-x_298 = lean_box(0);
-x_99 = x_298;
-x_100 = x_248;
-goto block_172;
-}
-}
-}
-}
-}
-block_60:
+uint8_t x_297; 
+x_297 = !lean_is_exclusive(x_290);
+if (x_297 == 0)
 {
-if (lean_obj_tag(x_5) == 0)
+lean_object* x_298; lean_object* x_299; uint8_t x_300; 
+x_298 = lean_ctor_get(x_290, 0);
+x_299 = lean_ctor_get(x_290, 1);
+lean_dec(x_299);
+x_300 = l_Lean_Elab_isAbortExceptionId(x_298);
+if (x_300 == 0)
 {
-lean_object* x_7; 
-x_7 = l_Lean_Elab_logException___at_Lean_Elab_Command_withLogging___spec__1(x_5, x_2, x_3, x_6);
-lean_dec(x_3);
-return x_7;
+lean_object* x_301; 
+x_301 = l_Lean_InternalExceptionId_getName(x_298, x_291);
+lean_dec(x_298);
+if (lean_obj_tag(x_301) == 0)
+{
+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; uint8_t x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
+lean_free_object(x_290);
+x_302 = lean_ctor_get(x_301, 0);
+lean_inc(x_302);
+x_303 = lean_ctor_get(x_301, 1);
+lean_inc(x_303);
+lean_dec(x_301);
+x_304 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_304, 0, x_302);
+x_305 = l_Lean_Elab_Command_withLogging___closed__2;
+x_306 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_306, 0, x_305);
+lean_ctor_set(x_306, 1, x_304);
+x_307 = l_Lean_KernelException_toMessageData___closed__15;
+x_308 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_308, 0, x_306);
+lean_ctor_set(x_308, 1, x_307);
+x_309 = 2;
+x_310 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_308, x_309, x_2, x_3, x_303);
+x_311 = lean_ctor_get(x_310, 0);
+lean_inc(x_311);
+x_312 = lean_ctor_get(x_310, 1);
+lean_inc(x_312);
+lean_dec(x_310);
+x_149 = x_311;
+x_150 = x_312;
+goto block_215;
 }
 else
 {
-uint8_t x_8; 
-x_8 = !lean_is_exclusive(x_5);
-if (x_8 == 0)
+lean_object* x_313; lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; 
+x_313 = lean_ctor_get(x_301, 0);
+lean_inc(x_313);
+x_314 = lean_ctor_get(x_301, 1);
+lean_inc(x_314);
+lean_dec(x_301);
+x_315 = lean_ctor_get(x_2, 6);
+x_316 = lean_io_error_to_string(x_313);
+x_317 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_317, 0, x_316);
+x_318 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_318, 0, x_317);
+lean_inc(x_315);
+lean_ctor_set_tag(x_290, 0);
+lean_ctor_set(x_290, 1, x_318);
+lean_ctor_set(x_290, 0, x_315);
+x_216 = x_290;
+x_217 = x_314;
+goto block_289;
+}
+}
+else
 {
-lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_9 = lean_ctor_get(x_5, 0);
-x_10 = lean_ctor_get(x_5, 1);
+lean_object* x_319; 
+lean_free_object(x_290);
+lean_dec(x_298);
+x_319 = lean_box(0);
+x_149 = x_319;
+x_150 = x_291;
+goto block_215;
+}
+}
+else
+{
+lean_object* x_320; uint8_t x_321; 
+x_320 = lean_ctor_get(x_290, 0);
+lean_inc(x_320);
+lean_dec(x_290);
+x_321 = l_Lean_Elab_isAbortExceptionId(x_320);
+if (x_321 == 0)
+{
+lean_object* x_322; 
+x_322 = l_Lean_InternalExceptionId_getName(x_320, x_291);
+lean_dec(x_320);
+if (lean_obj_tag(x_322) == 0)
+{
+lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; uint8_t x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; 
+x_323 = lean_ctor_get(x_322, 0);
+lean_inc(x_323);
+x_324 = lean_ctor_get(x_322, 1);
+lean_inc(x_324);
+lean_dec(x_322);
+x_325 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_325, 0, x_323);
+x_326 = l_Lean_Elab_Command_withLogging___closed__2;
+x_327 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_327, 0, x_326);
+lean_ctor_set(x_327, 1, x_325);
+x_328 = l_Lean_KernelException_toMessageData___closed__15;
+x_329 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_329, 0, x_327);
+lean_ctor_set(x_329, 1, x_328);
+x_330 = 2;
+x_331 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_329, x_330, x_2, x_3, x_324);
+x_332 = lean_ctor_get(x_331, 0);
+lean_inc(x_332);
+x_333 = lean_ctor_get(x_331, 1);
+lean_inc(x_333);
+lean_dec(x_331);
+x_149 = x_332;
+x_150 = x_333;
+goto block_215;
+}
+else
+{
+lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; 
+x_334 = lean_ctor_get(x_322, 0);
+lean_inc(x_334);
+x_335 = lean_ctor_get(x_322, 1);
+lean_inc(x_335);
+lean_dec(x_322);
+x_336 = lean_ctor_get(x_2, 6);
+x_337 = lean_io_error_to_string(x_334);
+x_338 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_338, 0, x_337);
+x_339 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_339, 0, x_338);
+lean_inc(x_336);
+x_340 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_340, 0, x_336);
+lean_ctor_set(x_340, 1, x_339);
+x_216 = x_340;
+x_217 = x_335;
+goto block_289;
+}
+}
+else
+{
+lean_object* x_341; 
+lean_dec(x_320);
+x_341 = lean_box(0);
+x_149 = x_341;
+x_150 = x_291;
+goto block_215;
+}
+}
+}
+}
+}
+block_50:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_st_ref_get(x_3, x_5);
+x_7 = !lean_is_exclusive(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_8 = lean_ctor_get(x_6, 0);
+x_9 = lean_ctor_get(x_6, 1);
+x_10 = lean_ctor_get(x_8, 2);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_10);
 lean_dec(x_10);
-x_11 = l_Lean_Elab_isAbortExceptionId(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; 
-x_12 = l_Lean_InternalExceptionId_getName(x_9, x_6);
-lean_dec(x_9);
-if (lean_obj_tag(x_12) == 0)
-{
-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_21; 
-lean_free_object(x_5);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
+x_12 = lean_ctor_get(x_11, 1);
+lean_inc(x_12);
+lean_dec(x_11);
+x_13 = l_Lean_Elab_Command_elabCommand___closed__2;
+x_14 = l_Lean_checkTraceOption(x_12, x_13);
 lean_dec(x_12);
-x_15 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_15, 0, x_13);
-x_16 = l_Lean_Elab_Command_withLogging___closed__2;
-x_17 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_17, 0, x_16);
-lean_ctor_set(x_17, 1, x_15);
-x_18 = l_Lean_KernelException_toMessageData___closed__15;
-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 = 2;
-x_21 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_19, x_20, x_2, x_3, x_14);
+if (x_14 == 0)
+{
+lean_object* x_15; 
 lean_dec(x_3);
-return x_21;
+x_15 = lean_box(0);
+lean_ctor_set(x_6, 0, x_15);
+return x_6;
 }
 else
 {
-uint8_t x_22; 
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+lean_free_object(x_6);
+x_16 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg(x_3, x_9);
+x_17 = lean_ctor_get(x_16, 0);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_16, 1);
+lean_inc(x_18);
+lean_dec(x_16);
+x_19 = lean_box(0);
+x_20 = l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3(x_13, x_17, x_19, x_2, x_3, x_18);
 lean_dec(x_3);
-x_22 = !lean_is_exclusive(x_12);
-if (x_22 == 0)
+lean_dec(x_17);
+if (lean_obj_tag(x_20) == 0)
 {
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_23 = lean_ctor_get(x_12, 0);
-x_24 = lean_ctor_get(x_2, 6);
-x_25 = lean_io_error_to_string(x_23);
-x_26 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_26, 0, x_25);
-x_27 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_inc(x_24);
-lean_ctor_set_tag(x_5, 0);
-lean_ctor_set(x_5, 1, x_27);
-lean_ctor_set(x_5, 0, x_24);
-lean_ctor_set(x_12, 0, x_5);
-return x_12;
+uint8_t x_21; 
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; 
+x_22 = lean_ctor_get(x_20, 0);
+lean_dec(x_22);
+lean_ctor_set(x_20, 0, x_19);
+return x_20;
 }
 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; 
-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_dec(x_12);
-x_30 = lean_ctor_get(x_2, 6);
-x_31 = lean_io_error_to_string(x_28);
-x_32 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_32, 0, x_31);
-x_33 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_33, 0, x_32);
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_ctor_get(x_20, 1);
+lean_inc(x_23);
+lean_dec(x_20);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_19);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
+}
+}
+else
+{
+uint8_t x_25; 
+x_25 = !lean_is_exclusive(x_20);
+if (x_25 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_20, 0);
+x_27 = lean_ctor_get(x_20, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_20);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_26);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
+}
+}
+}
+}
+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; uint8_t x_35; 
+x_29 = lean_ctor_get(x_6, 0);
+x_30 = lean_ctor_get(x_6, 1);
 lean_inc(x_30);
-lean_ctor_set_tag(x_5, 0);
-lean_ctor_set(x_5, 1, x_33);
-lean_ctor_set(x_5, 0, x_30);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_5);
-lean_ctor_set(x_34, 1, x_29);
-return x_34;
-}
-}
-}
-else
+lean_inc(x_29);
+lean_dec(x_6);
+x_31 = lean_ctor_get(x_29, 2);
+lean_inc(x_31);
+lean_dec(x_29);
+x_32 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_31);
+lean_dec(x_31);
+x_33 = lean_ctor_get(x_32, 1);
+lean_inc(x_33);
+lean_dec(x_32);
+x_34 = l_Lean_Elab_Command_elabCommand___closed__2;
+x_35 = l_Lean_checkTraceOption(x_33, x_34);
+lean_dec(x_33);
+if (x_35 == 0)
 {
-lean_object* x_35; lean_object* x_36; 
-lean_free_object(x_5);
-lean_dec(x_9);
+lean_object* x_36; lean_object* x_37; 
 lean_dec(x_3);
-x_35 = lean_box(0);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_6);
-return x_36;
-}
+x_36 = lean_box(0);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_30);
+return x_37;
 }
 else
 {
-lean_object* x_37; uint8_t x_38; 
-x_37 = lean_ctor_get(x_5, 0);
-lean_inc(x_37);
-lean_dec(x_5);
-x_38 = l_Lean_Elab_isAbortExceptionId(x_37);
-if (x_38 == 0)
-{
-lean_object* x_39; 
-x_39 = l_Lean_InternalExceptionId_getName(x_37, x_6);
-lean_dec(x_37);
-if (lean_obj_tag(x_39) == 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; uint8_t x_47; lean_object* x_48; 
-x_40 = lean_ctor_get(x_39, 0);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_38 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg(x_3, x_30);
+x_39 = lean_ctor_get(x_38, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_38, 1);
 lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
-lean_inc(x_41);
+lean_dec(x_38);
+x_41 = lean_box(0);
+x_42 = l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3(x_34, x_39, x_41, x_2, x_3, x_40);
+lean_dec(x_3);
 lean_dec(x_39);
-x_42 = lean_alloc_ctor(4, 1, 0);
-lean_ctor_set(x_42, 0, x_40);
-x_43 = l_Lean_Elab_Command_withLogging___closed__2;
-x_44 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_42);
-x_45 = l_Lean_KernelException_toMessageData___closed__15;
-x_46 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_46, 0, x_44);
-lean_ctor_set(x_46, 1, x_45);
-x_47 = 2;
-x_48 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_46, x_47, x_2, x_3, x_41);
-lean_dec(x_3);
-return x_48;
+if (lean_obj_tag(x_42) == 0)
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+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_41);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
 }
 else
 {
-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_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_46 = lean_ctor_get(x_42, 0);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_42, 1);
+lean_inc(x_47);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_48 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_48 = lean_box(0);
+}
+if (lean_is_scalar(x_48)) {
+ x_49 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_49 = x_48;
+}
+lean_ctor_set(x_49, 0, x_46);
+lean_ctor_set(x_49, 1, x_47);
+return x_49;
+}
+}
+}
+}
+block_109:
+{
+if (lean_obj_tag(x_51) == 0)
+{
+lean_object* x_53; 
+x_53 = l_Lean_Elab_logException___at_Lean_Elab_Command_withLogging___spec__1(x_51, x_2, x_3, x_52);
+if (lean_obj_tag(x_53) == 0)
+{
+lean_object* x_54; 
+x_54 = lean_ctor_get(x_53, 1);
+lean_inc(x_54);
+lean_dec(x_53);
+x_5 = x_54;
+goto block_50;
+}
+else
+{
+uint8_t x_55; 
 lean_dec(x_3);
-x_49 = lean_ctor_get(x_39, 0);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_39, 1);
-lean_inc(x_50);
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_51 = x_39;
-} else {
- lean_dec_ref(x_39);
- x_51 = lean_box(0);
+x_55 = !lean_is_exclusive(x_53);
+if (x_55 == 0)
+{
+return x_53;
 }
-x_52 = lean_ctor_get(x_2, 6);
-x_53 = lean_io_error_to_string(x_49);
-x_54 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_54, 0, x_53);
-x_55 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_inc(x_52);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_52);
-lean_ctor_set(x_56, 1, x_55);
-if (lean_is_scalar(x_51)) {
- x_57 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_57 = x_51;
+else
+{
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_53, 0);
+x_57 = lean_ctor_get(x_53, 1);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_53);
+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;
 }
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_50);
-return x_57;
 }
 }
 else
 {
-lean_object* x_58; lean_object* x_59; 
-lean_dec(x_37);
+uint8_t x_59; 
+x_59 = !lean_is_exclusive(x_51);
+if (x_59 == 0)
+{
+lean_object* x_60; lean_object* x_61; uint8_t x_62; 
+x_60 = lean_ctor_get(x_51, 0);
+x_61 = lean_ctor_get(x_51, 1);
+lean_dec(x_61);
+x_62 = l_Lean_Elab_isAbortExceptionId(x_60);
+if (x_62 == 0)
+{
+lean_object* x_63; 
+x_63 = l_Lean_InternalExceptionId_getName(x_60, x_52);
+lean_dec(x_60);
+if (lean_obj_tag(x_63) == 0)
+{
+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; uint8_t x_71; lean_object* x_72; lean_object* x_73; 
+lean_free_object(x_51);
+x_64 = lean_ctor_get(x_63, 0);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_63, 1);
+lean_inc(x_65);
+lean_dec(x_63);
+x_66 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_66, 0, x_64);
+x_67 = l_Lean_Elab_Command_withLogging___closed__2;
+x_68 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_66);
+x_69 = l_Lean_KernelException_toMessageData___closed__15;
+x_70 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+x_71 = 2;
+x_72 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_70, x_71, x_2, x_3, x_65);
+x_73 = lean_ctor_get(x_72, 1);
+lean_inc(x_73);
+lean_dec(x_72);
+x_5 = x_73;
+goto block_50;
+}
+else
+{
+uint8_t x_74; 
 lean_dec(x_3);
-x_58 = lean_box(0);
-x_59 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_6);
-return x_59;
+x_74 = !lean_is_exclusive(x_63);
+if (x_74 == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_75 = lean_ctor_get(x_63, 0);
+x_76 = lean_ctor_get(x_2, 6);
+x_77 = lean_io_error_to_string(x_75);
+x_78 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
+x_79 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_79, 0, x_78);
+lean_inc(x_76);
+lean_ctor_set_tag(x_51, 0);
+lean_ctor_set(x_51, 1, x_79);
+lean_ctor_set(x_51, 0, x_76);
+lean_ctor_set(x_63, 0, x_51);
+return x_63;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_80 = lean_ctor_get(x_63, 0);
+x_81 = lean_ctor_get(x_63, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_63);
+x_82 = lean_ctor_get(x_2, 6);
+x_83 = lean_io_error_to_string(x_80);
+x_84 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_84, 0, x_83);
+x_85 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_85, 0, x_84);
+lean_inc(x_82);
+lean_ctor_set_tag(x_51, 0);
+lean_ctor_set(x_51, 1, x_85);
+lean_ctor_set(x_51, 0, x_82);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_51);
+lean_ctor_set(x_86, 1, x_81);
+return x_86;
+}
+}
+}
+else
+{
+lean_free_object(x_51);
+lean_dec(x_60);
+x_5 = x_52;
+goto block_50;
+}
+}
+else
+{
+lean_object* x_87; uint8_t x_88; 
+x_87 = lean_ctor_get(x_51, 0);
+lean_inc(x_87);
+lean_dec(x_51);
+x_88 = l_Lean_Elab_isAbortExceptionId(x_87);
+if (x_88 == 0)
+{
+lean_object* x_89; 
+x_89 = l_Lean_InternalExceptionId_getName(x_87, x_52);
+lean_dec(x_87);
+if (lean_obj_tag(x_89) == 0)
+{
+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; lean_object* x_98; lean_object* x_99; 
+x_90 = lean_ctor_get(x_89, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_89, 1);
+lean_inc(x_91);
+lean_dec(x_89);
+x_92 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_92, 0, x_90);
+x_93 = l_Lean_Elab_Command_withLogging___closed__2;
+x_94 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_94, 0, x_93);
+lean_ctor_set(x_94, 1, x_92);
+x_95 = l_Lean_KernelException_toMessageData___closed__15;
+x_96 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_96, 0, x_94);
+lean_ctor_set(x_96, 1, x_95);
+x_97 = 2;
+x_98 = l_Lean_Elab_log___at_Lean_Elab_Command_withLogging___spec__3(x_96, x_97, x_2, x_3, x_91);
+x_99 = lean_ctor_get(x_98, 1);
+lean_inc(x_99);
+lean_dec(x_98);
+x_5 = x_99;
+goto block_50;
+}
+else
+{
+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_dec(x_3);
+x_100 = lean_ctor_get(x_89, 0);
+lean_inc(x_100);
+x_101 = lean_ctor_get(x_89, 1);
+lean_inc(x_101);
+if (lean_is_exclusive(x_89)) {
+ lean_ctor_release(x_89, 0);
+ lean_ctor_release(x_89, 1);
+ x_102 = x_89;
+} else {
+ lean_dec_ref(x_89);
+ x_102 = lean_box(0);
+}
+x_103 = lean_ctor_get(x_2, 6);
+x_104 = lean_io_error_to_string(x_100);
+x_105 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_105, 0, x_104);
+x_106 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_106, 0, x_105);
+lean_inc(x_103);
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_103);
+lean_ctor_set(x_107, 1, x_106);
+if (lean_is_scalar(x_102)) {
+ x_108 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_108 = x_102;
+}
+lean_ctor_set(x_108, 0, x_107);
+lean_ctor_set(x_108, 1, x_101);
+return x_108;
+}
+}
+else
+{
+lean_dec(x_87);
+x_5 = x_52;
+goto block_50;
 }
 }
 }
 }
 }
 }
-lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__1(x_1, x_2);
+x_3 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___rarg(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Command_elabCommand___spec__1(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___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_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+return x_6;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___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, lean_object* x_10) {
+_start:
+{
+size_t x_11; size_t x_12; lean_object* x_13; 
+x_11 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_12 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_13 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__5(x_1, x_2, x_3, x_4, x_11, x_12, x_7, x_8, x_9, x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_4);
+lean_dec(x_2);
+return x_13;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___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) {
+_start:
+{
+size_t x_10; size_t x_11; lean_object* x_12; 
+x_10 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_11 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_12 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__6(x_1, x_2, x_3, x_10, x_11, x_6, x_7, x_8, x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_3);
+return x_12;
+}
+}
+lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4___lambda__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_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___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) {
+_start:
+{
+lean_object* x_8; 
+x_8 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Command_elabCommand___spec__4(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_3);
+lean_dec(x_2);
+return x_8;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+size_t x_10; size_t x_11; lean_object* x_12; 
+x_10 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_11 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_12 = l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabCommand___spec__7(x_1, x_2, x_3, x_10, x_11, x_6, x_7, x_8, x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_3);
+return x_12;
+}
+}
+lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___lambda__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_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___lambda__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_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Std_PersistentArray_forIn___at_Lean_Elab_Command_elabCommand___spec__3(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+return x_7;
+}
+}
+lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Lean_ScopedEnvExtension_getState___at_Lean_Elab_Command_elabCommand___spec__8(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___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* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12___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_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__5(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Command_elabCommand___spec__12(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 size_t x_4; lean_object* x_5; 
 x_4 = lean_unbox_usize(x_2);
 lean_dec(x_2);
-x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__4(x_1, x_4, x_3);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Elab_Command_elabCommand___spec__11(x_1, x_4, x_3);
 lean_dec(x_3);
 return x_5;
 }
 }
-lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__3(x_1, x_2);
+x_3 = l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__10(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__7(x_1, x_2);
+x_3 = l_Std_AssocList_find_x3f___at_Lean_Elab_Command_elabCommand___spec__14(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__6(x_1, x_2);
+x_3 = l_Std_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__13(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2(x_1, x_2);
+x_3 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__9(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16___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_Elab_Command_elabCommand___spec__9(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
 }
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___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* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10(x_1, x_2);
+x_3 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-return x_6;
-}
-}
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___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, lean_object* x_7) {
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18___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; 
@@ -11896,35 +12976,35 @@ x_8 = lean_unbox_usize(x_2);
 lean_dec(x_2);
 x_9 = lean_unbox_usize(x_3);
 lean_dec(x_3);
-x_10 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__12(x_1, x_8, x_9, x_4, x_5, x_6, x_7);
+x_10 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabCommand___spec__18(x_1, x_8, x_9, x_4, x_5, x_6, x_7);
 lean_dec(x_5);
 lean_dec(x_1);
 return x_10;
 }
 }
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19___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_Elab_Command_elabCommand___spec__13(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
 }
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___rarg(x_1, x_2);
+x_3 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14___boxed(lean_object* x_1) {
+lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__14(x_1);
+x_2 = l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Command_elabCommand___spec__20(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -12201,7 +13281,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Command_getBracketedBinderIds___closed__1;
 x_2 = l_Lean_Elab_Command_getBracketedBinderIds___closed__2;
-x_3 = lean_unsigned_to_nat(276u);
+x_3 = lean_unsigned_to_nat(280u);
 x_4 = lean_unsigned_to_nat(56u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -17961,7 +19041,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Command_getBracketedBinderIds___closed__1;
 x_2 = l_Lean_Elab_Command_modifyScope___closed__1;
-x_3 = lean_unsigned_to_nat(429u);
+x_3 = lean_unsigned_to_nat(433u);
 x_4 = lean_unsigned_to_nat(16u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -31841,7 +32921,7 @@ x_14 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 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_Elab_Command_elabCommand___spec__13(x_15, x_4, x_5, x_6);
+x_16 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_15, x_4, x_5, x_6);
 x_17 = !lean_is_exclusive(x_16);
 if (x_17 == 0)
 {
@@ -31904,7 +32984,7 @@ x_16 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 x_17 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_17, 0, x_15);
 lean_ctor_set(x_17, 1, x_16);
-x_18 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(x_17, x_2, x_3, x_7);
+x_18 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_17, x_2, x_3, x_7);
 x_19 = !lean_is_exclusive(x_18);
 if (x_19 == 0)
 {
@@ -31941,7 +33021,7 @@ x_27 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 x_28 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_28, 0, x_26);
 lean_ctor_set(x_28, 1, x_27);
-x_29 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__13(x_28, x_2, x_3, x_7);
+x_29 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_28, x_2, x_3, x_7);
 x_30 = !lean_is_exclusive(x_29);
 if (x_30 == 0)
 {
@@ -32378,7 +33458,7 @@ x_14 = l_Lean_KernelException_toMessageData___closed__3;
 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_Elab_Command_elabCommand___spec__13(x_15, x_4, x_5, x_6);
+x_16 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__19(x_15, x_4, x_5, x_6);
 x_17 = !lean_is_exclusive(x_16);
 if (x_17 == 0)
 {
@@ -33397,6 +34477,10 @@ lean_mark_persistent(l_Lean_Elab_Command_initFn____x40_Lean_Elab_Command___hyg_1
 res = l_Lean_Elab_Command_initFn____x40_Lean_Elab_Command___hyg_1384_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Elab_Command_elabCommand___closed__1 = _init_l_Lean_Elab_Command_elabCommand___closed__1();
+lean_mark_persistent(l_Lean_Elab_Command_elabCommand___closed__1);
+l_Lean_Elab_Command_elabCommand___closed__2 = _init_l_Lean_Elab_Command_elabCommand___closed__2();
+lean_mark_persistent(l_Lean_Elab_Command_elabCommand___closed__2);
 l_Lean_Elab_Command_instInhabitedCommandElabM___closed__1 = _init_l_Lean_Elab_Command_instInhabitedCommandElabM___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_instInhabitedCommandElabM___closed__1);
 l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkMetaContext___closed__1 = _init_l___private_Lean_Elab_Command_0__Lean_Elab_Command_mkMetaContext___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/DefView.c b/stage0/stdlib/Lean/Elab/DefView.c
index 43413cc743..c14b23e631 100644
--- a/stage0/stdlib/Lean/Elab/DefView.c
+++ b/stage0/stdlib/Lean/Elab/DefView.c
@@ -86,6 +86,7 @@ lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_k
 lean_object* l_Lean_Elab_Command_mkDefViewOfExample(lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1136____closed__23;
 lean_object* l_Lean_Elab_Command_mkDefView___closed__2;
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(lean_object*);
 extern lean_object* l_Lean_Compiler_initFn____x40_Lean_Compiler_InlineAttrs___hyg_57____closed__4;
 lean_object* l_Lean_Elab_Command_MkInstanceName_collect_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_MkInstanceName_append(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -103,7 +104,6 @@ lean_object* l_Lean_Elab_toAttributeKind___at_Lean_Elab_Command_mkDefViewOfInsta
 lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___closed__6;
 lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_DefView___hyg_1143____closed__2;
 lean_object* l_Lean_Elab_Command_mkDefViewOfConstant___closed__1;
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Command_elabCheckFailure___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_capitalize(lean_object*);
@@ -143,6 +143,7 @@ lean_object* l_Lean_Elab_Command_MkInstanceName_mkFreshInstanceName___rarg(lean_
 lean_object* l_Lean_Elab_Command_mkDefViewOfConstant___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_MkInstanceName_collect___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ResolveName_resolveGlobalName(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_5659____closed__22;
 lean_object* l_Lean_Elab_DefKind_isDefOrAbbrevOrOpaque_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
@@ -189,7 +190,6 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1136____close
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Modifiers_addAttribute(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(lean_object*);
 extern lean_object* l_Lean_Meta_mkArbitrary___closed__2;
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_mkDefViewOfInstance___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkDefViewOfAbbrev(lean_object*, lean_object*);
@@ -4432,7 +4432,7 @@ x_70 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_70, 0, x_69);
 x_71 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_71, 0, x_70);
-x_72 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_68, x_71, x_2, x_3, x_41);
+x_72 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_68, x_71, x_2, x_3, x_41);
 lean_dec(x_68);
 x_73 = !lean_is_exclusive(x_72);
 if (x_73 == 0)
@@ -4457,7 +4457,7 @@ else
 {
 lean_object* x_77; uint8_t x_78; 
 lean_dec(x_2);
-x_77 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_41);
+x_77 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_41);
 x_78 = !lean_is_exclusive(x_77);
 if (x_78 == 0)
 {
diff --git a/stage0/stdlib/Lean/Elab/Deriving/Basic.c b/stage0/stdlib/Lean/Elab/Deriving/Basic.c
index 5502724a20..2b16736672 100644
--- a/stage0/stdlib/Lean/Elab/Deriving/Basic.c
+++ b/stage0/stdlib/Lean/Elab/Deriving/Basic.c
@@ -31,7 +31,6 @@ lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1090____closed__1;
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_elabDeriving___spec__11(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Command_commandElabAttribute;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
@@ -90,7 +89,6 @@ lean_object* l_Lean_addMessageContextPartial___at_Lean_Elab_Command_instAddMessa
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_registerBuiltinDerivingHandler___lambda__2___closed__1;
 lean_object* l_List_filterAux___at_Lean_resolveGlobalConst___spec__1(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_getOptDerivingClasses___spec__1___rarg___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_find___at_Lean_Elab_applyDerivingHandlers___spec__1(lean_object*, lean_object*);
 lean_object* lean_expr_dbg_to_string(lean_object*);
@@ -1484,16 +1482,6 @@ return x_18;
 }
 }
 }
-lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1___lambda__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; 
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_1);
-lean_ctor_set(x_6, 1, x_5);
-return x_6;
-}
-}
 lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2201,17 +2189,6 @@ lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___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) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1___lambda__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_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at_Lean_Elab_elabDeriving___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Elab/Frontend.c b/stage0/stdlib/Lean/Elab/Frontend.c
index d70425703f..30c75be880 100644
--- a/stage0/stdlib/Lean/Elab/Frontend.c
+++ b/stage0/stdlib/Lean/Elab/Frontend.c
@@ -13,130 +13,100 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_IO_processCommands_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1;
 lean_object* l_Lean_Parser_parseHeader(lean_object*, lean_object*);
-lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l_Lean_Elab_Frontend_State_commands___default;
-lean_object* lean_io_error_to_string(lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1090____closed__1;
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM_match__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_IO_processCommands(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand_match__1___rarg(lean_object*, lean_object*);
 lean_object* lean_run_frontend(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_initFn____x40_Lean_Util_PPExt___hyg_3____closed__3;
+extern lean_object* l_Lean_Elab_Command_elabCommand___closed__2;
 lean_object* lean_environment_set_main_module(lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_Elab_Frontend_setCommandState___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getCommandState___rarg___boxed(lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3;
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 extern lean_object* l_Std_PersistentArray_empty___closed__1;
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM___closed__1;
 lean_object* l_Lean_Parser_mkInputContext(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
-lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand_match__1(lean_object*);
 lean_object* lean_profileit(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_InfoTree_format(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l_USize_decLt(size_t, size_t);
 lean_object* l_Lean_Elab_processHeader(lean_object*, lean_object*, lean_object*, lean_object*, uint32_t, lean_object*);
 extern lean_object* l_Lean_Elab_parseImports___closed__1;
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4;
 lean_object* l_Lean_Elab_runFrontend_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_runFrontend___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageLog_toList(lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_runFrontend_match__1(lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1;
-extern lean_object* l_List_forIn_loop___at_Lean_Elab_resolveGlobalConstWithInfos___spec__1___rarg___lambda__1___closed__1;
 lean_object* l_Lean_MessageData_toString(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getInputContext___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2(lean_object*);
 uint8_t l_Lean_KVMap_getBool(lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Elab_Frontend_setParserState___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_print___at_IO_println___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkState(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_runFrontend___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getPrintMessageEndPos___boxed(lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand___closed__1;
 extern lean_object* l_Lean_Parser_instInhabitedModuleParserState___closed__1;
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809_(lean_object*);
-extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710_(lean_object*);
 lean_object* l_Lean_Elab_Frontend_updateCmdPos(lean_object*);
 extern lean_object* l_Lean_firstFrontendMacroScope;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_setCommandState(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand___closed__2;
 lean_object* l_Lean_Elab_Frontend_processCommand(lean_object*, lean_object*, lean_object*);
-size_t lean_usize_of_nat(lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2;
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3;
 lean_object* l_Lean_Elab_Frontend_updateCmdPos___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_profileitM___at_Lean_Elab_Frontend_processCommand___spec__1(lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__5(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_parseCommand_parse(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_profileitM___at_Lean_Elab_Frontend_processCommand___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Parser_isExitCommand(lean_object*);
 lean_object* l_Lean_Elab_Frontend_getInputContext(lean_object*, lean_object*, lean_object*);
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getCommandState(lean_object*);
 lean_object* l_Lean_Elab_Frontend_getParserState(lean_object*);
 lean_object* l_Lean_Elab_Frontend_getParserState___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommand___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_register_option(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM_match__2(lean_object*);
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_IO_processCommands_match__1(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_setParserState(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_profileitIOUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_updateCmdPos___boxed(lean_object*);
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getCommandState___rarg(lean_object*, lean_object*);
 uint8_t l_Lean_Parser_isEOI(lean_object*);
 lean_object* l_Lean_Elab_Frontend_setMessages(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_setMessages___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM_match__1(lean_object*);
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1;
 uint8_t l_Std_PersistentArray_anyM___at_Lean_MessageLog_hasErrors___spec__1(lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2;
 uint8_t l_Lean_Elab_getPrintMessageEndPos(lean_object*);
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___boxed(lean_object*);
 lean_object* l_Lean_profileitM___at_Lean_Elab_Frontend_processCommand___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getParserState___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Message_toString(lean_object*, uint8_t, lean_object*);
 lean_object* l_Lean_Elab_Frontend_getParserState___boxed(lean_object*);
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_process(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4;
 lean_object* l_Lean_Elab_Frontend_updateCmdPos___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommands(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Exception_toMessageData(lean_object*);
@@ -655,854 +625,6 @@ return x_43;
 }
 }
 }
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; uint8_t x_4; 
-x_3 = lean_st_ref_get(x_1, x_2);
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = lean_ctor_get(x_5, 7);
-lean_inc(x_6);
-lean_dec(x_5);
-x_7 = lean_ctor_get(x_6, 1);
-lean_inc(x_7);
-lean_dec(x_6);
-lean_ctor_set(x_3, 0, x_7);
-return x_3;
-}
-else
-{
-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_3, 0);
-x_9 = lean_ctor_get(x_3, 1);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_dec(x_3);
-x_10 = lean_ctor_get(x_8, 7);
-lean_inc(x_10);
-lean_dec(x_8);
-x_11 = lean_ctor_get(x_10, 1);
-lean_inc(x_11);
-lean_dec(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_9);
-return x_12;
-}
-}
-}
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg___boxed), 2, 0);
-return x_2;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-uint8_t x_10; 
-x_10 = x_5 < x_4;
-if (x_10 == 0)
-{
-lean_object* x_11; 
-lean_dec(x_2);
-x_11 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_11, 0, x_6);
-lean_ctor_set(x_11, 1, x_9);
-return x_11;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_array_uget(x_3, x_5);
-x_13 = lean_ctor_get(x_6, 1);
-lean_inc(x_13);
-lean_dec(x_6);
-x_14 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4(x_1, x_12, x_13, x_7, x_8, x_9);
-lean_dec(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)
-{
-uint8_t x_16; 
-lean_dec(x_2);
-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; 
-x_17 = lean_ctor_get(x_14, 0);
-lean_dec(x_17);
-x_18 = lean_ctor_get(x_15, 0);
-lean_inc(x_18);
-x_19 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_19, 0, x_15);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-lean_ctor_set(x_14, 0, x_20);
-return x_14;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_21 = lean_ctor_get(x_14, 1);
-lean_inc(x_21);
-lean_dec(x_14);
-x_22 = lean_ctor_get(x_15, 0);
-lean_inc(x_22);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_15);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_22);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_21);
-return x_25;
-}
-}
-else
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; size_t x_29; size_t x_30; 
-x_26 = lean_ctor_get(x_14, 1);
-lean_inc(x_26);
-lean_dec(x_14);
-x_27 = lean_ctor_get(x_15, 0);
-lean_inc(x_27);
-lean_dec(x_15);
-lean_inc(x_2);
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_2);
-lean_ctor_set(x_28, 1, x_27);
-x_29 = 1;
-x_30 = x_5 + x_29;
-x_5 = x_30;
-x_6 = x_28;
-x_9 = x_26;
-goto _start;
-}
-}
-else
-{
-uint8_t x_32; 
-lean_dec(x_2);
-x_32 = !lean_is_exclusive(x_14);
-if (x_32 == 0)
-{
-return x_14;
-}
-else
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_ctor_get(x_14, 0);
-x_34 = lean_ctor_get(x_14, 1);
-lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_14);
-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;
-}
-}
-}
-}
-}
-static lean_object* _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("info");
-return x_1;
-}
-}
-static lean_object* _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1090____closed__1;
-x_2 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; lean_object* x_10; uint8_t x_17; 
-x_17 = x_4 < x_3;
-if (x_17 == 0)
-{
-lean_object* x_18; 
-lean_dec(x_1);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_5);
-lean_ctor_set(x_18, 1, x_8);
-return x_18;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-lean_dec(x_5);
-x_19 = lean_array_uget(x_2, x_4);
-x_20 = lean_box(0);
-x_21 = l_Lean_Elab_InfoTree_format(x_19, x_20, x_8);
-if (lean_obj_tag(x_21) == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-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 = lean_st_ref_get(x_7, x_23);
-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_27 = lean_ctor_get(x_25, 2);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_27);
-lean_dec(x_27);
-x_29 = lean_ctor_get(x_28, 1);
-lean_inc(x_29);
-lean_dec(x_28);
-x_30 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2;
-x_31 = l_Lean_checkTraceOption(x_29, x_30);
-lean_dec(x_29);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-lean_dec(x_22);
-x_32 = l_List_forIn_loop___at_Lean_Elab_resolveGlobalConstWithInfos___spec__1___rarg___lambda__1___closed__1;
-x_9 = x_32;
-x_10 = x_26;
-goto block_16;
-}
-else
-{
-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; 
-x_33 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_33, 0, x_22);
-x_34 = l_Lean_KernelException_toMessageData___closed__15;
-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 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-x_37 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_30, x_36, x_6, x_7, x_26);
-x_38 = lean_ctor_get(x_37, 1);
-lean_inc(x_38);
-lean_dec(x_37);
-x_39 = l_List_forIn_loop___at_Lean_Elab_resolveGlobalConstWithInfos___spec__1___rarg___lambda__1___closed__1;
-x_9 = x_39;
-x_10 = x_38;
-goto block_16;
-}
-}
-else
-{
-uint8_t x_40; 
-lean_dec(x_1);
-x_40 = !lean_is_exclusive(x_21);
-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; 
-x_41 = lean_ctor_get(x_21, 0);
-x_42 = lean_ctor_get(x_6, 6);
-x_43 = lean_io_error_to_string(x_41);
-x_44 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_45, 0, x_44);
-lean_inc(x_42);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_42);
-lean_ctor_set(x_46, 1, x_45);
-lean_ctor_set(x_21, 0, x_46);
-return x_21;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_47 = lean_ctor_get(x_21, 0);
-x_48 = lean_ctor_get(x_21, 1);
-lean_inc(x_48);
-lean_inc(x_47);
-lean_dec(x_21);
-x_49 = lean_ctor_get(x_6, 6);
-x_50 = lean_io_error_to_string(x_47);
-x_51 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_51, 0, x_50);
-x_52 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_52, 0, x_51);
-lean_inc(x_49);
-x_53 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_53, 0, x_49);
-lean_ctor_set(x_53, 1, x_52);
-x_54 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_54, 0, x_53);
-lean_ctor_set(x_54, 1, x_48);
-return x_54;
-}
-}
-}
-block_16:
-{
-lean_object* x_11; lean_object* x_12; size_t x_13; size_t x_14; 
-x_11 = lean_ctor_get(x_9, 0);
-lean_inc(x_11);
-lean_dec(x_9);
-lean_inc(x_1);
-x_12 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_12, 0, x_1);
-lean_ctor_set(x_12, 1, x_11);
-x_13 = 1;
-x_14 = x_4 + x_13;
-x_4 = x_14;
-x_5 = x_12;
-x_8 = x_10;
-goto _start;
-}
-}
-}
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__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; 
-x_6 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_6, 0, x_1);
-x_7 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_7, 0, x_6);
-lean_ctor_set(x_7, 1, x_5);
-return x_7;
-}
-}
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___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) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; lean_object* x_13; 
-x_7 = lean_ctor_get(x_2, 0);
-x_8 = lean_box(0);
-x_9 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_9, 0, x_8);
-lean_ctor_set(x_9, 1, x_3);
-x_10 = lean_array_get_size(x_7);
-x_11 = lean_usize_of_nat(x_10);
-lean_dec(x_10);
-x_12 = 0;
-x_13 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__5(x_1, x_8, x_7, x_11, x_12, x_9, x_4, x_5, x_6);
-if (lean_obj_tag(x_13) == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-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; lean_object* x_19; 
-x_16 = lean_ctor_get(x_13, 1);
-lean_inc(x_16);
-lean_dec(x_13);
-x_17 = lean_ctor_get(x_14, 1);
-lean_inc(x_17);
-lean_dec(x_14);
-x_18 = lean_box(0);
-x_19 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__1(x_17, x_18, x_4, x_5, x_16);
-return x_19;
-}
-else
-{
-uint8_t x_20; 
-lean_dec(x_14);
-x_20 = !lean_is_exclusive(x_13);
-if (x_20 == 0)
-{
-lean_object* x_21; lean_object* x_22; 
-x_21 = lean_ctor_get(x_13, 0);
-lean_dec(x_21);
-x_22 = lean_ctor_get(x_15, 0);
-lean_inc(x_22);
-lean_dec(x_15);
-lean_ctor_set(x_13, 0, x_22);
-return x_13;
-}
-else
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_23 = lean_ctor_get(x_13, 1);
-lean_inc(x_23);
-lean_dec(x_13);
-x_24 = lean_ctor_get(x_15, 0);
-lean_inc(x_24);
-lean_dec(x_15);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_23);
-return x_25;
-}
-}
-}
-else
-{
-uint8_t x_26; 
-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;
-}
-}
-}
-else
-{
-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_36; 
-x_30 = lean_ctor_get(x_2, 0);
-x_31 = lean_box(0);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_3);
-x_33 = lean_array_get_size(x_30);
-x_34 = lean_usize_of_nat(x_33);
-lean_dec(x_33);
-x_35 = 0;
-x_36 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6(x_31, x_30, x_34, x_35, x_32, x_4, x_5, x_6);
-if (lean_obj_tag(x_36) == 0)
-{
-lean_object* x_37; lean_object* x_38; 
-x_37 = lean_ctor_get(x_36, 0);
-lean_inc(x_37);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-if (lean_obj_tag(x_38) == 0)
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_39 = lean_ctor_get(x_36, 1);
-lean_inc(x_39);
-lean_dec(x_36);
-x_40 = lean_ctor_get(x_37, 1);
-lean_inc(x_40);
-lean_dec(x_37);
-x_41 = lean_box(0);
-x_42 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__1(x_40, x_41, x_4, x_5, x_39);
-return x_42;
-}
-else
-{
-uint8_t x_43; 
-lean_dec(x_37);
-x_43 = !lean_is_exclusive(x_36);
-if (x_43 == 0)
-{
-lean_object* x_44; lean_object* x_45; 
-x_44 = lean_ctor_get(x_36, 0);
-lean_dec(x_44);
-x_45 = lean_ctor_get(x_38, 0);
-lean_inc(x_45);
-lean_dec(x_38);
-lean_ctor_set(x_36, 0, x_45);
-return x_36;
-}
-else
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_36, 1);
-lean_inc(x_46);
-lean_dec(x_36);
-x_47 = lean_ctor_get(x_38, 0);
-lean_inc(x_47);
-lean_dec(x_38);
-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_36);
-if (x_49 == 0)
-{
-return x_36;
-}
-else
-{
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_50 = lean_ctor_get(x_36, 0);
-x_51 = lean_ctor_get(x_36, 1);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_dec(x_36);
-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_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; lean_object* x_10; uint8_t x_17; 
-x_17 = x_4 < x_3;
-if (x_17 == 0)
-{
-lean_object* x_18; 
-lean_dec(x_1);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_5);
-lean_ctor_set(x_18, 1, x_8);
-return x_18;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-lean_dec(x_5);
-x_19 = lean_array_uget(x_2, x_4);
-x_20 = lean_box(0);
-x_21 = l_Lean_Elab_InfoTree_format(x_19, x_20, x_8);
-if (lean_obj_tag(x_21) == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-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 = lean_st_ref_get(x_7, x_23);
-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_27 = lean_ctor_get(x_25, 2);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_27);
-lean_dec(x_27);
-x_29 = lean_ctor_get(x_28, 1);
-lean_inc(x_29);
-lean_dec(x_28);
-x_30 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2;
-x_31 = l_Lean_checkTraceOption(x_29, x_30);
-lean_dec(x_29);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-lean_dec(x_22);
-x_32 = l_List_forIn_loop___at_Lean_Elab_resolveGlobalConstWithInfos___spec__1___rarg___lambda__1___closed__1;
-x_9 = x_32;
-x_10 = x_26;
-goto block_16;
-}
-else
-{
-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; 
-x_33 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_33, 0, x_22);
-x_34 = l_Lean_KernelException_toMessageData___closed__15;
-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 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-x_37 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_30, x_36, x_6, x_7, x_26);
-x_38 = lean_ctor_get(x_37, 1);
-lean_inc(x_38);
-lean_dec(x_37);
-x_39 = l_List_forIn_loop___at_Lean_Elab_resolveGlobalConstWithInfos___spec__1___rarg___lambda__1___closed__1;
-x_9 = x_39;
-x_10 = x_38;
-goto block_16;
-}
-}
-else
-{
-uint8_t x_40; 
-lean_dec(x_1);
-x_40 = !lean_is_exclusive(x_21);
-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; 
-x_41 = lean_ctor_get(x_21, 0);
-x_42 = lean_ctor_get(x_6, 6);
-x_43 = lean_io_error_to_string(x_41);
-x_44 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_45, 0, x_44);
-lean_inc(x_42);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_42);
-lean_ctor_set(x_46, 1, x_45);
-lean_ctor_set(x_21, 0, x_46);
-return x_21;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_47 = lean_ctor_get(x_21, 0);
-x_48 = lean_ctor_get(x_21, 1);
-lean_inc(x_48);
-lean_inc(x_47);
-lean_dec(x_21);
-x_49 = lean_ctor_get(x_6, 6);
-x_50 = lean_io_error_to_string(x_47);
-x_51 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_51, 0, x_50);
-x_52 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_52, 0, x_51);
-lean_inc(x_49);
-x_53 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_53, 0, x_49);
-lean_ctor_set(x_53, 1, x_52);
-x_54 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_54, 0, x_53);
-lean_ctor_set(x_54, 1, x_48);
-return x_54;
-}
-}
-}
-block_16:
-{
-lean_object* x_11; lean_object* x_12; size_t x_13; size_t x_14; 
-x_11 = lean_ctor_get(x_9, 0);
-lean_inc(x_11);
-lean_dec(x_9);
-lean_inc(x_1);
-x_12 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_12, 0, x_1);
-lean_ctor_set(x_12, 1, x_11);
-x_13 = 1;
-x_14 = x_4 + x_13;
-x_4 = x_14;
-x_5 = x_12;
-x_8 = x_10;
-goto _start;
-}
-}
-}
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___lambda__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; 
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_1);
-lean_ctor_set(x_6, 1, x_5);
-return x_6;
-}
-}
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3(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; 
-x_6 = lean_ctor_get(x_1, 0);
-lean_inc(x_2);
-x_7 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4(x_2, x_6, x_2, x_3, x_4, x_5);
-lean_dec(x_2);
-if (lean_obj_tag(x_7) == 0)
-{
-lean_object* x_8; 
-x_8 = lean_ctor_get(x_7, 0);
-lean_inc(x_8);
-if (lean_obj_tag(x_8) == 0)
-{
-uint8_t x_9; 
-x_9 = !lean_is_exclusive(x_7);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; 
-x_10 = lean_ctor_get(x_7, 0);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_8, 0);
-lean_inc(x_11);
-lean_dec(x_8);
-lean_ctor_set(x_7, 0, x_11);
-return x_7;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_12 = lean_ctor_get(x_7, 1);
-lean_inc(x_12);
-lean_dec(x_7);
-x_13 = lean_ctor_get(x_8, 0);
-lean_inc(x_13);
-lean_dec(x_8);
-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;
-}
-}
-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; size_t x_21; size_t x_22; lean_object* x_23; 
-x_15 = lean_ctor_get(x_7, 1);
-lean_inc(x_15);
-lean_dec(x_7);
-x_16 = lean_ctor_get(x_8, 0);
-lean_inc(x_16);
-lean_dec(x_8);
-x_17 = lean_ctor_get(x_1, 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_16);
-x_20 = lean_array_get_size(x_17);
-x_21 = lean_usize_of_nat(x_20);
-lean_dec(x_20);
-x_22 = 0;
-x_23 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7(x_18, x_17, x_21, x_22, x_19, x_3, x_4, x_15);
-if (lean_obj_tag(x_23) == 0)
-{
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_ctor_get(x_24, 0);
-lean_inc(x_25);
-if (lean_obj_tag(x_25) == 0)
-{
-uint8_t x_26; 
-x_26 = !lean_is_exclusive(x_23);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_23, 0);
-lean_dec(x_27);
-x_28 = lean_ctor_get(x_24, 1);
-lean_inc(x_28);
-lean_dec(x_24);
-lean_ctor_set(x_23, 0, x_28);
-return x_23;
-}
-else
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_23, 1);
-lean_inc(x_29);
-lean_dec(x_23);
-x_30 = lean_ctor_get(x_24, 1);
-lean_inc(x_30);
-lean_dec(x_24);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_29);
-return x_31;
-}
-}
-else
-{
-uint8_t x_32; 
-lean_dec(x_24);
-x_32 = !lean_is_exclusive(x_23);
-if (x_32 == 0)
-{
-lean_object* x_33; lean_object* x_34; 
-x_33 = lean_ctor_get(x_23, 0);
-lean_dec(x_33);
-x_34 = lean_ctor_get(x_25, 0);
-lean_inc(x_34);
-lean_dec(x_25);
-lean_ctor_set(x_23, 0, x_34);
-return x_23;
-}
-else
-{
-lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_35 = lean_ctor_get(x_23, 1);
-lean_inc(x_35);
-lean_dec(x_23);
-x_36 = lean_ctor_get(x_25, 0);
-lean_inc(x_36);
-lean_dec(x_25);
-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_38; 
-x_38 = !lean_is_exclusive(x_23);
-if (x_38 == 0)
-{
-return x_23;
-}
-else
-{
-lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_39 = lean_ctor_get(x_23, 0);
-x_40 = lean_ctor_get(x_23, 1);
-lean_inc(x_40);
-lean_inc(x_39);
-lean_dec(x_23);
-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
-{
-uint8_t x_42; 
-x_42 = !lean_is_exclusive(x_7);
-if (x_42 == 0)
-{
-return x_7;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_7, 0);
-x_44 = lean_ctor_get(x_7, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_7);
-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_object* l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -1511,92 +633,35 @@ lean_inc(x_5);
 x_7 = l_Lean_Elab_Command_elabCommand(x_1, 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_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_object* x_8; lean_object* x_9; 
 x_8 = lean_ctor_get(x_7, 1);
 lean_inc(x_8);
 lean_dec(x_7);
 x_9 = l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1(x_2, x_4, x_5, x_8);
-x_10 = lean_ctor_get(x_9, 1);
-lean_inc(x_10);
-lean_dec(x_9);
-x_11 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg(x_5, 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_box(0);
-x_15 = l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3(x_12, x_14, x_4, x_5, x_13);
 lean_dec(x_5);
-lean_dec(x_12);
-if (lean_obj_tag(x_15) == 0)
-{
-uint8_t x_16; 
-x_16 = !lean_is_exclusive(x_15);
-if (x_16 == 0)
-{
-lean_object* x_17; 
-x_17 = lean_ctor_get(x_15, 0);
-lean_dec(x_17);
-lean_ctor_set(x_15, 0, x_14);
-return x_15;
+return x_9;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; 
-x_18 = lean_ctor_get(x_15, 1);
-lean_inc(x_18);
-lean_dec(x_15);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_14);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-else
-{
-uint8_t x_20; 
-x_20 = !lean_is_exclusive(x_15);
-if (x_20 == 0)
-{
-return x_15;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_15, 0);
-x_22 = lean_ctor_get(x_15, 1);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_dec(x_15);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
-}
-}
-}
-else
-{
-uint8_t x_24; 
+uint8_t x_10; 
 lean_dec(x_5);
-x_24 = !lean_is_exclusive(x_7);
-if (x_24 == 0)
+x_10 = !lean_is_exclusive(x_7);
+if (x_10 == 0)
 {
 return x_7;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_7, 0);
-x_26 = lean_ctor_get(x_7, 1);
-lean_inc(x_26);
-lean_inc(x_25);
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_7, 0);
+x_12 = lean_ctor_get(x_7, 1);
+lean_inc(x_12);
+lean_inc(x_11);
 lean_dec(x_7);
-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_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_11);
+lean_ctor_set(x_13, 1, x_12);
+return x_13;
 }
 }
 }
@@ -1604,7 +669,7 @@ return x_27;
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend(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_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; uint8_t x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; 
+lean_object* x_5; lean_object* x_6; 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_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; uint8_t 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; uint8_t x_69; 
 x_35 = lean_st_ref_get(x_3, x_4);
 x_36 = lean_ctor_get(x_35, 0);
 lean_inc(x_36);
@@ -1638,126 +703,102 @@ lean_inc(x_48);
 x_49 = lean_ctor_get(x_47, 1);
 lean_inc(x_49);
 lean_dec(x_47);
-x_50 = lean_st_ref_get(x_48, x_49);
-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, 7);
-lean_inc(x_53);
-lean_dec(x_51);
-x_54 = lean_ctor_get_uint8(x_53, sizeof(void*)*2);
-lean_dec(x_53);
-x_55 = lean_st_ref_get(x_48, x_52);
-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_56, 2);
+x_57 = lean_st_ref_get(x_48, x_49);
+x_58 = lean_ctor_get(x_57, 0);
 lean_inc(x_58);
-lean_dec(x_56);
-x_59 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_58);
-lean_dec(x_58);
-x_60 = lean_ctor_get(x_59, 1);
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
+lean_dec(x_57);
+x_60 = lean_ctor_get(x_58, 7);
 lean_inc(x_60);
-lean_dec(x_59);
-x_61 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2;
-x_62 = l_Lean_checkTraceOption(x_60, x_61);
+lean_dec(x_58);
+x_61 = lean_ctor_get_uint8(x_60, sizeof(void*)*2);
 lean_dec(x_60);
-if (x_62 == 0)
-{
-lean_object* x_63; lean_object* x_64; 
-x_63 = lean_box(0);
-lean_inc(x_48);
-x_64 = l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(x_1, x_54, x_63, x_45, x_48, x_57);
-lean_dec(x_45);
-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_object* x_70; 
-x_65 = lean_ctor_get(x_64, 1);
+x_62 = lean_st_ref_get(x_48, x_59);
+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, 2);
 lean_inc(x_65);
-lean_dec(x_64);
-x_66 = lean_st_ref_get(x_48, x_65);
-lean_dec(x_48);
-x_67 = lean_ctor_get(x_66, 0);
+lean_dec(x_63);
+x_66 = l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(x_65);
+lean_dec(x_65);
+x_67 = lean_ctor_get(x_66, 1);
 lean_inc(x_67);
-x_68 = lean_ctor_get(x_66, 1);
-lean_inc(x_68);
 lean_dec(x_66);
-x_69 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_69, 0, x_67);
-x_70 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-x_5 = x_70;
-x_6 = x_68;
-goto block_34;
-}
-else
+x_68 = l_Lean_Elab_Command_elabCommand___closed__2;
+x_69 = l_Lean_checkTraceOption(x_67, x_68);
+lean_dec(x_67);
+if (x_69 == 0)
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-lean_dec(x_48);
-x_71 = lean_ctor_get(x_64, 0);
-lean_inc(x_71);
-x_72 = lean_ctor_get(x_64, 1);
-lean_inc(x_72);
-lean_dec(x_64);
-x_73 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_73, 0, x_71);
-x_5 = x_73;
-x_6 = x_72;
-goto block_34;
-}
-}
-else
-{
-uint8_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_74 = 1;
-x_75 = l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1(x_74, x_45, x_48, x_57);
-x_76 = lean_ctor_get(x_75, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_75, 1);
-lean_inc(x_77);
-lean_dec(x_75);
+lean_object* x_70; lean_object* x_71; 
+x_70 = lean_box(0);
 lean_inc(x_48);
-x_78 = l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(x_1, x_54, x_76, x_45, x_48, x_77);
+x_71 = l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(x_1, x_61, x_70, x_45, x_48, x_64);
 lean_dec(x_45);
-lean_dec(x_76);
-if (lean_obj_tag(x_78) == 0)
+if (lean_obj_tag(x_71) == 0)
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_79 = lean_ctor_get(x_78, 1);
-lean_inc(x_79);
-lean_dec(x_78);
-x_80 = lean_st_ref_get(x_48, x_79);
-lean_dec(x_48);
-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_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_83, 0, x_81);
-x_84 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_84, 0, x_83);
-x_5 = x_84;
-x_6 = x_82;
-goto block_34;
+lean_object* x_72; 
+x_72 = lean_ctor_get(x_71, 1);
+lean_inc(x_72);
+lean_dec(x_71);
+x_50 = x_72;
+goto block_56;
 }
 else
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
 lean_dec(x_48);
-x_85 = lean_ctor_get(x_78, 0);
-lean_inc(x_85);
-x_86 = lean_ctor_get(x_78, 1);
-lean_inc(x_86);
+x_73 = lean_ctor_get(x_71, 0);
+lean_inc(x_73);
+x_74 = lean_ctor_get(x_71, 1);
+lean_inc(x_74);
+lean_dec(x_71);
+x_75 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_75, 0, x_73);
+x_5 = x_75;
+x_6 = x_74;
+goto block_34;
+}
+}
+else
+{
+uint8_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_76 = 1;
+x_77 = l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1(x_76, x_45, x_48, x_64);
+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_48);
+x_80 = l_Lean_Elab_Frontend_elabCommandAtFrontend___lambda__1(x_1, x_61, x_78, x_45, x_48, x_79);
+lean_dec(x_45);
 lean_dec(x_78);
-x_87 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_87, 0, x_85);
-x_5 = x_87;
-x_6 = x_86;
+if (lean_obj_tag(x_80) == 0)
+{
+lean_object* x_81; 
+x_81 = lean_ctor_get(x_80, 1);
+lean_inc(x_81);
+lean_dec(x_80);
+x_50 = x_81;
+goto block_56;
+}
+else
+{
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+lean_dec(x_48);
+x_82 = lean_ctor_get(x_80, 0);
+lean_inc(x_82);
+x_83 = lean_ctor_get(x_80, 1);
+lean_inc(x_83);
+lean_dec(x_80);
+x_84 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_84, 0, x_82);
+x_5 = x_84;
+x_6 = x_83;
 goto block_34;
 }
 }
@@ -1860,6 +901,24 @@ return x_33;
 }
 }
 }
+block_56:
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_51 = lean_st_ref_get(x_48, x_50);
+lean_dec(x_48);
+x_52 = lean_ctor_get(x_51, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_51, 1);
+lean_inc(x_53);
+lean_dec(x_51);
+x_54 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_54, 0, x_52);
+x_55 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_55, 0, x_54);
+x_5 = x_55;
+x_6 = x_53;
+goto block_34;
+}
 }
 }
 lean_object* l_Lean_Elab_enableInfoTree___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -1874,115 +933,6 @@ lean_dec(x_2);
 return x_6;
 }
 }
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; 
-x_3 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___rarg(x_1, x_2);
-lean_dec(x_1);
-return x_3;
-}
-}
-lean_object* l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2___boxed(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = l_Lean_Elab_getInfoTrees___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__2(x_1);
-lean_dec(x_1);
-return x_2;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___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:
-{
-size_t x_10; size_t x_11; lean_object* x_12; 
-x_10 = lean_unbox_usize(x_4);
-lean_dec(x_4);
-x_11 = lean_unbox_usize(x_5);
-lean_dec(x_5);
-x_12 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__5(x_1, x_2, x_3, x_10, x_11, x_6, x_7, x_8, x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_12;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___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:
-{
-size_t x_9; size_t x_10; lean_object* x_11; 
-x_9 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_10 = lean_unbox_usize(x_4);
-lean_dec(x_4);
-x_11 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6(x_1, x_2, x_9, x_10, x_5, x_6, x_7, x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_2);
-return x_11;
-}
-}
-lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4___lambda__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_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___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) {
-_start:
-{
-lean_object* x_7; 
-x_7 = l_Std_PersistentArray_forInAux___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__4(x_1, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_7;
-}
-}
-lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-size_t x_9; size_t x_10; lean_object* x_11; 
-x_9 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_10 = lean_unbox_usize(x_4);
-lean_dec(x_4);
-x_11 = l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__7(x_1, x_2, x_9, x_10, x_5, x_6, x_7, x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_2);
-return x_11;
-}
-}
-lean_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___lambda__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_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___lambda__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_object* l_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3___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_Std_PersistentArray_forIn___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__3(x_1, x_2, x_3, x_4, x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_6;
-}
-}
 lean_object* l_Lean_Elab_Frontend_elabCommandAtFrontend___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:
 {
@@ -3375,7 +2325,7 @@ return x_47;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -3383,17 +2333,17 @@ x_1 = lean_mk_string("printMessageEndPos");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____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_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1;
+x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -3401,13 +2351,13 @@ x_1 = lean_mk_string("print end position of each message in addition to start po
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Lean_initFn____x40_Lean_Util_PPExt___hyg_3____closed__3;
 x_2 = l_Lean_instInhabitedParserDescr___closed__1;
-x_3 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3;
+x_3 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3415,12 +2365,12 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809_(lean_object* x_1) {
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2;
-x_3 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4;
+x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2;
+x_3 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4;
 x_4 = lean_register_option(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)
 {
@@ -3428,7 +2378,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_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2;
+x_6 = l_Lean_Elab_Command_elabCommand___closed__2;
 x_7 = l_Lean_registerTraceClass(x_6, x_5);
 return x_7;
 }
@@ -3460,7 +2410,7 @@ uint8_t l_Lean_Elab_getPrintMessageEndPos(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; uint8_t x_3; uint8_t x_4; 
-x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2;
+x_2 = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2;
 x_3 = 0;
 x_4 = l_Lean_KVMap_getBool(x_1, x_2, x_3);
 return x_4;
@@ -3998,23 +2948,19 @@ l_Lean_Elab_Frontend_State_commands___default = _init_l_Lean_Elab_Frontend_State
 lean_mark_persistent(l_Lean_Elab_Frontend_State_commands___default);
 l_Lean_Elab_Frontend_runCommandElabM___closed__1 = _init_l_Lean_Elab_Frontend_runCommandElabM___closed__1();
 lean_mark_persistent(l_Lean_Elab_Frontend_runCommandElabM___closed__1);
-l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1 = _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1();
-lean_mark_persistent(l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__1);
-l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2 = _init_l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2();
-lean_mark_persistent(l_Array_forInUnsafe_loop___at_Lean_Elab_Frontend_elabCommandAtFrontend___spec__6___closed__2);
 l_Lean_Elab_Frontend_processCommand___closed__1 = _init_l_Lean_Elab_Frontend_processCommand___closed__1();
 lean_mark_persistent(l_Lean_Elab_Frontend_processCommand___closed__1);
 l_Lean_Elab_Frontend_processCommand___closed__2 = _init_l_Lean_Elab_Frontend_processCommand___closed__2();
 lean_mark_persistent(l_Lean_Elab_Frontend_processCommand___closed__2);
-l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__1);
-l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__2);
-l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__3);
-l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809____closed__4);
-res = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_809_(lean_io_mk_world());
+l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__1);
+l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__2);
+l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__3);
+l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710____closed__4);
+res = l_Lean_Elab_initFn____x40_Lean_Elab_Frontend___hyg_710_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
diff --git a/stage0/stdlib/Lean/Elab/Match.c b/stage0/stdlib/Lean/Elab/Match.c
index 41bf2607ab..c54e2dee4a 100644
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Lean.Elab.Match
-// Imports: Init Lean.Meta.Match.MatchPatternAttr Lean.Meta.Match.Match Lean.Meta.SortLocalDecls Lean.Elab.SyntheticMVars Lean.Elab.App Lean.Parser.Term
+// Imports: Init Lean.Util.CollectFVars Lean.Meta.Match.MatchPatternAttr Lean.Meta.Match.Match Lean.Meta.SortLocalDecls Lean.Elab.SyntheticMVars Lean.Elab.App Lean.Parser.Term
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -51,7 +51,8 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Ela
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore_match__1(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_instInhabitedContext___closed__1;
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__2___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(lean_object*);
+lean_object* lean_nat_div(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -62,6 +63,7 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Ela
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__4;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__5;
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps_match__1(lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind;
@@ -90,6 +92,7 @@ extern lean_object* l_myMacro____x40_Init_Notation___hyg_2278____closed__2;
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams___spec__2___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNoMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__6;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__1;
 lean_object* l_Lean_Elab_Term_finalizePatternDecls_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -110,6 +113,7 @@ uint8_t l_Lean_Option_get___at_Lean_Elab_addMacroStack___spec__1(lean_object*, l
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__2___closed__4;
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_1607____closed__1;
+lean_object* l_Lean_CollectFVars_main(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__15;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkMVarSyntax___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -117,6 +121,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLo
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_expandMacrosInPatterns___boxed__const__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_isNextArgAccessible___boxed(lean_object*);
+lean_object* l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_identKind___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__1;
 lean_object* l_Lean_Elab_Term_withDepElimPatterns(lean_object*);
@@ -137,6 +142,7 @@ extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg___closed__2;
 lean_object* lean_environment_find(lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__3___lambda__1___closed__2;
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__7;
@@ -147,6 +153,7 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__17;
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 uint8_t lean_name_eq(lean_object*, lean_object*);
+lean_object* l_Lean_LocalContext_get_x21(lean_object*, lean_object*);
 lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_finalize___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_quoteAutoTactic___closed__4;
@@ -157,23 +164,26 @@ lean_object* l_Lean_Elab_Term_elabInaccessible(lean_object*, lean_object*, lean_
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_markAsVisited___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___closed__1;
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___at_Lean_Elab_Term_ToDepElimPattern_main___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop_match__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__9;
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___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*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_split___rarg(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_ToDepElimPattern_main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams___spec__2(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__3;
+uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1(lean_object*, lean_object*, size_t, size_t);
 extern lean_object* l_Lean_Compiler_checkIsDefinition___closed__3;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__2___boxed(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_Lean_Elab_Term_CollectPatternVars_collect___spec__4(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -190,7 +200,9 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_ge
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2;
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__4(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* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15378____closed__9;
 uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_isNextArgAccessible(lean_object*);
@@ -210,7 +222,9 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___closed
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__4;
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(size_t, size_t, lean_object*);
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
+uint8_t l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__3___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -238,7 +252,6 @@ lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_finalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_ensureHasType(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_throwUnknownConstant___rarg___closed__2;
 extern lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__4;
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -253,6 +266,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f(lean_
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_collectPatternVars_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__13;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_doubleQuotedNameToPattern___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_finalizePatternDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -307,6 +321,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__1
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__2;
 lean_object* l_Lean_Meta_withExistingLocalDecls___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -335,6 +350,7 @@ lean_object* l_Lean_Meta_Match_Pattern_toExpr_visit(uint8_t, lean_object*, lean_
 lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndicesToInclude___spec__1(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___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_isAuxDiscrName___boxed(lean_object*);
+lean_object* lean_array_swap(lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Meta_LevelDefEq_0__Lean_Meta_solveSelfMax___closed__1;
 uint8_t l_Lean_Elab_Term_isAuxDiscrName(lean_object*);
 extern lean_object* l_Lean_strLitKind;
@@ -343,13 +359,15 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext_m
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__10;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___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* l_Lean_Elab_Term_isAuxDiscrName___closed__1;
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3;
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallTelescopeReducingImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Array_mapSepElemsMAux___at_Lean_Elab_Term_CollectPatternVars_collect___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___lambda__1(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_Parser_Term_quotedName___elambda__1___closed__2;
+lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__5(lean_object*, lean_object*, 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_Lean_Elab_Term_CollectPatternVars_State_found___default;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1;
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_ToDepElimPattern_main___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_quotedNameToPattern_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchOptType___boxed(lean_object*);
@@ -362,6 +380,7 @@ lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_getPatternsV
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__3(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_log___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore_match__3(lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Util_0__Lean_Elab_expandMacro_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -394,16 +413,16 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___boxed(
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_CollectPatternVars_collect___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___closed__2;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_quoteAutoTactic___spec__4___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__2(lean_object*);
+lean_object* l_Lean_Expr_isFVar___boxed(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getDiscrs___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__11;
 lean_object* l_Nat_repr(lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault___closed__1;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext_match__2(lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallTelescopeReducingAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_LocalDecl_binderInfo(lean_object*);
 lean_object* l_Lean_Elab_Term_expandMacrosInPatterns(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__2(lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_autoBoundImplicitLocal___closed__1;
@@ -420,9 +439,9 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f_match
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg___closed__1;
 extern lean_object* l_Lean_choiceKind;
+lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_charLitKind;
 lean_object* l_Lean_Elab_Term_withDepElimPatterns_match__1___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2;
 lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType_match__2(lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -431,6 +450,7 @@ lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_pr
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_finalizePatternDecls_match__2(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -438,6 +458,7 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext_m
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___spec__1(lean_object*);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Name_isAtomic(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -460,6 +481,7 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg_match__1(lea
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f_match__2___rarg___closed__1;
+lean_object* l_Lean_MetavarContext_localDeclDependsOn(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_expandApp(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___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_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible(lean_object*);
@@ -498,6 +520,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f_match
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__1___closed__2;
+lean_object* l_Lean_Elab_Term_elabTermEnsuringType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_whnf(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15947____closed__12;
 lean_object* l_Lean_Elab_Term_mkInaccessible(lean_object*);
@@ -575,6 +598,7 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_expandMacrosInPatterns__
 lean_object* l_Lean_Elab_Term_mkFreshBinderName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkUserNameFor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15947____closed__6;
+lean_object* l_Lean_LocalDecl_index(lean_object*);
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
@@ -633,6 +657,7 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore_matc
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedTypeAndDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___boxed__const__1;
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_resolveName_x27___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNextParam___closed__1;
 lean_object* lean_panic_fn(lean_object*, lean_object*);
@@ -656,6 +681,7 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___la
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__2___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___lambda__1___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst_match__1(lean_object*);
+lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processImplicitArg(uint8_t, 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_Lean_Elab_Term_withDepElimPatterns___spec__1(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -665,24 +691,28 @@ lean_object* l_Lean_Elab_Term_adaptExpander___lambda__1(lean_object*, lean_objec
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts(lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_ToDepElimPattern_main___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabMatch___closed__1;
+lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__3___lambda__1(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_Meta_Tactic_Intro_0__Lean_Meta_introNImp___spec__1(size_t, size_t, lean_object*);
 extern lean_object* l_Lean_initFn____x40_Lean_Parser_Extra___hyg_938____closed__7;
 lean_object* l_Lean_Elab_throwIllFormedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_quotedNameToPattern___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx(lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostponeIfMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns_match__1(lean_object*);
-lean_object* l_Std_fmt___at_Lean_Level_PP_Result_format___spec__2(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr_match__1(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
 lean_object* l_Lean_Elab_Term_elabType(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*);
 uint8_t l_Lean_Expr_isFVar(lean_object*);
 lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Term_CollectPatternVars_collect___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchCore(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Term_CollectPatternVars_collect___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkForall(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedName;
@@ -691,6 +721,7 @@ lean_object* l_Lean_throwError___at_Lean_Elab_Term_quoteAutoTactic___spec__6(lea
 lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS_match__1___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4;
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -698,9 +729,11 @@ lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lea
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2;
+lean_object* l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2___boxed(lean_object*);
 lean_object* l_Lean_Expr_arrayLit_x3f(lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
 extern lean_object* l_Lean_Elab_Term_instInhabitedNamedArg;
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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* l_Lean_Syntax_isNameLit_x3f(lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -724,7 +757,9 @@ lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_El
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls___spec__1___closed__3;
 lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_match__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_withoutErrToSorry___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_tryPostponeIfDiscrTypeIsMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView_match__1(lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_ToDepElimPattern_main___spec__5(lean_object*, lean_object*, size_t, size_t);
@@ -732,6 +767,7 @@ extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__8;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__7;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__20;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndicesToInclude(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__10;
@@ -745,7 +781,6 @@ uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_finalize___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__2;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
 lean_object* l_Lean_Meta_whnfD(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processId_match__1(lean_object*);
@@ -759,6 +794,7 @@ extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_withDepElimPatterns___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls___spec__1___closed__5;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processId(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_CollectFVars_instInhabitedState___closed__1;
 lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___closed__3;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___closed__3;
@@ -822,6 +858,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__4
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___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* l_Lean_indentExpr(lean_object*);
 lean_object* l_Lean_Meta_mkFreshExprMVarWithId(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_withDepElimPatterns___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* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___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_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_getPatternsVars___spec__4(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -831,9 +868,9 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__3
 lean_object* l_Lean_Elab_Term_isLocalIdent_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__4___lambda__1___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_Closure_mkBinding___spec__1(size_t, size_t, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9634_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9997_(lean_object*);
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_1607_(lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189_(lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkSimpleThunk(lean_object*);
@@ -860,10 +897,12 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__3
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabMVarWithIdKind(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__5;
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS(lean_object*);
 uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___lambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__4(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__3(lean_object*, size_t, lean_object*, lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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* l_Lean_Elab_Term_withDepElimPatterns___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns_match__1___rarg(lean_object*, lean_object*);
@@ -877,8 +916,10 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_collectPatternVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_sortLocalDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_check(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15947____closed__11;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__2___rarg(lean_object*, lean_object*);
@@ -1403,7 +1444,7 @@ else
 {
 lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 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_inc(x_18);
-x_47 = l_Std_fmt___at_Lean_Level_PP_Result_format___spec__2(x_18);
+x_47 = l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(x_18);
 x_48 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_48, 0, x_47);
 x_49 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__2___closed__7;
@@ -1605,7 +1646,7 @@ else
 {
 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_inc(x_18);
-x_102 = l_Std_fmt___at_Lean_Level_PP_Result_format___spec__2(x_18);
+x_102 = l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(x_18);
 x_103 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_103, 0, x_102);
 x_104 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__2___closed__7;
@@ -1694,7 +1735,7 @@ x_136 = lean_ctor_get(x_19, 1);
 lean_inc(x_136);
 lean_dec(x_19);
 x_137 = lean_array_get_size(x_2);
-x_138 = l_Std_fmt___at_Lean_Level_PP_Result_format___spec__2(x_137);
+x_138 = l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(x_137);
 x_139 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_139, 0, x_138);
 x_140 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__2___closed__2;
@@ -3661,7 +3702,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_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__2;
-x_3 = lean_unsigned_to_nat(140u);
+x_3 = lean_unsigned_to_nat(141u);
 x_4 = lean_unsigned_to_nat(13u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -3738,7 +3779,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_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 x_2 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__2;
-x_3 = lean_unsigned_to_nat(141u);
+x_3 = lean_unsigned_to_nat(142u);
 x_4 = lean_unsigned_to_nat(9u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -8700,7 +8741,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_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 x_2 = l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___closed__3;
-x_3 = lean_unsigned_to_nat(426u);
+x_3 = lean_unsigned_to_nat(427u);
 x_4 = lean_unsigned_to_nat(11u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -17434,7 +17475,7 @@ x_37 = lean_ctor_get(x_36, 0);
 lean_inc(x_37);
 if (lean_obj_tag(x_37) == 7)
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t 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; 
 x_38 = lean_ctor_get(x_36, 1);
 lean_inc(x_38);
 lean_dec(x_36);
@@ -17444,179 +17485,110 @@ x_40 = lean_ctor_get(x_37, 2);
 lean_inc(x_40);
 x_41 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_41, 0, x_39);
-x_42 = 1;
+x_42 = lean_box(0);
+x_43 = 1;
+x_44 = lean_box(x_43);
+x_45 = lean_box(x_43);
+x_46 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_46, 0, x_35);
+lean_closure_set(x_46, 1, x_41);
+lean_closure_set(x_46, 2, x_44);
+lean_closure_set(x_46, 3, x_45);
+lean_closure_set(x_46, 4, x_42);
+x_47 = lean_alloc_closure((void*)(l_Lean_Elab_Term_withoutErrToSorry___rarg), 8, 1);
+lean_closure_set(x_47, 0, x_46);
+x_48 = 0;
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_41);
-lean_inc(x_35);
-x_43 = l_Lean_Elab_Term_elabTerm(x_35, x_41, x_42, x_42, x_6, x_7, x_8, x_9, x_10, x_11, x_38);
-if (lean_obj_tag(x_43) == 0)
+x_49 = l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg(x_47, x_48, x_6, x_7, x_8, x_9, x_10, x_11, x_38);
+if (lean_obj_tag(x_49) == 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; 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_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_box(0);
-x_47 = lean_ctor_get(x_10, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_10, 1);
-lean_inc(x_48);
-x_49 = lean_ctor_get(x_10, 2);
-lean_inc(x_49);
-x_50 = lean_ctor_get(x_10, 3);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_50 = lean_ctor_get(x_49, 0);
 lean_inc(x_50);
-x_51 = lean_ctor_get(x_10, 4);
+x_51 = lean_ctor_get(x_49, 1);
 lean_inc(x_51);
-x_52 = lean_ctor_get(x_10, 5);
-lean_inc(x_52);
-x_53 = lean_ctor_get(x_10, 6);
+lean_dec(x_49);
+x_52 = l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___lambda__1(x_40, x_37, x_33, x_50, x_6, x_7, x_8, x_9, x_10, x_11, x_51);
+lean_dec(x_37);
+lean_dec(x_40);
+x_53 = lean_ctor_get(x_52, 0);
 lean_inc(x_53);
-x_54 = lean_ctor_get(x_10, 7);
+x_54 = lean_ctor_get(x_52, 1);
 lean_inc(x_54);
-x_55 = l_Lean_replaceRef(x_35, x_50);
-lean_dec(x_50);
-lean_dec(x_35);
-x_56 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_56, 0, x_47);
-lean_ctor_set(x_56, 1, x_48);
-lean_ctor_set(x_56, 2, x_49);
-lean_ctor_set(x_56, 3, x_55);
-lean_ctor_set(x_56, 4, x_51);
-lean_ctor_set(x_56, 5, x_52);
-lean_ctor_set(x_56, 6, x_53);
-lean_ctor_set(x_56, 7, x_54);
-lean_inc(x_11);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-x_57 = l_Lean_Elab_Term_ensureHasType(x_41, x_44, x_46, x_6, x_7, x_8, x_9, x_56, x_11, x_45);
-if (lean_obj_tag(x_57) == 0)
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_58 = lean_ctor_get(x_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_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___lambda__1(x_40, x_37, x_33, x_58, x_6, x_7, x_8, x_9, x_10, x_11, x_59);
-lean_dec(x_37);
-lean_dec(x_40);
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_60, 1);
-lean_inc(x_62);
-lean_dec(x_60);
-x_19 = x_61;
-x_20 = x_62;
+lean_dec(x_52);
+x_19 = x_53;
+x_20 = x_54;
 goto block_31;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
 lean_dec(x_40);
 lean_dec(x_37);
 lean_dec(x_33);
-x_63 = lean_ctor_get(x_57, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_57, 1);
-lean_inc(x_64);
-lean_dec(x_57);
+x_55 = lean_ctor_get(x_49, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_49, 1);
+lean_inc(x_56);
+lean_dec(x_49);
 lean_inc(x_4);
-x_65 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_4);
-x_66 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_66, 0, x_65);
-x_19 = x_66;
-x_20 = x_64;
+x_57 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_57, 0, x_55);
+lean_ctor_set(x_57, 1, x_4);
+x_58 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_58, 0, x_57);
+x_19 = x_58;
+x_20 = x_56;
 goto block_31;
 }
 }
 else
 {
-uint8_t x_67; 
-lean_dec(x_41);
-lean_dec(x_40);
-lean_dec(x_37);
-lean_dec(x_35);
-lean_dec(x_33);
-lean_dec(x_18);
-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_4);
-x_67 = !lean_is_exclusive(x_43);
-if (x_67 == 0)
-{
-return x_43;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_ctor_get(x_43, 0);
-x_69 = lean_ctor_get(x_43, 1);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_dec(x_43);
-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
-{
-lean_object* x_71; lean_object* x_72; lean_object* x_73; uint8_t x_74; 
+lean_object* x_59; lean_object* x_60; lean_object* x_61; uint8_t x_62; 
 lean_dec(x_37);
 lean_dec(x_35);
 lean_dec(x_33);
 lean_dec(x_18);
 lean_dec(x_4);
-x_71 = lean_ctor_get(x_36, 1);
-lean_inc(x_71);
+x_59 = lean_ctor_get(x_36, 1);
+lean_inc(x_59);
 lean_dec(x_36);
-x_72 = l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___closed__2;
-x_73 = l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__1(x_72, x_6, x_7, x_8, x_9, x_10, x_11, x_71);
+x_60 = l_Std_Range_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__2___closed__2;
+x_61 = l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___spec__1(x_60, x_6, x_7, x_8, x_9, x_10, x_11, x_59);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
-x_74 = !lean_is_exclusive(x_73);
-if (x_74 == 0)
+x_62 = !lean_is_exclusive(x_61);
+if (x_62 == 0)
 {
-return x_73;
+return x_61;
 }
 else
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; 
-x_75 = lean_ctor_get(x_73, 0);
-x_76 = lean_ctor_get(x_73, 1);
-lean_inc(x_76);
-lean_inc(x_75);
-lean_dec(x_73);
-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;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_63 = lean_ctor_get(x_61, 0);
+x_64 = lean_ctor_get(x_61, 1);
+lean_inc(x_64);
+lean_inc(x_63);
+lean_dec(x_61);
+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;
 }
 }
 }
 else
 {
-uint8_t x_78; 
+uint8_t x_66; 
 lean_dec(x_35);
 lean_dec(x_33);
 lean_dec(x_18);
@@ -17627,23 +17599,23 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
-x_78 = !lean_is_exclusive(x_36);
-if (x_78 == 0)
+x_66 = !lean_is_exclusive(x_36);
+if (x_66 == 0)
 {
 return x_36;
 }
 else
 {
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_ctor_get(x_36, 0);
-x_80 = lean_ctor_get(x_36, 1);
-lean_inc(x_80);
-lean_inc(x_79);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_36, 0);
+x_68 = lean_ctor_get(x_36, 1);
+lean_inc(x_68);
+lean_inc(x_67);
 lean_dec(x_36);
-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;
+x_69 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_69, 0, x_67);
+lean_ctor_set(x_69, 1, x_68);
+return x_69;
 }
 }
 block_31:
@@ -17704,7 +17676,7 @@ goto _start;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; 
+lean_object* x_70; lean_object* x_71; 
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -17713,17 +17685,17 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
-x_82 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_82, 0, x_5);
-x_83 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_83, 0, x_82);
-lean_ctor_set(x_83, 1, x_12);
-return x_83;
+x_70 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_70, 0, x_5);
+x_71 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_12);
+return x_71;
 }
 }
 else
 {
-lean_object* x_84; lean_object* x_85; 
+lean_object* x_72; lean_object* x_73; 
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -17732,12 +17704,12 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
-x_84 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_84, 0, x_5);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_12);
-return x_85;
+x_72 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_72, 0, x_5);
+x_73 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_12);
+return x_73;
 }
 }
 }
@@ -24334,42 +24306,6 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; 
-lean_dec(x_3);
-x_4 = lean_box(0);
-x_5 = lean_apply_1(x_2, x_4);
-return x_5;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-lean_dec(x_2);
-x_6 = lean_ctor_get(x_1, 0);
-lean_inc(x_6);
-lean_dec(x_1);
-x_7 = lean_ctor_get(x_6, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_6, 1);
-lean_inc(x_8);
-lean_dec(x_6);
-x_9 = lean_apply_2(x_3, x_7, x_8);
-return x_9;
-}
-}
-}
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__1___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
 lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 lean_dec(x_2);
 x_4 = lean_ctor_get(x_1, 0);
@@ -24395,11 +24331,11 @@ return x_9;
 }
 }
 }
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__2(lean_object* x_1) {
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__2___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop_match__1___rarg), 3, 0);
 return x_2;
 }
 }
@@ -24434,114 +24370,25 @@ x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_e
 return x_2;
 }
 }
-lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps_match__1___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-uint8_t x_5; 
-x_5 = x_3 < x_2;
-if (x_5 == 0)
-{
-lean_object* x_6; 
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_1, 1);
+lean_inc(x_4);
 lean_dec(x_1);
-x_6 = x_4;
-return x_6;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_7 = lean_array_uget(x_4, x_3);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_4, x_3, x_8);
-x_10 = x_7;
-x_11 = !lean_is_exclusive(x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; 
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_1);
-x_13 = l_Array_append___rarg(x_1, x_12);
-lean_dec(x_12);
-lean_ctor_set(x_10, 1, x_13);
-x_14 = 1;
-x_15 = x_3 + x_14;
-x_16 = x_10;
-x_17 = lean_array_uset(x_9, x_3, x_16);
-x_3 = x_15;
-x_4 = x_17;
-goto _start;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27; 
-x_19 = lean_ctor_get(x_10, 0);
-x_20 = lean_ctor_get(x_10, 1);
-x_21 = lean_ctor_get(x_10, 2);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_inc(x_19);
-lean_dec(x_10);
-lean_inc(x_1);
-x_22 = l_Array_append___rarg(x_1, x_20);
-lean_dec(x_20);
-x_23 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_23, 0, x_19);
-lean_ctor_set(x_23, 1, x_22);
-lean_ctor_set(x_23, 2, x_21);
-x_24 = 1;
-x_25 = x_3 + x_24;
-x_26 = x_23;
-x_27 = lean_array_uset(x_9, x_3, x_26);
-x_3 = x_25;
-x_4 = x_27;
-goto _start;
+x_5 = lean_apply_2(x_2, x_3, x_4);
+return x_5;
 }
 }
-}
-}
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps_match__1(lean_object* x_1) {
 _start:
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_10 = lean_ctor_get(x_7, 3);
-x_11 = l_Lean_mkHole(x_10);
-x_12 = lean_mk_array(x_1, x_11);
-x_13 = lean_array_get_size(x_2);
-x_14 = lean_usize_of_nat(x_13);
-lean_dec(x_13);
-x_15 = 0;
-x_16 = x_2;
-x_17 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(x_12, x_14, x_15, x_16);
-x_18 = x_17;
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_9);
-return x_19;
-}
-}
-lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(x_1, x_5, x_6, x_4);
-return x_7;
-}
-}
-lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, 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_10;
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps_match__1___rarg), 2, 0);
+return x_2;
 }
 }
 lean_object* l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
@@ -24718,24 +24565,152 @@ if (x_12 == 0)
 {
 lean_object* 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_3);
-x_13 = lean_alloc_ctor(0, 2, 0);
+lean_inc(x_2);
+x_13 = l_Lean_Meta_check(x_2, x_5, x_6, x_7, x_8, x_9);
+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; 
+x_15 = lean_ctor_get(x_13, 0);
+lean_dec(x_15);
 lean_ctor_set(x_13, 0, x_2);
-lean_ctor_set(x_13, 1, x_9);
 return x_13;
 }
 else
 {
-size_t x_14; size_t x_15; lean_object* x_16; 
-x_14 = lean_usize_of_nat(x_10);
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_ctor_get(x_13, 1);
+lean_inc(x_16);
+lean_dec(x_13);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_2);
+lean_ctor_set(x_17, 1, x_16);
+return x_17;
+}
+}
+else
+{
+uint8_t x_18; 
+lean_dec(x_2);
+x_18 = !lean_is_exclusive(x_13);
+if (x_18 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_13, 0);
+x_20 = lean_ctor_get(x_13, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_13);
+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;
+}
+}
+}
+else
+{
+size_t x_22; size_t x_23; lean_object* x_24; 
+x_22 = lean_usize_of_nat(x_10);
 lean_dec(x_10);
-x_15 = 0;
-x_16 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType___spec__1(x_1, x_14, x_15, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_16;
+x_23 = 0;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_24 = l_Array_foldrMUnsafe_fold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType___spec__1(x_1, x_22, x_23, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_24) == 0)
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+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);
+lean_inc(x_25);
+x_27 = l_Lean_Meta_check(x_25, x_5, x_6, x_7, x_8, x_26);
+if (lean_obj_tag(x_27) == 0)
+{
+uint8_t x_28; 
+x_28 = !lean_is_exclusive(x_27);
+if (x_28 == 0)
+{
+lean_object* x_29; 
+x_29 = lean_ctor_get(x_27, 0);
+lean_dec(x_29);
+lean_ctor_set(x_27, 0, x_25);
+return x_27;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; 
+x_30 = lean_ctor_get(x_27, 1);
+lean_inc(x_30);
+lean_dec(x_27);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_25);
+lean_ctor_set(x_31, 1, x_30);
+return x_31;
+}
+}
+else
+{
+uint8_t x_32; 
+lean_dec(x_25);
+x_32 = !lean_is_exclusive(x_27);
+if (x_32 == 0)
+{
+return x_27;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_27, 0);
+x_34 = lean_ctor_get(x_27, 1);
+lean_inc(x_34);
+lean_inc(x_33);
+lean_dec(x_27);
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_33);
+lean_ctor_set(x_35, 1, x_34);
+return x_35;
+}
+}
+}
+else
+{
+uint8_t x_36; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_36 = !lean_is_exclusive(x_24);
+if (x_36 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_24, 0);
+x_38 = lean_ctor_get(x_24, 1);
+lean_inc(x_38);
+lean_inc(x_37);
+lean_dec(x_24);
+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;
+}
+}
 }
 }
 }
@@ -24763,6 +24738,1053 @@ lean_dec(x_1);
 return x_10;
 }
 }
+lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = x_3 < x_2;
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_1);
+x_6 = x_4;
+return x_6;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_7 = lean_array_uget(x_4, x_3);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = lean_array_uset(x_4, x_3, x_8);
+x_10 = x_7;
+x_11 = !lean_is_exclusive(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; 
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_1);
+x_13 = l_Array_append___rarg(x_1, x_12);
+lean_dec(x_12);
+lean_ctor_set(x_10, 1, x_13);
+x_14 = 1;
+x_15 = x_3 + x_14;
+x_16 = x_10;
+x_17 = lean_array_uset(x_9, x_3, x_16);
+x_3 = x_15;
+x_4 = x_17;
+goto _start;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27; 
+x_19 = lean_ctor_get(x_10, 0);
+x_20 = lean_ctor_get(x_10, 1);
+x_21 = lean_ctor_get(x_10, 2);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_10);
+lean_inc(x_1);
+x_22 = l_Array_append___rarg(x_1, x_20);
+lean_dec(x_20);
+x_23 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_23, 0, x_19);
+lean_ctor_set(x_23, 1, x_22);
+lean_ctor_set(x_23, 2, x_21);
+x_24 = 1;
+x_25 = x_3 + x_24;
+x_26 = x_23;
+x_27 = lean_array_uset(x_9, x_3, x_26);
+x_3 = x_25;
+x_4 = x_27;
+goto _start;
+}
+}
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(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; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_10 = lean_ctor_get(x_7, 3);
+x_11 = l_Lean_mkHole(x_10);
+x_12 = lean_mk_array(x_1, x_11);
+x_13 = lean_array_get_size(x_2);
+x_14 = lean_usize_of_nat(x_13);
+lean_dec(x_13);
+x_15 = 0;
+x_16 = x_2;
+x_17 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(x_12, x_14, x_15, x_16);
+x_18 = x_17;
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_9);
+return x_19;
+}
+}
+lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___spec__1(x_1, x_5, x_6, x_4);
+return x_7;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, 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_10;
+}
+}
+uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1(lean_object* x_1, lean_object* x_2, size_t x_3, size_t x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = x_3 == x_4;
+if (x_5 == 0)
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_uget(x_2, x_3);
+x_7 = l_Lean_Expr_isFVar(x_6);
+if (x_7 == 0)
+{
+size_t x_8; size_t x_9; 
+lean_dec(x_6);
+x_8 = 1;
+x_9 = x_3 + x_8;
+x_3 = x_9;
+goto _start;
+}
+else
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = l_Lean_Expr_fvarId_x21(x_6);
+lean_dec(x_6);
+x_12 = lean_name_eq(x_11, x_1);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+size_t x_13; size_t x_14; 
+x_13 = 1;
+x_14 = x_3 + x_13;
+x_3 = x_14;
+goto _start;
+}
+else
+{
+uint8_t x_16; 
+x_16 = 1;
+return x_16;
+}
+}
+}
+else
+{
+uint8_t x_17; 
+x_17 = 0;
+return x_17;
+}
+}
+}
+uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = lean_array_get_size(x_1);
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = lean_nat_dec_lt(x_4, x_3);
+if (x_5 == 0)
+{
+uint8_t x_6; 
+lean_dec(x_3);
+x_6 = 0;
+return x_6;
+}
+else
+{
+uint8_t x_7; 
+x_7 = lean_nat_dec_le(x_3, x_3);
+if (x_7 == 0)
+{
+uint8_t x_8; 
+lean_dec(x_3);
+x_8 = 0;
+return x_8;
+}
+else
+{
+size_t x_9; size_t x_10; uint8_t x_11; 
+x_9 = 0;
+x_10 = lean_usize_of_nat(x_3);
+lean_dec(x_3);
+x_11 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1(x_2, x_1, x_9, x_10);
+return x_11;
+}
+}
+}
+}
+lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1___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; uint8_t x_7; lean_object* x_8; 
+x_5 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_6 = lean_unbox_usize(x_4);
+lean_dec(x_4);
+x_7 = l_Array_anyMUnsafe_any___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___spec__1(x_1, x_2, x_5, x_6);
+lean_dec(x_2);
+lean_dec(x_1);
+x_8 = lean_box(x_7);
+return x_8;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+uint8_t x_12; 
+x_12 = x_3 < x_2;
+if (x_12 == 0)
+{
+lean_object* x_13; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_4);
+lean_ctor_set(x_13, 1, x_11);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_array_uget(x_1, x_3);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_15 = l_Lean_Meta_inferType(x_14, x_7, x_8, x_9, x_10, x_11);
+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);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_18 = l_Lean_Meta_instantiateMVars(x_16, x_7, x_8, x_9, x_10, x_17);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; size_t x_22; size_t x_23; 
+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 = l_Lean_CollectFVars_main(x_19, x_4);
+x_22 = 1;
+x_23 = x_3 + x_22;
+x_3 = x_23;
+x_4 = x_21;
+x_11 = x_20;
+goto _start;
+}
+else
+{
+uint8_t x_25; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_4);
+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
+{
+uint8_t x_29; 
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_4);
+x_29 = !lean_is_exclusive(x_15);
+if (x_29 == 0)
+{
+return x_15;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_15, 0);
+x_31 = lean_ctor_get(x_15, 1);
+lean_inc(x_31);
+lean_inc(x_30);
+lean_dec(x_15);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+return x_32;
+}
+}
+}
+}
+}
+lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3(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);
+x_4 = lean_ctor_get(x_2, 1);
+x_5 = lean_ctor_get(x_2, 3);
+x_6 = l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3(x_1, x_5);
+lean_inc(x_4);
+x_7 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_7, 0, x_4);
+lean_ctor_set(x_7, 1, x_6);
+x_1 = x_7;
+x_2 = x_3;
+goto _start;
+}
+}
+}
+lean_object* l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_box(0);
+x_3 = l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3(x_2, x_1);
+return x_3;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__4(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) {
+_start:
+{
+uint8_t x_15; 
+x_15 = x_6 < x_5;
+if (x_15 == 0)
+{
+lean_object* x_16; 
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_16 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_16, 0, x_7);
+lean_ctor_set(x_16, 1, x_14);
+return x_16;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_17 = lean_array_uget(x_4, x_6);
+lean_inc(x_2);
+lean_inc(x_3);
+x_18 = l_Lean_MetavarContext_localDeclDependsOn(x_3, x_2, x_17);
+lean_dec(x_17);
+x_19 = lean_unbox(x_18);
+lean_dec(x_18);
+if (x_19 == 0)
+{
+size_t x_20; size_t x_21; 
+x_20 = 1;
+x_21 = x_6 + x_20;
+x_6 = x_21;
+goto _start;
+}
+else
+{
+lean_object* x_23; size_t x_24; size_t x_25; 
+lean_inc(x_1);
+x_23 = lean_array_push(x_7, x_1);
+x_24 = 1;
+x_25 = x_6 + x_24;
+x_6 = x_25;
+x_7 = x_23;
+goto _start;
+}
+}
+}
+}
+lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__5(lean_object* x_1, lean_object* x_2, size_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+_start:
+{
+if (lean_obj_tag(x_5) == 0)
+{
+lean_object* x_14; 
+lean_dec(x_9);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_6);
+lean_ctor_set(x_14, 1, x_13);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_15 = lean_ctor_get(x_5, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_5, 1);
+lean_inc(x_16);
+lean_dec(x_5);
+x_17 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(x_2, x_15);
+if (x_17 == 0)
+{
+uint8_t x_18; 
+x_18 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_containsFVar(x_1, x_15);
+if (x_18 == 0)
+{
+lean_object* x_19; 
+lean_inc(x_9);
+lean_inc(x_15);
+x_19 = l_Lean_Meta_getLocalDecl(x_15, x_9, x_10, x_11, x_12, x_13);
+if (lean_obj_tag(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_object* x_26; lean_object* x_27; lean_object* x_28; size_t x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+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_st_ref_get(x_12, x_21);
+x_23 = lean_ctor_get(x_22, 1);
+lean_inc(x_23);
+lean_dec(x_22);
+x_24 = lean_st_ref_get(x_10, x_23);
+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_27 = lean_ctor_get(x_25, 0);
+lean_inc(x_27);
+lean_dec(x_25);
+x_28 = lean_array_get_size(x_4);
+x_29 = lean_usize_of_nat(x_28);
+lean_dec(x_28);
+x_30 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__4(x_15, x_20, x_27, x_4, x_29, x_3, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_26);
+x_31 = lean_ctor_get(x_30, 0);
+lean_inc(x_31);
+x_32 = lean_ctor_get(x_30, 1);
+lean_inc(x_32);
+lean_dec(x_30);
+x_5 = x_16;
+x_6 = x_31;
+x_13 = x_32;
+goto _start;
+}
+else
+{
+uint8_t x_34; 
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_9);
+lean_dec(x_6);
+x_34 = !lean_is_exclusive(x_19);
+if (x_34 == 0)
+{
+return x_19;
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_19, 0);
+x_36 = lean_ctor_get(x_19, 1);
+lean_inc(x_36);
+lean_inc(x_35);
+lean_dec(x_19);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_35);
+lean_ctor_set(x_37, 1, x_36);
+return x_37;
+}
+}
+}
+else
+{
+lean_dec(x_15);
+x_5 = x_16;
+goto _start;
+}
+}
+else
+{
+lean_dec(x_15);
+x_5 = x_16;
+goto _start;
+}
+}
+}
+}
+uint8_t l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1(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; lean_object* x_7; uint8_t x_8; 
+lean_inc(x_1);
+x_4 = l_Lean_LocalContext_get_x21(x_1, x_2);
+x_5 = l_Lean_LocalDecl_index(x_4);
+lean_dec(x_4);
+x_6 = l_Lean_LocalContext_get_x21(x_1, x_3);
+x_7 = l_Lean_LocalDecl_index(x_6);
+lean_dec(x_6);
+x_8 = lean_nat_dec_lt(x_5, x_7);
+lean_dec(x_7);
+lean_dec(x_5);
+return x_8;
+}
+}
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(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_15; 
+lean_inc(x_1);
+x_5 = lean_alloc_closure((void*)(l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1___boxed), 3, 1);
+lean_closure_set(x_5, 0, x_1);
+x_15 = lean_nat_dec_lt(x_3, x_4);
+if (x_15 == 0)
+{
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_2;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 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_16 = lean_nat_add(x_3, x_4);
+x_17 = lean_unsigned_to_nat(2u);
+x_18 = lean_nat_div(x_16, x_17);
+lean_dec(x_16);
+x_49 = l_Lean_instInhabitedName;
+x_50 = lean_array_get(x_49, x_2, x_18);
+x_51 = lean_array_get(x_49, x_2, x_3);
+lean_inc(x_1);
+x_52 = l_Lean_LocalContext_get_x21(x_1, x_50);
+x_53 = l_Lean_LocalDecl_index(x_52);
+lean_dec(x_52);
+lean_inc(x_1);
+x_54 = l_Lean_LocalContext_get_x21(x_1, x_51);
+x_55 = l_Lean_LocalDecl_index(x_54);
+lean_dec(x_54);
+x_56 = lean_nat_dec_lt(x_53, x_55);
+lean_dec(x_55);
+lean_dec(x_53);
+if (x_56 == 0)
+{
+x_19 = x_2;
+goto block_48;
+}
+else
+{
+lean_object* x_57; 
+x_57 = lean_array_swap(x_2, x_3, x_18);
+x_19 = x_57;
+goto block_48;
+}
+block_48:
+{
+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 = l_Lean_instInhabitedName;
+x_21 = lean_array_get(x_20, x_19, x_4);
+x_22 = lean_array_get(x_20, x_19, x_3);
+lean_inc(x_21);
+lean_inc(x_1);
+x_23 = l_Lean_LocalContext_get_x21(x_1, x_21);
+x_24 = l_Lean_LocalDecl_index(x_23);
+lean_dec(x_23);
+lean_inc(x_1);
+x_25 = l_Lean_LocalContext_get_x21(x_1, x_22);
+x_26 = l_Lean_LocalDecl_index(x_25);
+lean_dec(x_25);
+x_27 = lean_nat_dec_lt(x_24, x_26);
+lean_dec(x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_28 = lean_array_get(x_20, x_19, x_18);
+lean_inc(x_1);
+x_29 = l_Lean_LocalContext_get_x21(x_1, x_28);
+x_30 = l_Lean_LocalDecl_index(x_29);
+lean_dec(x_29);
+x_31 = lean_nat_dec_lt(x_30, x_24);
+lean_dec(x_24);
+lean_dec(x_30);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+lean_dec(x_18);
+lean_inc_n(x_3, 2);
+x_32 = l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(x_5, x_4, x_21, x_19, x_3, x_3);
+x_6 = x_32;
+goto block_14;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_21);
+x_33 = lean_array_swap(x_19, x_18, x_4);
+lean_dec(x_18);
+x_34 = lean_array_get(x_20, x_33, x_4);
+lean_inc_n(x_3, 2);
+x_35 = l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(x_5, x_4, x_34, x_33, x_3, x_3);
+x_6 = x_35;
+goto block_14;
+}
+}
+else
+{
+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; 
+lean_dec(x_24);
+lean_dec(x_21);
+x_36 = lean_array_swap(x_19, x_3, x_4);
+x_37 = lean_array_get(x_20, x_36, x_18);
+x_38 = lean_array_get(x_20, x_36, x_4);
+lean_inc(x_1);
+x_39 = l_Lean_LocalContext_get_x21(x_1, x_37);
+x_40 = l_Lean_LocalDecl_index(x_39);
+lean_dec(x_39);
+lean_inc(x_38);
+lean_inc(x_1);
+x_41 = l_Lean_LocalContext_get_x21(x_1, x_38);
+x_42 = l_Lean_LocalDecl_index(x_41);
+lean_dec(x_41);
+x_43 = lean_nat_dec_lt(x_40, x_42);
+lean_dec(x_42);
+lean_dec(x_40);
+if (x_43 == 0)
+{
+lean_object* x_44; 
+lean_dec(x_18);
+lean_inc_n(x_3, 2);
+x_44 = l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(x_5, x_4, x_38, x_36, x_3, x_3);
+x_6 = x_44;
+goto block_14;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+lean_dec(x_38);
+x_45 = lean_array_swap(x_36, x_18, x_4);
+lean_dec(x_18);
+x_46 = lean_array_get(x_20, x_45, x_4);
+lean_inc_n(x_3, 2);
+x_47 = l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(x_5, x_4, x_46, x_45, x_3, x_3);
+x_6 = x_47;
+goto block_14;
+}
+}
+}
+}
+block_14:
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_6, 1);
+lean_inc(x_8);
+lean_dec(x_6);
+x_9 = lean_nat_dec_le(x_4, x_7);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_inc(x_1);
+x_10 = l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(x_1, x_8, x_3, x_7);
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_add(x_7, x_11);
+lean_dec(x_7);
+x_2 = x_10;
+x_3 = x_12;
+goto _start;
+}
+else
+{
+lean_dec(x_7);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_8;
+}
+}
+}
+}
+static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Expr_isFVar___boxed), 1, 0);
+return x_1;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(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; size_t x_11; size_t x_12; lean_object* x_13; lean_object* x_14; 
+x_10 = lean_array_get_size(x_2);
+x_11 = lean_usize_of_nat(x_10);
+lean_dec(x_10);
+x_12 = 0;
+x_13 = l_Lean_CollectFVars_instInhabitedState___closed__1;
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_14 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__1(x_2, x_11, x_12, x_13, x_3, 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; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; size_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; 
+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_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1;
+x_18 = l_Array_split___rarg(x_1, 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_array_get_size(x_19);
+x_22 = lean_usize_of_nat(x_21);
+lean_dec(x_21);
+x_23 = x_19;
+x_24 = l_Array_mapMUnsafe_map___at___private_Lean_Meta_Tactic_Intro_0__Lean_Meta_introNImp___spec__1(x_22, x_12, x_23);
+x_25 = x_24;
+x_26 = lean_ctor_get(x_15, 1);
+lean_inc(x_26);
+lean_dec(x_15);
+x_27 = l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2(x_26);
+lean_dec(x_26);
+x_28 = l_Array_empty___closed__1;
+lean_inc(x_5);
+x_29 = l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__5(x_1, x_2, x_12, x_25, x_27, x_28, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+if (lean_obj_tag(x_29) == 0)
+{
+uint8_t x_30; 
+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; lean_object* x_38; lean_object* x_39; size_t x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_31 = lean_ctor_get(x_29, 0);
+x_32 = lean_ctor_get(x_5, 1);
+lean_inc(x_32);
+lean_dec(x_5);
+x_33 = l_Array_append___rarg(x_25, x_31);
+lean_dec(x_31);
+x_34 = lean_array_get_size(x_33);
+x_35 = lean_unsigned_to_nat(1u);
+x_36 = lean_nat_sub(x_34, x_35);
+lean_dec(x_34);
+x_37 = lean_unsigned_to_nat(0u);
+x_38 = l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(x_32, x_33, x_37, x_36);
+lean_dec(x_36);
+x_39 = lean_array_get_size(x_38);
+x_40 = lean_usize_of_nat(x_39);
+lean_dec(x_39);
+x_41 = x_38;
+x_42 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_40, x_12, x_41);
+x_43 = x_42;
+x_44 = l_Array_append___rarg(x_43, x_20);
+lean_dec(x_20);
+lean_ctor_set(x_29, 0, x_44);
+return x_29;
+}
+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; lean_object* x_53; lean_object* x_54; size_t x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_45 = lean_ctor_get(x_29, 0);
+x_46 = lean_ctor_get(x_29, 1);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_dec(x_29);
+x_47 = lean_ctor_get(x_5, 1);
+lean_inc(x_47);
+lean_dec(x_5);
+x_48 = l_Array_append___rarg(x_25, x_45);
+lean_dec(x_45);
+x_49 = lean_array_get_size(x_48);
+x_50 = lean_unsigned_to_nat(1u);
+x_51 = lean_nat_sub(x_49, x_50);
+lean_dec(x_49);
+x_52 = lean_unsigned_to_nat(0u);
+x_53 = l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(x_47, x_48, x_52, x_51);
+lean_dec(x_51);
+x_54 = lean_array_get_size(x_53);
+x_55 = lean_usize_of_nat(x_54);
+lean_dec(x_54);
+x_56 = x_53;
+x_57 = l_Array_mapMUnsafe_map___at_Lean_LocalContext_getFVars___spec__1(x_55, x_12, x_56);
+x_58 = x_57;
+x_59 = l_Array_append___rarg(x_58, x_20);
+lean_dec(x_20);
+x_60 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_60, 0, x_59);
+lean_ctor_set(x_60, 1, x_46);
+return x_60;
+}
+}
+else
+{
+uint8_t x_61; 
+lean_dec(x_25);
+lean_dec(x_20);
+lean_dec(x_5);
+x_61 = !lean_is_exclusive(x_29);
+if (x_61 == 0)
+{
+return x_29;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_29, 0);
+x_63 = lean_ctor_get(x_29, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_29);
+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_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_65 = !lean_is_exclusive(x_14);
+if (x_65 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_66 = lean_ctor_get(x_14, 0);
+x_67 = lean_ctor_get(x_14, 1);
+lean_inc(x_67);
+lean_inc(x_66);
+lean_dec(x_14);
+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* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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) {
+_start:
+{
+size_t x_12; size_t x_13; lean_object* x_14; 
+x_12 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_13 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_14 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__1(x_1, x_12, x_13, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_1);
+return x_14;
+}
+}
+lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Std_RBNode_revFold___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__3(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Std_RBTree_toList___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__2(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__4___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13, lean_object* x_14) {
+_start:
+{
+size_t x_15; size_t x_16; lean_object* x_17; 
+x_15 = lean_unbox_usize(x_5);
+lean_dec(x_5);
+x_16 = lean_unbox_usize(x_6);
+lean_dec(x_6);
+x_17 = l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__4(x_1, x_2, x_3, x_4, x_15, x_16, 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_4);
+return x_17;
+}
+}
+lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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, lean_object* x_10, lean_object* x_11, lean_object* x_12, lean_object* x_13) {
+_start:
+{
+size_t x_14; lean_object* x_15; 
+x_14 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_15 = l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__5(x_1, x_2, x_14, x_4, x_5, x_6, 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_8);
+lean_dec(x_7);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_15;
+}
+}
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; lean_object* x_5; 
+x_4 = l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___lambda__1(x_1, x_2, x_3);
+x_5 = lean_box(x_4);
+return x_5;
+}
+}
+lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6___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_Array_qsort_sort___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___spec__6(x_1, x_2, x_3, x_4);
+lean_dec(x_4);
+return x_5;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_10;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___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; lean_object* x_10; uint8_t x_11; 
+x_9 = lean_ctor_get(x_1, 0);
+lean_inc(x_9);
+x_10 = l_Lean_Elab_Term_SavedState_restore(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_11 = !lean_is_exclusive(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; 
+x_12 = lean_ctor_get(x_10, 0);
+lean_dec(x_12);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
+lean_dec(x_1);
+lean_ctor_set_tag(x_10, 1);
+lean_ctor_set(x_10, 0, x_13);
+return x_10;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_14 = lean_ctor_get(x_10, 1);
+lean_inc(x_14);
+lean_dec(x_10);
+x_15 = lean_ctor_get(x_1, 1);
+lean_inc(x_15);
+lean_dec(x_1);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_14);
+return x_16;
+}
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg___boxed), 8, 0);
+return x_2;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___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, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(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_9;
+}
+}
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(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:
 {
@@ -24773,43 +25795,41 @@ x_10 = l_Lean_Elab_Term_saveAllState___rarg(x_4, x_5, x_6, x_7, x_8, 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; 
+lean_object* x_12; lean_object* x_13; 
 x_12 = lean_ctor_get(x_10, 0);
 x_13 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_13, 0, x_12);
 lean_ctor_set(x_13, 1, x_2);
-x_14 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_10, 0, x_14);
+lean_ctor_set(x_10, 0, x_13);
 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_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_10, 0);
+x_15 = lean_ctor_get(x_10, 1);
 lean_inc(x_15);
+lean_inc(x_14);
 lean_dec(x_10);
+x_16 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_2);
 x_17 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_17, 0, x_15);
-lean_ctor_set(x_17, 1, x_2);
-x_18 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_18, 0, x_17);
-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;
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_15);
+return x_17;
 }
 }
 else
 {
-lean_object* x_20; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_2);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_1);
-lean_ctor_set(x_20, 1, x_9);
-return x_20;
+x_18 = lean_ctor_get(x_1, 0);
+lean_inc(x_18);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_9);
+return x_19;
 }
 }
 }
@@ -24824,6 +25844,7 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
+lean_dec(x_1);
 return x_10;
 }
 }
@@ -24983,6 +26004,25 @@ return x_42;
 }
 }
 }
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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:
+{
+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 = lean_array_get_size(x_1);
+x_14 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(x_13, x_2, x_6, x_7, x_8, x_9, x_10, x_11, 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 = l_Array_append___rarg(x_1, x_3);
+x_18 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_18, 0, x_4);
+x_19 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop(x_17, x_5, x_15, x_18, x_6, x_7, x_8, x_9, x_10, x_11, x_16);
+lean_dec(x_18);
+return x_19;
+}
+}
 static lean_object* _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1() {
 _start:
 {
@@ -25050,63 +26090,98 @@ x_28 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_getIndicesToInclude(x_1, x_
 lean_dec(x_27);
 if (lean_obj_tag(x_28) == 0)
 {
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_28);
-if (x_29 == 0)
+lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_29 = lean_ctor_get(x_28, 0);
+lean_inc(x_29);
+x_30 = lean_ctor_get(x_28, 1);
+lean_inc(x_30);
+lean_dec(x_28);
+x_31 = l_Array_isEmpty___rarg(x_29);
+if (x_31 == 0)
 {
-lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_30 = lean_ctor_get(x_28, 0);
-x_31 = lean_ctor_get(x_28, 1);
-x_32 = l_Array_isEmpty___rarg(x_30);
-if (x_32 == 0)
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-lean_free_object(x_28);
-x_33 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_4, x_26, x_5, x_6, x_7, x_8, x_9, x_10, x_31);
-x_34 = lean_ctor_get(x_33, 0);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_32 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_4, x_26, x_5, x_6, x_7, x_8, x_9, x_10, x_30);
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_32, 1);
 lean_inc(x_34);
-x_35 = lean_ctor_get(x_33, 1);
-lean_inc(x_35);
-lean_dec(x_33);
-x_36 = l_Lean_Elab_Term_SavedState_restore(x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_35);
-x_37 = lean_ctor_get(x_36, 1);
-lean_inc(x_37);
-lean_dec(x_36);
+lean_dec(x_32);
+x_35 = l_Lean_Elab_Term_SavedState_restore(x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_34);
+x_36 = lean_ctor_get(x_35, 1);
+lean_inc(x_36);
+lean_dec(x_35);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+x_37 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps(x_29, x_1, x_5, x_6, x_7, x_8, x_9, x_10, x_36);
+lean_dec(x_29);
+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);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_5);
-x_38 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(x_30, x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_37);
-if (lean_obj_tag(x_38) == 0)
+x_40 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(x_38, x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_39);
+if (lean_obj_tag(x_40) == 0)
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-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 = lean_array_get_size(x_30);
-x_42 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(x_41, x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_40);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_ctor_get(x_42, 1);
-lean_inc(x_44);
-lean_dec(x_42);
-x_45 = l_Array_append___rarg(x_30, x_1);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_40, 0);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_40, 1);
+lean_inc(x_42);
+lean_dec(x_40);
+x_43 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___lambda__1(x_38, x_3, x_1, x_33, x_41, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
 lean_dec(x_1);
-x_1 = x_45;
-x_2 = x_39;
-x_3 = x_43;
-x_4 = x_34;
-x_11 = x_44;
-goto _start;
+return x_43;
 }
 else
 {
-uint8_t x_47; 
-lean_dec(x_34);
-lean_dec(x_30);
+lean_object* x_44; lean_object* x_45; uint8_t x_46; 
+lean_dec(x_38);
+lean_dec(x_3);
+lean_dec(x_1);
+x_44 = lean_ctor_get(x_40, 1);
+lean_inc(x_44);
+lean_dec(x_40);
+x_45 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(x_33, x_5, x_6, x_7, x_8, x_9, x_10, x_44);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_46 = !lean_is_exclusive(x_45);
+if (x_46 == 0)
+{
+return x_45;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_45, 0);
+x_48 = lean_ctor_get(x_45, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_45);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
+}
+}
+}
+else
+{
+uint8_t x_50; 
+lean_dec(x_33);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -25114,277 +26189,205 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
+lean_dec(x_2);
 lean_dec(x_1);
-x_47 = !lean_is_exclusive(x_38);
-if (x_47 == 0)
+x_50 = !lean_is_exclusive(x_37);
+if (x_50 == 0)
 {
-return x_38;
+return x_37;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_38, 0);
-x_49 = lean_ctor_get(x_38, 1);
-lean_inc(x_49);
-lean_inc(x_48);
-lean_dec(x_38);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_37, 0);
+x_52 = lean_ctor_get(x_37, 1);
+lean_inc(x_52);
+lean_inc(x_51);
+lean_dec(x_37);
+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_dec(x_30);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+lean_dec(x_29);
 lean_dec(x_13);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-if (lean_obj_tag(x_4) == 0)
-{
+x_54 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_4, x_26, x_5, x_6, x_7, x_8, x_9, x_10, x_30);
+x_55 = lean_ctor_get(x_54, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_54, 1);
+lean_inc(x_56);
+lean_dec(x_54);
+x_57 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_throwEx___rarg(x_55, x_5, x_6, x_7, x_8, x_9, x_10, x_56);
 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_ctor_set_tag(x_28, 1);
-lean_ctor_set(x_28, 0, x_26);
+return x_57;
+}
+}
+else
+{
+uint8_t x_58; 
+lean_dec(x_26);
+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_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_58 = !lean_is_exclusive(x_28);
+if (x_58 == 0)
+{
 return x_28;
 }
 else
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-lean_free_object(x_28);
-lean_dec(x_26);
-x_51 = lean_ctor_get(x_4, 0);
-lean_inc(x_51);
-lean_dec(x_4);
-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 = l_Lean_Elab_Term_SavedState_restore(x_52, x_5, x_6, x_7, x_8, x_9, x_10, x_31);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-x_55 = !lean_is_exclusive(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-x_56 = lean_ctor_get(x_54, 0);
-lean_dec(x_56);
-lean_ctor_set_tag(x_54, 1);
-lean_ctor_set(x_54, 0, x_53);
-return x_54;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; 
-x_57 = lean_ctor_get(x_54, 1);
-lean_inc(x_57);
-lean_dec(x_54);
-x_58 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_58, 0, x_53);
-lean_ctor_set(x_58, 1, x_57);
-return x_58;
-}
-}
-}
-}
-else
-{
-lean_object* x_59; lean_object* x_60; uint8_t x_61; 
+lean_object* x_59; lean_object* x_60; lean_object* x_61; 
 x_59 = lean_ctor_get(x_28, 0);
 x_60 = lean_ctor_get(x_28, 1);
 lean_inc(x_60);
 lean_inc(x_59);
 lean_dec(x_28);
-x_61 = l_Array_isEmpty___rarg(x_59);
-if (x_61 == 0)
-{
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_62 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateFirst(x_4, x_26, x_5, x_6, x_7, x_8, x_9, x_10, x_60);
-x_63 = lean_ctor_get(x_62, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_62, 1);
-lean_inc(x_64);
-lean_dec(x_62);
-x_65 = l_Lean_Elab_Term_SavedState_restore(x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_64);
-x_66 = lean_ctor_get(x_65, 1);
-lean_inc(x_66);
-lean_dec(x_65);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_5);
-x_67 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_updateMatchType(x_59, x_2, x_5, x_6, x_7, x_8, x_9, x_10, x_66);
-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; 
-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_70 = lean_array_get_size(x_59);
-x_71 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_addWildcardPatterns(x_70, x_3, x_5, x_6, x_7, x_8, x_9, x_10, 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_append___rarg(x_59, x_1);
-lean_dec(x_1);
-x_1 = x_74;
-x_2 = x_68;
-x_3 = x_72;
-x_4 = x_63;
-x_11 = x_73;
-goto _start;
+x_61 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_61, 0, x_59);
+lean_ctor_set(x_61, 1, x_60);
+return x_61;
+}
+}
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+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_3);
+if (lean_obj_tag(x_4) == 0)
+{
+uint8_t x_62; 
+x_62 = !lean_is_exclusive(x_22);
+if (x_62 == 0)
+{
+lean_object* x_63; lean_object* x_64; uint8_t x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_63 = lean_ctor_get(x_22, 0);
 lean_dec(x_63);
-lean_dec(x_59);
-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_3);
-lean_dec(x_1);
-x_76 = lean_ctor_get(x_67, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_67, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_67)) {
- lean_ctor_release(x_67, 0);
- lean_ctor_release(x_67, 1);
- x_78 = x_67;
-} else {
- lean_dec_ref(x_67);
- x_78 = lean_box(0);
+x_64 = lean_ctor_get(x_23, 0);
+lean_inc(x_64);
+lean_dec(x_23);
+x_65 = 0;
+x_66 = lean_box(x_65);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_64);
+lean_ctor_set(x_67, 1, x_66);
+x_68 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_68, 0, x_2);
+lean_ctor_set(x_68, 1, x_67);
+x_69 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_69, 0, x_1);
+lean_ctor_set(x_69, 1, x_68);
+lean_ctor_set(x_22, 0, x_69);
+return x_22;
 }
-if (lean_is_scalar(x_78)) {
- x_79 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_79 = x_78;
-}
-lean_ctor_set(x_79, 0, x_76);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
+else
+{
+lean_object* x_70; lean_object* x_71; uint8_t x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_70 = lean_ctor_get(x_22, 1);
+lean_inc(x_70);
+lean_dec(x_22);
+x_71 = lean_ctor_get(x_23, 0);
+lean_inc(x_71);
+lean_dec(x_23);
+x_72 = 0;
+x_73 = lean_box(x_72);
+x_74 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_74, 0, x_71);
+lean_ctor_set(x_74, 1, x_73);
+x_75 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_75, 0, x_2);
+lean_ctor_set(x_75, 1, x_74);
+x_76 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_76, 0, x_1);
+lean_ctor_set(x_76, 1, x_75);
+x_77 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 1, x_70);
+return x_77;
 }
 }
 else
 {
-lean_dec(x_59);
-lean_dec(x_13);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-if (lean_obj_tag(x_4) == 0)
+uint8_t x_78; 
+x_78 = !lean_is_exclusive(x_22);
+if (x_78 == 0)
 {
-lean_object* x_80; 
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_26);
-lean_ctor_set(x_80, 1, x_60);
-return x_80;
+lean_object* x_79; lean_object* x_80; uint8_t x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_79 = lean_ctor_get(x_22, 0);
+lean_dec(x_79);
+x_80 = lean_ctor_get(x_23, 0);
+lean_inc(x_80);
+lean_dec(x_23);
+x_81 = 1;
+x_82 = lean_box(x_81);
+x_83 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_83, 0, x_80);
+lean_ctor_set(x_83, 1, x_82);
+x_84 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_84, 0, x_2);
+lean_ctor_set(x_84, 1, x_83);
+x_85 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_85, 0, x_1);
+lean_ctor_set(x_85, 1, x_84);
+lean_ctor_set(x_22, 0, x_85);
+return x_22;
 }
 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_dec(x_26);
-x_81 = lean_ctor_get(x_4, 0);
-lean_inc(x_81);
-lean_dec(x_4);
-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_84 = l_Lean_Elab_Term_SavedState_restore(x_82, x_5, x_6, x_7, x_8, x_9, x_10, x_60);
-lean_dec(x_10);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-x_85 = lean_ctor_get(x_84, 1);
-lean_inc(x_85);
-if (lean_is_exclusive(x_84)) {
- lean_ctor_release(x_84, 0);
- lean_ctor_release(x_84, 1);
- x_86 = x_84;
-} else {
- lean_dec_ref(x_84);
- x_86 = lean_box(0);
-}
-if (lean_is_scalar(x_86)) {
- x_87 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_87 = x_86;
- lean_ctor_set_tag(x_87, 1);
-}
-lean_ctor_set(x_87, 0, x_83);
-lean_ctor_set(x_87, 1, x_85);
-return x_87;
-}
-}
-}
-}
-else
-{
-uint8_t x_88; 
-lean_dec(x_26);
-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_88 = !lean_is_exclusive(x_28);
-if (x_88 == 0)
-{
-return x_28;
-}
-else
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_89 = lean_ctor_get(x_28, 0);
-x_90 = lean_ctor_get(x_28, 1);
-lean_inc(x_90);
-lean_inc(x_89);
-lean_dec(x_28);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_89);
+lean_object* x_86; lean_object* x_87; uint8_t x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_86 = lean_ctor_get(x_22, 1);
+lean_inc(x_86);
+lean_dec(x_22);
+x_87 = lean_ctor_get(x_23, 0);
+lean_inc(x_87);
+lean_dec(x_23);
+x_88 = 1;
+x_89 = lean_box(x_88);
+x_90 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_90, 0, x_87);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_91, 0, x_2);
 lean_ctor_set(x_91, 1, x_90);
-return x_91;
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_1);
+lean_ctor_set(x_92, 1, x_91);
+x_93 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_93, 0, x_92);
+lean_ctor_set(x_93, 1, x_86);
+return x_93;
+}
 }
 }
 }
 else
 {
+uint8_t x_94; 
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -25393,144 +26396,25 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
-if (lean_obj_tag(x_4) == 0)
-{
-uint8_t x_92; 
-x_92 = !lean_is_exclusive(x_22);
-if (x_92 == 0)
-{
-lean_object* x_93; lean_object* x_94; uint8_t x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-x_93 = lean_ctor_get(x_22, 0);
-lean_dec(x_93);
-x_94 = lean_ctor_get(x_23, 0);
-lean_inc(x_94);
-lean_dec(x_23);
-x_95 = 0;
-x_96 = lean_box(x_95);
-x_97 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_97, 0, x_94);
-lean_ctor_set(x_97, 1, x_96);
-x_98 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_98, 0, x_2);
-lean_ctor_set(x_98, 1, x_97);
-x_99 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_99, 0, x_1);
-lean_ctor_set(x_99, 1, x_98);
-lean_ctor_set(x_22, 0, x_99);
-return x_22;
-}
-else
-{
-lean_object* x_100; lean_object* x_101; uint8_t x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_100 = lean_ctor_get(x_22, 1);
-lean_inc(x_100);
-lean_dec(x_22);
-x_101 = lean_ctor_get(x_23, 0);
-lean_inc(x_101);
-lean_dec(x_23);
-x_102 = 0;
-x_103 = lean_box(x_102);
-x_104 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_104, 0, x_101);
-lean_ctor_set(x_104, 1, x_103);
-x_105 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_105, 0, x_2);
-lean_ctor_set(x_105, 1, x_104);
-x_106 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_106, 0, x_1);
-lean_ctor_set(x_106, 1, x_105);
-x_107 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_107, 0, x_106);
-lean_ctor_set(x_107, 1, x_100);
-return x_107;
-}
-}
-else
-{
-uint8_t x_108; 
-lean_dec(x_4);
-x_108 = !lean_is_exclusive(x_22);
-if (x_108 == 0)
-{
-lean_object* x_109; lean_object* x_110; uint8_t x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-x_109 = lean_ctor_get(x_22, 0);
-lean_dec(x_109);
-x_110 = lean_ctor_get(x_23, 0);
-lean_inc(x_110);
-lean_dec(x_23);
-x_111 = 1;
-x_112 = lean_box(x_111);
-x_113 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_113, 0, x_110);
-lean_ctor_set(x_113, 1, x_112);
-x_114 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_114, 0, x_2);
-lean_ctor_set(x_114, 1, x_113);
-x_115 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_115, 0, x_1);
-lean_ctor_set(x_115, 1, x_114);
-lean_ctor_set(x_22, 0, x_115);
-return x_22;
-}
-else
-{
-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; 
-x_116 = lean_ctor_get(x_22, 1);
-lean_inc(x_116);
-lean_dec(x_22);
-x_117 = lean_ctor_get(x_23, 0);
-lean_inc(x_117);
-lean_dec(x_23);
-x_118 = 1;
-x_119 = lean_box(x_118);
-x_120 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_120, 0, x_117);
-lean_ctor_set(x_120, 1, x_119);
-x_121 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_121, 0, x_2);
-lean_ctor_set(x_121, 1, x_120);
-x_122 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_122, 0, x_1);
-lean_ctor_set(x_122, 1, x_121);
-x_123 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_123, 0, x_122);
-lean_ctor_set(x_123, 1, x_116);
-return x_123;
-}
-}
-}
-}
-else
-{
-uint8_t x_124; 
-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_124 = !lean_is_exclusive(x_22);
-if (x_124 == 0)
+x_94 = !lean_is_exclusive(x_22);
+if (x_94 == 0)
 {
 return x_22;
 }
 else
 {
-lean_object* x_125; lean_object* x_126; lean_object* x_127; 
-x_125 = lean_ctor_get(x_22, 0);
-x_126 = lean_ctor_get(x_22, 1);
-lean_inc(x_126);
-lean_inc(x_125);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_22, 0);
+x_96 = lean_ctor_get(x_22, 1);
+lean_inc(x_96);
+lean_inc(x_95);
 lean_dec(x_22);
-x_127 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_127, 0, x_125);
-lean_ctor_set(x_127, 1, x_126);
-return x_127;
+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;
 }
 }
 }
@@ -25547,6 +26431,24 @@ x_14 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_e
 return x_14;
 }
 }
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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) {
+_start:
+{
+lean_object* x_13; 
+x_13 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___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);
+lean_dec(x_3);
+return x_13;
+}
+}
+lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+_start:
+{
+lean_object* x_12; 
+x_12 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+lean_dec(x_4);
+return x_12;
+}
+}
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews(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:
 {
@@ -25574,7 +26476,7 @@ lean_dec(x_5);
 return x_12;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -25584,7 +26486,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -25592,17 +26494,17 @@ x_1 = lean_mk_string("ignoreUnusedAlts");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2;
+x_1 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -25610,13 +26512,13 @@ x_1 = lean_mk_string("if true, do not generate error if an alternative is not us
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = 0;
 x_2 = l_Lean_instInhabitedParserDescr___closed__1;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4;
 x_4 = lean_box(x_1);
 x_5 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_5, 0, x_4);
@@ -25625,12 +26527,12 @@ lean_ctor_set(x_5, 2, x_3);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5;
 x_4 = l_Lean_Option_register___at_Lean_Elab_initFn____x40_Lean_Elab_AutoBound___hyg_4____spec__1(x_2, x_3, x_1);
 return x_4;
 }
@@ -27656,7 +28558,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_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 x_2 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__3;
-x_3 = lean_unsigned_to_nat(822u);
+x_3 = lean_unsigned_to_nat(867u);
 x_4 = lean_unsigned_to_nat(2u);
 x_5 = l___private_Lean_Elab_Match_0__Lean_Elab_Term_isMatchUnit_x3f___closed__2;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -29778,7 +30680,7 @@ x_29 = lean_ctor_get(x_27, 1);
 lean_inc(x_29);
 lean_dec(x_27);
 x_30 = lean_array_get_size(x_23);
-x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
+x_31 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
 lean_inc(x_5);
 x_32 = l_Lean_Elab_Term_mkAuxName(x_31, x_5, x_6, x_7, x_8, x_9, x_10, x_29);
 if (lean_obj_tag(x_32) == 0)
@@ -30184,7 +31086,7 @@ x_107 = lean_ctor_get(x_19, 1);
 lean_inc(x_107);
 lean_dec(x_19);
 x_108 = lean_array_get_size(x_104);
-x_109 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
+x_109 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
 lean_inc(x_5);
 x_110 = l_Lean_Elab_Term_mkAuxName(x_109, x_5, x_6, x_7, x_8, x_9, x_10, x_103);
 if (lean_obj_tag(x_110) == 0)
@@ -33624,7 +34526,7 @@ x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9634_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9997_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -33748,6 +34650,7 @@ return x_5;
 }
 }
 lean_object* initialize_Init(lean_object*);
+lean_object* initialize_Lean_Util_CollectFVars(lean_object*);
 lean_object* initialize_Lean_Meta_Match_MatchPatternAttr(lean_object*);
 lean_object* initialize_Lean_Meta_Match_Match(lean_object*);
 lean_object* initialize_Lean_Meta_SortLocalDecls(lean_object*);
@@ -33762,6 +34665,9 @@ _G_initialized = true;
 res = initialize_Init(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+res = initialize_Lean_Util_CollectFVars(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 res = initialize_Lean_Meta_Match_MatchPatternAttr(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
@@ -34017,19 +34923,21 @@ l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___closed__2 = _in
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___closed__2);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___closed__3 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___closed__3();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltView___closed__3);
+l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1();
+lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_collectDeps___closed__1);
 l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1 = _init_l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1();
 lean_mark_persistent(l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAltViews_loop___boxed__const__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__4);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__5);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__2);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__3);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__4);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__5);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_Term_match_ignoreUnusedAlts = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_Term_match_ignoreUnusedAlts);
@@ -34103,7 +35011,7 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabMatch___closed__1);
 res = l___regBuiltin_Lean_Elab_Term_elabMatch(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9634_(lean_io_mk_world());
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_9997_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_elabNoMatch___closed__1 = _init_l_Lean_Elab_Term_elabNoMatch___closed__1();
diff --git a/stage0/stdlib/Lean/Elab/MutualDef.c b/stage0/stdlib/Lean/Elab/MutualDef.c
index e2b6d9f601..8564be0261 100644
--- a/stage0/stdlib/Lean/Elab/MutualDef.c
+++ b/stage0/stdlib/Lean/Elab/MutualDef.c
@@ -220,6 +220,7 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_E
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_withFunLocalDecls(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_getFunName___closed__2;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_15378____closed__7;
 lean_object* l_Lean_Elab_Command_elabMutualDef___lambda__1(lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__14___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_object*, lean_object*);
@@ -291,7 +292,6 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsA
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_MutualClosure_pushLetRecs___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_lambdaTelescope___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkLetRecClosureFor___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_collectMVars(lean_object*, lean_object*);
@@ -416,6 +416,7 @@ lean_object* l_Lean_Elab_Term_MutualClosure_FixPoint_State_usedFVarsMap___defaul
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___spec__2___closed__4;
 lean_object* l_Lean_mkFVar(lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkDeclName___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_fixpoint___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -584,7 +585,6 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_E
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabFunValues___spec__2___lambda__3(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_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(lean_object*);
 lean_object* l_Array_erase___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_5198____closed__1;
@@ -19429,7 +19429,7 @@ x_80 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_80, 0, x_79);
 x_81 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_81, 0, x_80);
-x_82 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_78, x_81, x_2, x_3, x_51);
+x_82 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_78, x_81, x_2, x_3, x_51);
 lean_dec(x_3);
 lean_dec(x_78);
 x_83 = !lean_is_exclusive(x_82);
@@ -19456,7 +19456,7 @@ else
 lean_object* x_87; uint8_t x_88; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_87 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_51);
+x_87 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_51);
 x_88 = !lean_is_exclusive(x_87);
 if (x_88 == 0)
 {
diff --git a/stage0/stdlib/Lean/Elab/Print.c b/stage0/stdlib/Lean/Elab/Print.c
index 59d8b4669e..76a327aa38 100644
--- a/stage0/stdlib/Lean/Elab/Print.c
+++ b/stage0/stdlib/Lean/Elab/Print.c
@@ -28,7 +28,6 @@ lean_object* l_Lean_Elab_pushInfoLeaf___at___private_Lean_Elab_Print_0__Lean_Ela
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_ppGoal_ppVars___closed__1;
 lean_object* l_Lean_resolveGlobalName___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -98,7 +97,6 @@ lean_object* l___private_Lean_Elab_Print_0__Lean_Elab_Command_printInduct(lean_o
 extern lean_object* l_Lean_strLitKind___closed__2;
 lean_object* l___private_Lean_Elab_Print_0__Lean_Elab_Command_mkHeader_match__3(lean_object*);
 lean_object* l___private_Lean_Elab_Print_0__Lean_Elab_Command_printDefLike___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Print_0__Lean_Elab_Command_mkHeader_x27(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_resolveGlobalName___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
@@ -2561,16 +2559,6 @@ return x_23;
 }
 }
 }
-lean_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1___lambda__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; 
-x_6 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_6, 0, x_1);
-lean_ctor_set(x_6, 1, x_5);
-return x_6;
-}
-}
 lean_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -2872,17 +2860,6 @@ lean_dec(x_5);
 return x_7;
 }
 }
-lean_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___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) {
-_start:
-{
-lean_object* x_6; 
-x_6 = l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1___lambda__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_object* l_Lean_Elab_resolveGlobalConstWithInfos___at___private_Lean_Elab_Print_0__Lean_Elab_Command_printId___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
diff --git a/stage0/stdlib/Lean/Elab/Syntax.c b/stage0/stdlib/Lean/Elab/Syntax.c
index f358afee1f..62fae503e1 100644
--- a/stage0/stdlib/Lean/Elab/Syntax.c
+++ b/stage0/stdlib/Lean/Elab/Syntax.c
@@ -234,7 +234,6 @@ extern lean_object* l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__7;
 lean_object* l_Lean_Elab_Command_expandMacro___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandElab___lambda__2___closed__50;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Term_withNotFirst(lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Data_Array_Basic_0__Array_allDiffAux___at_Lean_Elab_Command_mkSimpleDelab___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMixfix___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Term_toParserDescr_resolveParserName___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -293,6 +292,7 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1136____close
 lean_object* l_Lean_Elab_Command_mkSimpleDelab___closed__9;
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_1346____closed__2;
 lean_object* l_Lean_Elab_Term_checkLeftRec___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(lean_object*);
 extern lean_object* l_Lean_LocalContext_empty;
 extern lean_object* l_Lean_Parser_Command_macro__rules___elambda__1___closed__1;
 lean_object* l_Lean_Elab_mkUnusedBaseName___at_Lean_Elab_Command_mkNameFromParserSyntax___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -392,7 +392,6 @@ lean_object* l_Lean_Elab_Command_elabSyntax___lambda__3___closed__4;
 extern lean_object* l_stx___x3f___closed__3;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabMacroRulesAux___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescr_processParserCategory___lambda__1___closed__2;
-lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__21;
 lean_object* l_Lean_resolveGlobalConst___at_Lean_Elab_Term_toParserDescr_resolveParserName___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMixfix___lambda__1___closed__2;
@@ -568,6 +567,7 @@ lean_object* l_Lean_Elab_Term_toParserDescr_processNullaryOrCat___closed__2;
 lean_object* l_Lean_Elab_Command_expandElab___lambda__2___closed__28;
 extern lean_object* l_Lean_Parser_Term_quot___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_toParserDescr_processSepBy1___lambda__1___closed__3;
+lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_resolveGlobalName___at_Lean_Elab_Command_mkSimpleDelab___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_syntaxAbbrev___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__11;
@@ -785,9 +785,9 @@ lean_object* l_Lean_Elab_Command_expandMixfix___lambda__7___boxed(lean_object*,
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1136____closed__21;
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_1640____closed__1;
+lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabMacroRulesAux___closed__21;
 lean_object* l_Lean_Elab_pushInfoLeaf___at_Lean_Elab_Term_toParserDescr_resolveParserName___spec__8(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_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntaxAbbrev(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Macro_expandMacro_x3fImp(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_trim(lean_object*);
@@ -801,7 +801,6 @@ extern lean_object* l_Lean_instQuoteBool___closed__4;
 lean_object* l_Lean_Elab_Command_expandNotation___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescr_processParserCategory___closed__1;
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__13;
-lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescr_processParserCategory___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___lambda__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* l_Lean_Elab_Term_expandOptPrecedence(lean_object*, lean_object*, lean_object*);
@@ -813,6 +812,7 @@ lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_antiquote___boxed
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_declareSyntaxCatQuotParser___closed__28;
 lean_object* l_Lean_Elab_Command_mkSimpleDelab___closed__10;
+lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescr_processNullaryOrCat___closed__18;
 lean_object* l___private_Lean_Elab_Syntax_0__Lean_Elab_Command_expandNotationAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandElab___lambda__2___closed__32;
@@ -12943,7 +12943,7 @@ lean_object* x_32; lean_object* x_33; lean_object* x_34;
 lean_inc(x_2);
 x_32 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_32, 0, x_2);
-x_33 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__11(x_30, x_32, x_3, x_4, x_26);
+x_33 = l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__2(x_30, x_32, x_3, x_4, x_26);
 x_34 = lean_ctor_get(x_33, 1);
 lean_inc(x_34);
 lean_dec(x_33);
@@ -15886,7 +15886,7 @@ x_19 = l_Lean_KernelException_toMessageData___closed__3;
 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_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_6, x_20, x_8, x_9, x_10);
+x_21 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_6, x_20, x_8, x_9, x_10);
 lean_dec(x_6);
 return x_21;
 }
@@ -15923,7 +15923,7 @@ x_32 = l_Lean_KernelException_toMessageData___closed__3;
 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_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_6, x_33, x_8, x_9, x_10);
+x_34 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_6, x_33, x_8, x_9, x_10);
 lean_dec(x_6);
 return x_34;
 }
@@ -16057,7 +16057,7 @@ lean_object* x_8;
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_8 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_5);
+x_8 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_5);
 return x_8;
 }
 else
@@ -32959,7 +32959,7 @@ x_491 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_491, 0, x_490);
 x_492 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_492, 0, x_491);
-x_493 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_489, x_492, x_12, x_13, x_462);
+x_493 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_489, x_492, x_12, x_13, x_462);
 lean_dec(x_489);
 x_494 = !lean_is_exclusive(x_493);
 if (x_494 == 0)
@@ -32984,7 +32984,7 @@ else
 {
 lean_object* x_498; uint8_t x_499; 
 lean_dec(x_12);
-x_498 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_462);
+x_498 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_462);
 x_499 = !lean_is_exclusive(x_498);
 if (x_499 == 0)
 {
@@ -34404,7 +34404,7 @@ x_151 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_151, 0, x_150);
 x_152 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_152, 0, x_151);
-x_153 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_149, x_152, x_3, x_4, x_122);
+x_153 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_149, x_152, x_3, x_4, x_122);
 lean_dec(x_149);
 x_154 = !lean_is_exclusive(x_153);
 if (x_154 == 0)
@@ -34429,7 +34429,7 @@ else
 {
 lean_object* x_158; uint8_t x_159; 
 lean_dec(x_3);
-x_158 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_122);
+x_158 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_122);
 x_159 = !lean_is_exclusive(x_158);
 if (x_159 == 0)
 {
@@ -35720,7 +35720,7 @@ x_896 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_896, 0, x_895);
 x_897 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_897, 0, x_896);
-x_898 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_894, x_897, x_15, x_16, x_867);
+x_898 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_894, x_897, x_15, x_16, x_867);
 lean_dec(x_894);
 x_899 = !lean_is_exclusive(x_898);
 if (x_899 == 0)
@@ -35745,7 +35745,7 @@ else
 {
 lean_object* x_903; uint8_t x_904; 
 lean_dec(x_15);
-x_903 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_867);
+x_903 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_867);
 x_904 = !lean_is_exclusive(x_903);
 if (x_904 == 0)
 {
@@ -36162,7 +36162,7 @@ x_38 = l_Lean_KernelException_toMessageData___closed__3;
 x_39 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_39, 0, x_37);
 lean_ctor_set(x_39, 1, x_38);
-x_40 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__9(x_39, x_15, x_16, x_27);
+x_40 = l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__16(x_39, x_15, x_16, x_27);
 x_41 = !lean_is_exclusive(x_40);
 if (x_41 == 0)
 {
@@ -37052,7 +37052,7 @@ x_503 = l_Lean_Elab_Command_expandElab___lambda__2___closed__40;
 x_504 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_504, 0, x_502);
 lean_ctor_set(x_504, 1, x_503);
-x_505 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_3, x_504, x_15, x_16, x_27);
+x_505 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_3, x_504, x_15, x_16, x_27);
 x_506 = !lean_is_exclusive(x_505);
 if (x_506 == 0)
 {
@@ -37974,7 +37974,7 @@ x_155 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_155, 0, x_154);
 x_156 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_156, 0, x_155);
-x_157 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__8(x_153, x_156, x_3, x_4, x_126);
+x_157 = l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__15(x_153, x_156, x_3, x_4, x_126);
 lean_dec(x_153);
 x_158 = !lean_is_exclusive(x_157);
 if (x_158 == 0)
@@ -37999,7 +37999,7 @@ else
 {
 lean_object* x_162; uint8_t x_163; 
 lean_dec(x_3);
-x_162 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__10___rarg(x_126);
+x_162 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_elabCommand___spec__17___rarg(x_126);
 x_163 = !lean_is_exclusive(x_162);
 if (x_163 == 0)
 {
diff --git a/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c b/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c
index f4d0f4b080..99a14dd7ac 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c
@@ -155,7 +155,6 @@ lean_object* l_Lean_Elab_Tactic_evalRefine___closed__1;
 extern lean_object* l_Lean_Parser_Tactic_refine___closed__1;
 lean_object* l_Lean_Elab_Tactic_elabTerm___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Tactic_refine___closed__2;
-extern lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
 lean_object* l_Lean_Elab_Tactic_evalExistsIntro___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalExact___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalNativeDecide___rarg___lambda__1___closed__4;
@@ -168,6 +167,7 @@ uint8_t l_Lean_Expr_hasMVar(lean_object*);
 lean_object* l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_evalRename___spec__7___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalNativeDecide___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 lean_object* l_Lean_Elab_Tactic_tagUntaggedGoals(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_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalRename_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -1261,7 +1261,7 @@ lean_object* x_26; lean_object* x_27; lean_object* x_28;
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_27 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_28 = l_Lean_Elab_Tactic_elabTermWithHoles___lambda__1(x_3, x_16, x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_26);
 lean_dec(x_12);
 lean_dec(x_11);
@@ -1326,7 +1326,7 @@ lean_object* x_37; lean_object* x_38; lean_object* x_39;
 x_37 = lean_ctor_get(x_36, 1);
 lean_inc(x_37);
 lean_dec(x_36);
-x_38 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_38 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_39 = l_Lean_Elab_Tactic_elabTermWithHoles___lambda__1(x_3, x_16, x_38, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12, x_37);
 lean_dec(x_12);
 lean_dec(x_11);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Match.c b/stage0/stdlib/Lean/Elab/Tactic/Match.c
index ac193f4c47..50ed4f85e1 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Match.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Match.c
@@ -122,6 +122,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_evalEraseAuxDiscrs_
 lean_object* l___private_Lean_Elab_Tactic_Match_0__Lean_Elab_Tactic_mkAuxiliaryMatchTermAux___boxed__const__1;
 extern lean_object* l_Lean_Parser_Tactic_case___closed__2;
 lean_object* l_Lean_LocalContext_foldlM___at_Lean_Elab_Tactic_evalEraseAuxDiscrs___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlFromMAux___at_Lean_Elab_Tactic_evalEraseAuxDiscrs___spec__3(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -135,7 +136,6 @@ extern lean_object* l_prec_x28___x29___closed__7;
 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*);
 extern lean_object* l_prec_x28___x29___closed__3;
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_14458____closed__2;
-extern lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Std_PersistentArray_foldlM___at_Lean_Elab_Tactic_evalEraseAuxDiscrs___spec__2(lean_object*, lean_object*, lean_object*);
@@ -1378,7 +1378,7 @@ lean_dec(x_183);
 x_222 = lean_ctor_get(x_6, 0);
 lean_inc(x_222);
 lean_dec(x_6);
-x_223 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6826____closed__1;
+x_223 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_7189____closed__1;
 x_224 = l_Lean_Name_appendIndexAfter(x_223, x_222);
 x_225 = l_Lean_Name_append(x_1, x_224);
 x_226 = l_Lean_mkIdentFrom(x_30, x_225);
diff --git a/stage0/stdlib/Lean/Elab/Tactic/Simp.c b/stage0/stdlib/Lean/Elab/Tactic/Simp.c
index 696fb0a12f..715dd3c88d 100644
--- a/stage0/stdlib/Lean/Elab/Tactic/Simp.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Simp.c
@@ -13,16 +13,16 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext___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* l_Lean_Elab_Tactic_evalSimp___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_erase___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__12(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_Tactic_evalSimpConfig(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpTarget(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_add(size_t, size_t);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withNewMCtxDepthImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__5;
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 lean_object* l_List_toString___at_Lean_resolveGlobalConstNoOverload___spec__2(lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__2;
@@ -61,17 +61,21 @@ lean_object* l_Lean_Elab_Tactic_withMainContext___rarg(lean_object*, lean_object
 lean_object* l_List_map___at_Lean_resolveGlobalConst___spec__2(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_pushInfoLeaf___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__10(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_Tactic_elabSimpConfig___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig___closed__5;
 lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__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* l_Lean_throwError___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_USize_decLt(size_t, size_t);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__14___lambda__1(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtx___rarg(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimp_go___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_SimpLemmas_erase___rarg___closed__2;
 extern lean_object* l_Lean_LocalContext_mkEmpty___closed__1;
 extern lean_object* l_Lean_throwUnknownConstant___rarg___closed__2;
 extern lean_object* l_Lean_instInhabitedException___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalSimp_go___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* l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimp_go___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalSimp_go_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_LocalContext_empty;
@@ -90,6 +94,7 @@ lean_object* l_Lean_getConstInfo___at___private_Lean_Elab_Tactic_Simp_0__Lean_El
 extern lean_object* l_term___u2218_____closed__5;
 lean_object* l_Std_PersistentHashMap_erase___at_Lean_Meta_SimpLemmas_eraseCore___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalSimp_go___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*);
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig___closed__6;
 lean_object* l_Lean_Elab_Tactic_expandOptLocation(lean_object*);
 lean_object* l_Lean_Elab_resolveGlobalConstNoOverloadWithInfo___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimpAll___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -97,16 +102,18 @@ lean_object* l_Lean_Meta_SimpLemmas_erase___at___private_Lean_Elab_Tactic_Simp_0
 lean_object* l_Lean_throwUnknownConstant___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__7(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_Tactic_evalSimp___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_Meta_getNondepPropHyps(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_addSimpLemmaEntry_updateLemmaNames___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__14___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* l_Lean_Elab_Tactic_evalSimpConfigCtx___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__3;
 lean_object* l_Lean_Elab_Tactic_evalSimp_go_match__3(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimp_go___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* l_Lean_Syntax_getId(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalSimp___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_forInUnsafe_loop___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__14___lambda__2(lean_object*, size_t, uint8_t, lean_object*, lean_object*, lean_object*, 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_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2;
 lean_object* l_Lean_resolveGlobalConst___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalSimp_go___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_object* l_List_filterAux___at_Lean_resolveGlobalConst___spec__1(lean_object*, lean_object*);
@@ -125,6 +132,7 @@ uint8_t l_Lean_Expr_isConst(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___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* l_Lean_ResolveName_resolveGlobalName(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtx(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_355____closed__3;
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermEnsuringType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -217,6 +225,7 @@ lean_object* l_Lean_Elab_Tactic_evalSimp_go_match__2___rarg(lean_object*, lean_o
 lean_object* l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_elabSimpConfig___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Tactic_elabSetOption___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1;
 uint8_t l_Lean_Meta_SimpLemmas_isLemma(lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isIdent(lean_object*);
 lean_object* l_Lean_resolveGlobalConstNoOverload___at___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -309,6 +318,67 @@ lean_dec(x_1);
 return x_8;
 }
 }
+static lean_object* _init_l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("ConfigCtx");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__3;
+x_2 = l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe(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_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2;
+x_10 = l_Lean_Elab_Term_evalExpr___rarg(x_9, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_10;
+}
+}
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtx___rarg(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_instInhabitedException___closed__1;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtx(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 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_evalSimpConfigCtx___rarg), 1, 0);
+return x_8;
+}
+}
+lean_object* l_Lean_Elab_Tactic_evalSimpConfigCtx___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_Elab_Tactic_evalSimpConfigCtx(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+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_8;
+}
+}
 lean_object* l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_elabSimpConfig___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:
 {
@@ -369,52 +439,146 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tac
 return x_2;
 }
 }
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig___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* l_Lean_Elab_Tactic_elabSimpConfig___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, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_9; 
+if (x_1 == 0)
+{
+lean_object* x_10; 
+lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-lean_inc(x_4);
-x_9 = l_Lean_Meta_instantiateMVars(x_1, x_4, x_5, x_6, x_7, x_8);
-if (lean_obj_tag(x_9) == 0)
+x_10 = l_Lean_Meta_instantiateMVars(x_2, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_10) == 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_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
-lean_dec(x_9);
-x_12 = l_Lean_Elab_Tactic_evalSimpConfigUnsafe(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
-return x_12;
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = l_Lean_Elab_Tactic_evalSimpConfigUnsafe(x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_12);
+return x_13;
 }
 else
 {
-uint8_t x_13; 
+uint8_t 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_3);
-lean_dec(x_2);
-x_13 = !lean_is_exclusive(x_9);
-if (x_13 == 0)
+x_14 = !lean_is_exclusive(x_10);
+if (x_14 == 0)
 {
-return x_9;
+return x_10;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_14 = lean_ctor_get(x_9, 0);
-x_15 = lean_ctor_get(x_9, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_10, 0);
+x_16 = lean_ctor_get(x_10, 1);
+lean_inc(x_16);
 lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_9);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
+lean_dec(x_10);
+x_17 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+return x_17;
+}
+}
+}
+else
+{
+lean_object* x_18; 
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+x_18 = l_Lean_Meta_instantiateMVars(x_2, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_18, 0);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe(x_19, x_3, x_4, x_5, x_6, x_7, x_8, x_20);
+if (lean_obj_tag(x_21) == 0)
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_21);
+if (x_22 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_21, 0);
+x_24 = lean_ctor_get(x_21, 1);
+lean_inc(x_24);
+lean_inc(x_23);
+lean_dec(x_21);
+x_25 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
+}
+}
+else
+{
+uint8_t x_26; 
+x_26 = !lean_is_exclusive(x_21);
+if (x_26 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_21, 0);
+x_28 = lean_ctor_get(x_21, 1);
+lean_inc(x_28);
+lean_inc(x_27);
+lean_dec(x_21);
+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_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+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;
+}
 }
 }
 }
@@ -442,14 +606,26 @@ return x_2;
 static lean_object* _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__3() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_elabSimpConfig___lambda__1), 8, 0);
-return x_1;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2;
+x_3 = l_Lean_mkConst(x_2, x_1);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__4() {
 _start:
 {
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Tactic_elabSimpConfig___closed__3;
+x_2 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__5() {
+_start:
+{
 lean_object* x_1; uint8_t x_2; uint8_t x_3; lean_object* x_4; 
 x_1 = l_Lean_Meta_Simp_defaultMaxSteps;
 x_2 = 0;
@@ -469,67 +645,165 @@ lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 9, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig(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_Lean_Elab_Tactic_elabSimpConfig___closed__6() {
 _start:
 {
-uint8_t x_9; 
-x_9 = l_Lean_Syntax_isNone(x_1);
-if (x_9 == 0)
+lean_object* x_1; uint8_t x_2; uint8_t x_3; lean_object* x_4; 
+x_1 = l_Lean_Meta_Simp_defaultMaxSteps;
+x_2 = 1;
+x_3 = 0;
+x_4 = lean_alloc_ctor(0, 1, 10);
+lean_ctor_set(x_4, 0, x_1);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 1, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 2, x_3);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 3, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 4, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 5, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 6, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 7, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 8, x_2);
+lean_ctor_set_uint8(x_4, sizeof(void*)*1 + 9, x_2);
+return x_4;
+}
+}
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
 {
-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; lean_object* x_18; lean_object* 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; 
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = l_Lean_Syntax_getArg(x_1, x_10);
-x_12 = lean_box(0);
-x_13 = l_Lean_Elab_Tactic_elabSimpConfig___closed__2;
-x_14 = 1;
-x_15 = lean_box(x_14);
-x_16 = lean_box(x_14);
-x_17 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
-lean_closure_set(x_17, 0, x_11);
-lean_closure_set(x_17, 1, x_13);
-lean_closure_set(x_17, 2, x_15);
-lean_closure_set(x_17, 3, x_16);
-lean_closure_set(x_17, 4, x_12);
-x_18 = l_Lean_Elab_Tactic_elabSimpConfig___closed__3;
-x_19 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg), 9, 2);
-lean_closure_set(x_19, 0, x_17);
-lean_closure_set(x_19, 1, x_18);
-x_20 = 0;
-x_21 = lean_box(x_20);
-x_22 = lean_alloc_closure((void*)(l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg___boxed), 9, 2);
-lean_closure_set(x_22, 0, x_19);
-lean_closure_set(x_22, 1, x_21);
-x_23 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_elabSimpConfig___spec__1___rarg), 8, 1);
-lean_closure_set(x_23, 0, x_22);
-x_24 = l_Lean_LocalContext_mkEmpty___closed__1;
-x_25 = l_Array_empty___closed__1;
-x_26 = l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___spec__1___rarg(x_24, x_25, x_23, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-return x_26;
+uint8_t x_10; 
+x_10 = l_Lean_Syntax_isNone(x_1);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_11 = lean_unsigned_to_nat(3u);
+x_12 = l_Lean_Syntax_getArg(x_1, x_11);
+x_13 = lean_box(0);
+if (x_2 == 0)
+{
+uint8_t x_44; 
+x_44 = 0;
+x_14 = x_44;
+goto block_43;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; 
+uint8_t x_45; 
+x_45 = 1;
+x_14 = x_45;
+goto block_43;
+}
+block_43:
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_box(x_14);
+x_16 = lean_alloc_closure((void*)(l_Lean_Elab_Tactic_elabSimpConfig___lambda__1___boxed), 9, 1);
+lean_closure_set(x_16, 0, x_15);
+if (x_14 == 0)
+{
+lean_object* x_17; uint8_t 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; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_17 = l_Lean_Elab_Tactic_elabSimpConfig___closed__2;
+x_18 = 1;
+x_19 = lean_box(x_18);
+x_20 = lean_box(x_18);
+x_21 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_21, 0, x_12);
+lean_closure_set(x_21, 1, x_17);
+lean_closure_set(x_21, 2, x_19);
+lean_closure_set(x_21, 3, x_20);
+lean_closure_set(x_21, 4, x_13);
+x_22 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg), 9, 2);
+lean_closure_set(x_22, 0, x_21);
+lean_closure_set(x_22, 1, x_16);
+x_23 = 0;
+x_24 = lean_box(x_23);
+x_25 = lean_alloc_closure((void*)(l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg___boxed), 9, 2);
+lean_closure_set(x_25, 0, x_22);
+lean_closure_set(x_25, 1, x_24);
+x_26 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_elabSimpConfig___spec__1___rarg), 8, 1);
+lean_closure_set(x_26, 0, x_25);
+x_27 = l_Lean_LocalContext_mkEmpty___closed__1;
+x_28 = l_Array_empty___closed__1;
+x_29 = l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___spec__1___rarg(x_27, x_28, x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_29;
+}
+else
+{
+lean_object* x_30; uint8_t 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; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_30 = l_Lean_Elab_Tactic_elabSimpConfig___closed__4;
+x_31 = 1;
+x_32 = lean_box(x_31);
+x_33 = lean_box(x_31);
+x_34 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabTermEnsuringType___boxed), 12, 5);
+lean_closure_set(x_34, 0, x_12);
+lean_closure_set(x_34, 1, x_30);
+lean_closure_set(x_34, 2, x_32);
+lean_closure_set(x_34, 3, x_33);
+lean_closure_set(x_34, 4, x_13);
+x_35 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg), 9, 2);
+lean_closure_set(x_35, 0, x_34);
+lean_closure_set(x_35, 1, x_16);
+x_36 = 0;
+x_37 = lean_box(x_36);
+x_38 = lean_alloc_closure((void*)(l___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_withSynthesizeImp___rarg___boxed), 9, 2);
+lean_closure_set(x_38, 0, x_35);
+lean_closure_set(x_38, 1, x_37);
+x_39 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at_Lean_Elab_Tactic_elabSimpConfig___spec__1___rarg), 8, 1);
+lean_closure_set(x_39, 0, x_38);
+x_40 = l_Lean_LocalContext_mkEmpty___closed__1;
+x_41 = l_Array_empty___closed__1;
+x_42 = l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___spec__1___rarg(x_40, x_41, x_39, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_42;
+}
+}
+}
+else
+{
+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 = l_Lean_Elab_Tactic_elabSimpConfig___closed__4;
-x_28 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_28, 0, x_27);
-lean_ctor_set(x_28, 1, x_8);
-return x_28;
+if (x_2 == 0)
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = l_Lean_Elab_Tactic_elabSimpConfig___closed__5;
+x_47 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_47, 0, x_46);
+lean_ctor_set(x_47, 1, x_9);
+return x_47;
+}
+else
+{
+lean_object* x_48; lean_object* x_49; 
+x_48 = l_Lean_Elab_Tactic_elabSimpConfig___closed__6;
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_9);
+return x_49;
 }
 }
 }
-lean_object* l_Lean_Elab_Tactic_elabSimpConfig___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* l_Lean_Elab_Tactic_elabSimpConfig___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_9; 
-x_9 = l_Lean_Elab_Tactic_elabSimpConfig(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+uint8_t x_10; lean_object* x_11; 
+x_10 = lean_unbox(x_1);
 lean_dec(x_1);
-return x_9;
+x_11 = l_Lean_Elab_Tactic_elabSimpConfig___lambda__1(x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_11;
+}
+}
+lean_object* l_Lean_Elab_Tactic_elabSimpConfig___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_2);
+lean_dec(x_2);
+x_11 = l_Lean_Elab_Tactic_elabSimpConfig(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_1);
+return x_11;
 }
 }
 lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas_resolveSimpIdLemma_x3f_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -2869,60 +3143,61 @@ lean_dec(x_1);
 return x_14;
 }
 }
-lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(lean_object* x_1, uint8_t x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-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_12 = lean_unsigned_to_nat(2u);
-x_13 = l_Lean_Syntax_getArg(x_1, x_12);
-x_14 = l_Lean_Syntax_isNone(x_13);
-lean_dec(x_13);
-x_15 = lean_unsigned_to_nat(1u);
-x_16 = l_Lean_Syntax_getArg(x_1, x_15);
+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_13 = lean_unsigned_to_nat(2u);
+x_14 = l_Lean_Syntax_getArg(x_1, x_13);
+x_15 = l_Lean_Syntax_isNone(x_14);
+lean_dec(x_14);
+x_16 = lean_unsigned_to_nat(1u);
+x_17 = l_Lean_Syntax_getArg(x_1, x_16);
+lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-lean_inc(x_5);
-x_17 = l_Lean_Elab_Tactic_elabSimpConfig(x_16, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
-lean_dec(x_16);
-if (x_14 == 0)
+x_18 = l_Lean_Elab_Tactic_elabSimpConfig(x_17, x_3, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+lean_dec(x_17);
+if (x_15 == 0)
 {
-if (lean_obj_tag(x_17) == 0)
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = l_Lean_Meta_getSimpLemmas___rarg(x_10, x_19);
-x_21 = lean_ctor_get(x_20, 1);
-lean_inc(x_21);
-lean_dec(x_20);
-x_22 = l_Lean_Meta_getCongrLemmas___rarg(x_10, x_21);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_22, 1);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = l_Lean_Meta_getSimpLemmas___rarg(x_11, x_20);
+x_22 = lean_ctor_get(x_21, 1);
+lean_inc(x_22);
+lean_dec(x_21);
+x_23 = l_Lean_Meta_getCongrLemmas___rarg(x_11, x_22);
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-x_25 = lean_unsigned_to_nat(3u);
-x_26 = l_Lean_Syntax_getArg(x_1, x_25);
-x_27 = lean_box(0);
-x_28 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_355____closed__3;
-x_29 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_29, 0, x_18);
-lean_ctor_set(x_29, 1, x_28);
-lean_ctor_set(x_29, 2, x_23);
-lean_ctor_set(x_29, 3, x_27);
-x_30 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas(x_26, x_29, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_24);
-lean_dec(x_26);
-return x_30;
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_unsigned_to_nat(3u);
+x_27 = l_Lean_Syntax_getArg(x_1, x_26);
+x_28 = lean_box(0);
+x_29 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_355____closed__3;
+x_30 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_30, 0, x_19);
+lean_ctor_set(x_30, 1, x_29);
+lean_ctor_set(x_30, 2, x_24);
+lean_ctor_set(x_30, 3, x_28);
+x_31 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas(x_27, x_30, x_2, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_25);
+lean_dec(x_27);
+return x_31;
 }
 else
 {
-uint8_t x_31; 
+uint8_t x_32; 
+lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -2930,64 +3205,64 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-x_31 = !lean_is_exclusive(x_17);
-if (x_31 == 0)
+x_32 = !lean_is_exclusive(x_18);
+if (x_32 == 0)
 {
-return x_17;
+return x_18;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_17, 0);
-x_33 = lean_ctor_get(x_17, 1);
+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_inc(x_34);
 lean_inc(x_33);
-lean_inc(x_32);
-lean_dec(x_17);
-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_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;
 }
 }
 }
 else
 {
-if (lean_obj_tag(x_17) == 0)
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_35 = lean_ctor_get(x_17, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_17, 1);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_36 = lean_ctor_get(x_18, 0);
 lean_inc(x_36);
-lean_dec(x_17);
-x_37 = l_Lean_Meta_getSimpLemmas___rarg(x_10, x_36);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
+x_37 = lean_ctor_get(x_18, 1);
+lean_inc(x_37);
+lean_dec(x_18);
+x_38 = l_Lean_Meta_getSimpLemmas___rarg(x_11, x_37);
+x_39 = lean_ctor_get(x_38, 0);
 lean_inc(x_39);
-lean_dec(x_37);
-x_40 = l_Lean_Meta_getCongrLemmas___rarg(x_10, x_39);
-x_41 = lean_ctor_get(x_40, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_40, 1);
+x_40 = lean_ctor_get(x_38, 1);
+lean_inc(x_40);
+lean_dec(x_38);
+x_41 = l_Lean_Meta_getCongrLemmas___rarg(x_11, x_40);
+x_42 = lean_ctor_get(x_41, 0);
 lean_inc(x_42);
-lean_dec(x_40);
-x_43 = lean_unsigned_to_nat(3u);
-x_44 = l_Lean_Syntax_getArg(x_1, x_43);
-x_45 = lean_box(0);
-x_46 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_46, 0, x_35);
-lean_ctor_set(x_46, 1, x_38);
-lean_ctor_set(x_46, 2, x_41);
-lean_ctor_set(x_46, 3, x_45);
-x_47 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas(x_44, x_46, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
-lean_dec(x_44);
-return x_47;
+x_43 = lean_ctor_get(x_41, 1);
+lean_inc(x_43);
+lean_dec(x_41);
+x_44 = lean_unsigned_to_nat(3u);
+x_45 = l_Lean_Syntax_getArg(x_1, x_44);
+x_46 = lean_box(0);
+x_47 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_47, 0, x_36);
+lean_ctor_set(x_47, 1, x_39);
+lean_ctor_set(x_47, 2, x_42);
+lean_ctor_set(x_47, 3, x_46);
+x_48 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas(x_45, x_47, x_2, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_43);
+lean_dec(x_45);
+return x_48;
 }
 else
 {
-uint8_t x_48; 
+uint8_t x_49; 
+lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -2995,38 +3270,39 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
-x_48 = !lean_is_exclusive(x_17);
-if (x_48 == 0)
+x_49 = !lean_is_exclusive(x_18);
+if (x_49 == 0)
 {
-return x_17;
+return x_18;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_17, 0);
-x_50 = lean_ctor_get(x_17, 1);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_50 = lean_ctor_get(x_18, 0);
+x_51 = lean_ctor_get(x_18, 1);
+lean_inc(x_51);
 lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_17);
-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_18);
+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_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
-uint8_t x_12; lean_object* x_13; 
-x_12 = lean_unbox(x_2);
+uint8_t x_13; uint8_t x_14; lean_object* x_15; 
+x_13 = lean_unbox(x_2);
 lean_dec(x_2);
-x_13 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_14 = lean_unbox(x_3);
+lean_dec(x_3);
+x_15 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_13, x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_1);
-return x_13;
+return x_15;
 }
 }
 lean_object* l_Lean_Elab_Tactic_evalSimp_go_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -4316,7 +4592,7 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_12 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_12 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_11, x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 if (lean_obj_tag(x_12) == 0)
 {
 lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
@@ -4489,7 +4765,7 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_2);
-x_12 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_12 = l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_mkSimpContext(x_1, x_11, x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 if (lean_obj_tag(x_12) == 0)
 {
 lean_object* x_13; lean_object* x_14; lean_object* x_15; 
@@ -4722,6 +4998,10 @@ l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__4 = _init_l_Lean_Elab_Tactic_e
 lean_mark_persistent(l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__4);
 l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__5 = _init_l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__5();
 lean_mark_persistent(l_Lean_Elab_Tactic_evalSimpConfigUnsafe___closed__5);
+l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1 = _init_l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__1);
+l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2 = _init_l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2();
+lean_mark_persistent(l_Lean_Elab_Tactic_evalSimpConfigCtxUnsafe___closed__2);
 l_Lean_Elab_Tactic_elabSimpConfig___closed__1 = _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__1();
 lean_mark_persistent(l_Lean_Elab_Tactic_elabSimpConfig___closed__1);
 l_Lean_Elab_Tactic_elabSimpConfig___closed__2 = _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__2();
@@ -4730,6 +5010,10 @@ l_Lean_Elab_Tactic_elabSimpConfig___closed__3 = _init_l_Lean_Elab_Tactic_elabSim
 lean_mark_persistent(l_Lean_Elab_Tactic_elabSimpConfig___closed__3);
 l_Lean_Elab_Tactic_elabSimpConfig___closed__4 = _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__4();
 lean_mark_persistent(l_Lean_Elab_Tactic_elabSimpConfig___closed__4);
+l_Lean_Elab_Tactic_elabSimpConfig___closed__5 = _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__5();
+lean_mark_persistent(l_Lean_Elab_Tactic_elabSimpConfig___closed__5);
+l_Lean_Elab_Tactic_elabSimpConfig___closed__6 = _init_l_Lean_Elab_Tactic_elabSimpConfig___closed__6();
+lean_mark_persistent(l_Lean_Elab_Tactic_elabSimpConfig___closed__6);
 l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___closed__1 = _init_l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___closed__1();
 lean_mark_persistent(l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___closed__1);
 l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___closed__2 = _init_l___private_Lean_Elab_Tactic_Simp_0__Lean_Elab_Tactic_elabSimpLemmas___closed__2();
diff --git a/stage0/stdlib/Lean/Elab/Term.c b/stage0/stdlib/Lean/Elab/Term.c
index defed8ed74..5abdf1e7bf 100644
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
@@ -104,6 +104,7 @@ lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*,
 lean_object* l_Lean_Elab_Term_getLetRecsToLift___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadMacroAdapterTermElabM___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadInfoTreeTermElabM;
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__2;
 lean_object* l_Lean_Elab_Term_elabNumLit___lambda__1___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_withIncRecDepth___rarg___lambda__2___closed__2;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___spec__11___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*);
@@ -170,6 +171,7 @@ lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_mkConst___spec__1___boxed(l
 uint8_t l_Lean_Elab_isValidAutoBoundImplicitName(lean_object*);
 lean_object* l_Lean_resolveGlobalConst___at_Lean_Elab_Term_elabDoubleQuotedName___spec__3___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveLocalName_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__3___closed__4;
 extern lean_object* l_Lean_Parser_Term_ensureExpectedType___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_commitIfDidNotPostpone___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -238,7 +240,6 @@ extern lean_object* l_Lean_Meta_isCoeDecl___closed__14;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFns___closed__4;
 extern lean_object* l_Lean_Meta_mkSorry___closed__4;
 lean_object* l_Lean_Elab_Term_instInhabitedState___closed__2;
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_prev(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___closed__3;
@@ -517,6 +518,7 @@ uint8_t l_Lean_Level_normLtAux(lean_object*, lean_object*, lean_object*, lean_ob
 lean_object* l_List_map___at_Lean_resolveGlobalConstNoOverload___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr_mkMessage___lambda__2___boxed(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr_mkMessage_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveLocalName_loop(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadQuotationTermElabM___closed__10;
@@ -565,6 +567,7 @@ lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryCoeSort(lean_object
 lean_object* l_Lean_Elab_Term_TermElabM_run(lean_object*);
 uint8_t l_Array_contains___at_Lean_Elab_Term_logUnassignedUsingErrorInfos___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_saveContext(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3;
 lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError___closed__1;
 lean_object* l___private_Init_Data_String_Basic_0__Substring_takeRightWhileAux___at_Lean_Elab_Term_resolveName_x27___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkTypeMismatchError___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -577,12 +580,10 @@ lean_object* l_Lean_Syntax_isStrLit_x3f(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkTypeMismatchError___closed__1;
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__3;
 lean_object* l_Lean_Meta_mkHasTypeButIsExpectedMsg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__2;
 extern lean_object* l_Lean_Parser_Term_quotedName___elambda__1___closed__2;
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4;
 lean_object* l_Lean_Elab_Term_withMacroExpansion___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabByTactic___closed__2;
 lean_object* l_Lean_KernelException_toMessageData(lean_object*, lean_object*);
@@ -608,6 +609,7 @@ lean_object* l_Lean_Elab_Term_mkInstMVar(lean_object*, lean_object*, lean_object
 lean_object* l_Lean_Syntax_isScientificLit_x3f(lean_object*);
 lean_object* l_List_map___at_Lean_Elab_Term_resolveName_x27___spec__4___boxed(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabEnsureExpectedType(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4;
 extern lean_object* l_Lean_Meta_mkArrow___closed__2;
 extern lean_object* l_Lean_PrettyPrinter_Formatter_symbolNoAntiquot_formatter___closed__1;
 lean_object* l_Lean_resolveGlobalConst___at_Lean_Elab_Term_elabDoubleQuotedName___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -661,7 +663,6 @@ lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_tryLiftAndCoe___closed
 lean_object* l_Lean_Elab_Term_resolveLocalName___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_strLitKind___closed__2;
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2;
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenOnly___at_Lean_Elab_Term_elabOpen___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_forInUnsafe_loop___at_myMacro____x40_Init_NotationExtra___hyg_5659____spec__3___lambda__2___closed__2;
 lean_object* l_Lean_Elab_Term_withFreshMacroScope(lean_object*);
@@ -692,9 +693,9 @@ lean_object* l_Lean_Elab_Term_mkTypeMismatchError_match__1___rarg(lean_object*,
 lean_object* l___regBuiltin_Lean_Elab_Term_elabCharLit(lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabOptLevel___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFnsAux_match__2___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772_(lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276_(lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255_(lean_object*);
 lean_object* l_Lean_mkAuxName___at_Lean_Elab_Term_mkAuxName___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_setElabConfig(lean_object*);
 lean_object* l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___closed__4;
@@ -702,7 +703,7 @@ lean_object* l_Lean_Elab_Term_getLetRecsToLift(lean_object*);
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Core_getMaxHeartbeats(lean_object*);
 lean_object* l_Lean_Expr_setAppPPExplicitForExposingMVars(lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1071_(lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1072_(lean_object*);
 lean_object* l_Std_PersistentArray_forMAux___at_Lean_Elab_Term_instMetaEvalTermElabM___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFns___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
@@ -715,6 +716,7 @@ lean_object* lean_format_pretty(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_State_levelNames___default;
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_synthesizeInst___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_contains___at_Lean_findField_x3f___spec__1(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__2;
 lean_object* l_Std_PersistentArray_forInAux___at_Lean_Elab_Term_addAutoBoundImplicits___spec__3___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentArray_forInAux___at___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___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*);
@@ -728,18 +730,17 @@ lean_object* l_List_replace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_thro
 uint8_t l_Lean_Elab_Term_Context_errToSorry___default;
 lean_object* l_Lean_Elab_Term_instInhabitedTermElabResult(lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1;
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__15___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadMacroAdapterTermElabM___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_abortTermExceptionId;
 lean_object* l_Lean_Elab_Term_elabProp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
 lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError_appendExtra_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_assignExpr(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* lean_eval_const(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_throwAppTypeMismatch___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2;
 uint8_t l_Lean_Environment_contains(lean_object*, lean_object*);
 lean_object* l_List_filterAux___at_Lean_resolveGlobalConst___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_synthesizeInstMVarCore___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -751,7 +752,6 @@ lean_object* l_Lean_Elab_Term_mkTermElabAttribute(lean_object*);
 extern lean_object* l_Lean_numLitKind___closed__2;
 lean_object* l_Lean_printTraces___at_Lean_Core_instMetaEvalCoreM___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1;
 uint32_t lean_string_utf8_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostponeIfHasMVars___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Option_get___at_Lean_Core_getMaxHeartbeats___spec__1(lean_object*, lean_object*);
@@ -813,7 +813,6 @@ lean_object* l_Lean_Elab_Term_MVarErrorInfo_logError___closed__3;
 lean_object* l_Lean_Elab_Term_elabSyntheticHole___closed__1;
 uint8_t l_Lean_MessageData_hasSyntheticSorry(lean_object*);
 lean_object* l_Lean_Elab_Term_registerMVarErrorHoleInfo___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3;
 lean_object* l_Lean_Elab_Term_synthesizeCoeInstMVarCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName_x27_match__4___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___lambda__1___closed__1;
@@ -821,7 +820,6 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_addAutoBoundImplicits_
 lean_object* l_Lean_Core_checkMaxHeartbeats(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___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* l_Lean_ResolveName_resolveGlobalName(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1;
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_mkConst___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ofExcept___at_Lean_Elab_Term_evalExpr___spec__14___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -834,6 +832,7 @@ extern lean_object* l_Lean_Elab_throwAbortTerm___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabEnsureExpectedType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMetaEvalTermElabM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3;
 uint8_t l_Lean_Elab_Term_Context_implicitLambda___default;
 lean_object* l_Lean_Elab_Term_levelMVarToParam_x27_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Open_0__Lean_Elab_OpenDecl_elabOpenRenaming___at_Lean_Elab_Term_elabOpen___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -913,7 +912,6 @@ lean_object* l_Lean_addAndCompile___at_Lean_Elab_Term_evalExpr___spec__2(lean_ob
 lean_object* l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11(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_Elab_addMacroStack___rarg___lambda__1___closed__3;
 extern lean_object* l_Lean_Elab_throwIllFormedSyntax___rarg___closed__2;
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4;
 lean_object* l_Lean_Elab_Term_resolveId_x3f___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_Context_sectionVars___default;
 lean_object* l_Lean_Elab_Term_tryPostponeIfHasMVars___closed__2;
@@ -1305,7 +1303,7 @@ lean_object* l_Lean_Elab_Term_applyResult___rarg(lean_object*, lean_object*, lea
 lean_object* l_IO_println___at_Lean_instEval___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwErrorIfErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445_(lean_object*);
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460_(lean_object*);
 lean_object* l_Lean_Elab_Term_addAutoBoundImplicits(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_whnfD(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instMonadQuotationTermElabM___closed__2;
@@ -1381,6 +1379,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_instMetaEvalTermElabM
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_resolveId_x3f___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_observing___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_instMetaEvalTermElabM___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* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4;
 lean_object* l_Lean_Elab_Term_tryPostponeIfHasMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___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_usize_to_nat(size_t);
@@ -1429,6 +1428,7 @@ lean_object* l_Lean_Elab_Term_registerSyntheticMVar___boxed(lean_object*, lean_o
 lean_object* l___regBuiltin_Lean_Elab_Term_elabSetOption(lean_object*);
 lean_object* l_Lean_Elab_Term_ensureHasTypeAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabUsingElabFns___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1;
 lean_object* l_Lean_Elab_Term_tryPostponeIfNoneOrMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_processPostponed(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_uint32_to_nat(uint32_t);
@@ -3335,7 +3335,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__2;
 x_2 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__3;
-x_3 = lean_unsigned_to_nat(259u);
+x_3 = lean_unsigned_to_nat(260u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4883,7 +4883,7 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1071_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1072_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -12386,7 +12386,7 @@ lean_dec(x_4);
 return x_10;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -12394,17 +12394,17 @@ x_1 = lean_mk_string("autoLift");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____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_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -12412,13 +12412,13 @@ x_1 = lean_mk_string("insert monadic lifts (i.e., `liftM` and `liftCoeM`) when n
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = 1;
 x_2 = l_Lean_instInhabitedParserDescr___closed__1;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3;
 x_4 = lean_box(x_1);
 x_5 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_5, 0, x_4);
@@ -12427,17 +12427,17 @@ lean_ctor_set(x_5, 2, x_3);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__2;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4;
 x_4 = l_Lean_Option_register___at_Lean_Elab_initFn____x40_Lean_Elab_AutoBound___hyg_4____spec__1(x_2, x_3, x_1);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -12445,17 +12445,17 @@ x_1 = lean_mk_string("maxCoeSize");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____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_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -12463,13 +12463,13 @@ x_1 = lean_mk_string("maximum number of instances used to construct an automatic
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = lean_unsigned_to_nat(16u);
 x_2 = l_Lean_instInhabitedParserDescr___closed__1;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -12477,12 +12477,12 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2;
-x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__2;
+x_3 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4;
 x_4 = l_Lean_Option_register___at_Lean_initFn____x40_Lean_Util_RecDepth___hyg_4____spec__1(x_2, x_3, x_1);
 return x_4;
 }
@@ -20903,24 +20903,26 @@ return x_10;
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_saveContext(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_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; 
 x_8 = lean_ctor_get(x_5, 0);
 x_9 = lean_ctor_get(x_5, 5);
 x_10 = lean_ctor_get(x_1, 2);
 x_11 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get_uint8(x_1, sizeof(void*)*8 + 1);
 lean_inc(x_11);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_10);
-x_12 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_12, 0, x_10);
-lean_ctor_set(x_12, 1, x_8);
-lean_ctor_set(x_12, 2, x_9);
-lean_ctor_set(x_12, 3, x_11);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_7);
-return x_13;
+x_13 = lean_alloc_ctor(0, 4, 1);
+lean_ctor_set(x_13, 0, x_10);
+lean_ctor_set(x_13, 1, x_8);
+lean_ctor_set(x_13, 2, x_9);
+lean_ctor_set(x_13, 3, x_11);
+lean_ctor_set_uint8(x_13, sizeof(void*)*4, x_12);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_7);
+return x_14;
 }
 }
 lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_saveContext___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) {
@@ -20944,7 +20946,7 @@ uint8_t x_10;
 x_10 = !lean_is_exclusive(x_3);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+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; uint8_t x_18; 
 x_11 = lean_ctor_get(x_3, 3);
 lean_dec(x_11);
 x_12 = lean_ctor_get(x_3, 2);
@@ -20953,64 +20955,65 @@ x_13 = lean_ctor_get(x_1, 0);
 x_14 = lean_ctor_get(x_1, 1);
 x_15 = lean_ctor_get(x_1, 2);
 x_16 = lean_ctor_get(x_1, 3);
+x_17 = lean_ctor_get_uint8(x_1, sizeof(void*)*4);
 lean_inc(x_16);
 lean_inc(x_13);
 lean_ctor_set(x_3, 3, x_16);
 lean_ctor_set(x_3, 2, x_13);
-x_17 = !lean_is_exclusive(x_7);
-if (x_17 == 0)
+lean_ctor_set_uint8(x_3, sizeof(void*)*8 + 1, x_17);
+x_18 = !lean_is_exclusive(x_7);
+if (x_18 == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_7, 5);
-lean_dec(x_18);
-x_19 = lean_ctor_get(x_7, 0);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_7, 5);
 lean_dec(x_19);
+x_20 = lean_ctor_get(x_7, 0);
+lean_dec(x_20);
 lean_inc(x_15);
 lean_inc(x_14);
 lean_ctor_set(x_7, 5, x_15);
 lean_ctor_set(x_7, 0, x_14);
-x_20 = lean_apply_7(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_20;
+x_21 = lean_apply_7(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_21;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_21 = lean_ctor_get(x_7, 1);
-x_22 = lean_ctor_get(x_7, 2);
-x_23 = lean_ctor_get(x_7, 3);
-x_24 = lean_ctor_get(x_7, 4);
-x_25 = lean_ctor_get(x_7, 6);
-x_26 = lean_ctor_get(x_7, 7);
+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_22 = lean_ctor_get(x_7, 1);
+x_23 = lean_ctor_get(x_7, 2);
+x_24 = lean_ctor_get(x_7, 3);
+x_25 = lean_ctor_get(x_7, 4);
+x_26 = lean_ctor_get(x_7, 6);
+x_27 = lean_ctor_get(x_7, 7);
+lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
 lean_inc(x_24);
 lean_inc(x_23);
 lean_inc(x_22);
-lean_inc(x_21);
 lean_dec(x_7);
 lean_inc(x_15);
 lean_inc(x_14);
-x_27 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_27, 0, x_14);
-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(x_27, 5, x_15);
-lean_ctor_set(x_27, 6, x_25);
-lean_ctor_set(x_27, 7, x_26);
-x_28 = lean_apply_7(x_2, x_3, x_4, x_5, x_6, x_27, x_8, x_9);
-return x_28;
+x_28 = lean_alloc_ctor(0, 8, 0);
+lean_ctor_set(x_28, 0, x_14);
+lean_ctor_set(x_28, 1, x_22);
+lean_ctor_set(x_28, 2, x_23);
+lean_ctor_set(x_28, 3, x_24);
+lean_ctor_set(x_28, 4, x_25);
+lean_ctor_set(x_28, 5, x_15);
+lean_ctor_set(x_28, 6, x_26);
+lean_ctor_set(x_28, 7, x_27);
+x_29 = lean_apply_7(x_2, x_3, x_4, x_5, x_6, x_28, x_8, x_9);
+return x_29;
 }
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; uint8_t x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; 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; 
-x_29 = lean_ctor_get(x_3, 0);
-x_30 = lean_ctor_get(x_3, 1);
-x_31 = lean_ctor_get(x_3, 4);
-x_32 = lean_ctor_get_uint8(x_3, sizeof(void*)*8);
-x_33 = lean_ctor_get_uint8(x_3, sizeof(void*)*8 + 1);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; uint8_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_30 = lean_ctor_get(x_3, 0);
+x_31 = lean_ctor_get(x_3, 1);
+x_32 = lean_ctor_get(x_3, 4);
+x_33 = lean_ctor_get_uint8(x_3, sizeof(void*)*8);
 x_34 = lean_ctor_get_uint8(x_3, sizeof(void*)*8 + 2);
 x_35 = lean_ctor_get(x_3, 5);
 x_36 = lean_ctor_get(x_3, 6);
@@ -21019,41 +21022,42 @@ x_38 = lean_ctor_get_uint8(x_3, sizeof(void*)*8 + 3);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
+lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
-lean_inc(x_29);
 lean_dec(x_3);
 x_39 = lean_ctor_get(x_1, 0);
 x_40 = lean_ctor_get(x_1, 1);
 x_41 = lean_ctor_get(x_1, 2);
 x_42 = lean_ctor_get(x_1, 3);
+x_43 = lean_ctor_get_uint8(x_1, sizeof(void*)*4);
 lean_inc(x_42);
 lean_inc(x_39);
-x_43 = lean_alloc_ctor(0, 8, 4);
-lean_ctor_set(x_43, 0, x_29);
-lean_ctor_set(x_43, 1, x_30);
-lean_ctor_set(x_43, 2, x_39);
-lean_ctor_set(x_43, 3, x_42);
-lean_ctor_set(x_43, 4, x_31);
-lean_ctor_set(x_43, 5, x_35);
-lean_ctor_set(x_43, 6, x_36);
-lean_ctor_set(x_43, 7, x_37);
-lean_ctor_set_uint8(x_43, sizeof(void*)*8, x_32);
-lean_ctor_set_uint8(x_43, sizeof(void*)*8 + 1, x_33);
-lean_ctor_set_uint8(x_43, sizeof(void*)*8 + 2, x_34);
-lean_ctor_set_uint8(x_43, sizeof(void*)*8 + 3, x_38);
-x_44 = lean_ctor_get(x_7, 1);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_7, 2);
+x_44 = lean_alloc_ctor(0, 8, 4);
+lean_ctor_set(x_44, 0, x_30);
+lean_ctor_set(x_44, 1, x_31);
+lean_ctor_set(x_44, 2, x_39);
+lean_ctor_set(x_44, 3, x_42);
+lean_ctor_set(x_44, 4, x_32);
+lean_ctor_set(x_44, 5, x_35);
+lean_ctor_set(x_44, 6, x_36);
+lean_ctor_set(x_44, 7, x_37);
+lean_ctor_set_uint8(x_44, sizeof(void*)*8, x_33);
+lean_ctor_set_uint8(x_44, sizeof(void*)*8 + 1, x_43);
+lean_ctor_set_uint8(x_44, sizeof(void*)*8 + 2, x_34);
+lean_ctor_set_uint8(x_44, sizeof(void*)*8 + 3, x_38);
+x_45 = lean_ctor_get(x_7, 1);
 lean_inc(x_45);
-x_46 = lean_ctor_get(x_7, 3);
+x_46 = lean_ctor_get(x_7, 2);
 lean_inc(x_46);
-x_47 = lean_ctor_get(x_7, 4);
+x_47 = lean_ctor_get(x_7, 3);
 lean_inc(x_47);
-x_48 = lean_ctor_get(x_7, 6);
+x_48 = lean_ctor_get(x_7, 4);
 lean_inc(x_48);
-x_49 = lean_ctor_get(x_7, 7);
+x_49 = lean_ctor_get(x_7, 6);
 lean_inc(x_49);
+x_50 = lean_ctor_get(x_7, 7);
+lean_inc(x_50);
 if (lean_is_exclusive(x_7)) {
  lean_ctor_release(x_7, 0);
  lean_ctor_release(x_7, 1);
@@ -21063,28 +21067,28 @@ if (lean_is_exclusive(x_7)) {
  lean_ctor_release(x_7, 5);
  lean_ctor_release(x_7, 6);
  lean_ctor_release(x_7, 7);
- x_50 = x_7;
+ x_51 = x_7;
 } else {
  lean_dec_ref(x_7);
- x_50 = lean_box(0);
+ x_51 = lean_box(0);
 }
 lean_inc(x_41);
 lean_inc(x_40);
-if (lean_is_scalar(x_50)) {
- x_51 = lean_alloc_ctor(0, 8, 0);
+if (lean_is_scalar(x_51)) {
+ x_52 = lean_alloc_ctor(0, 8, 0);
 } else {
- x_51 = x_50;
+ x_52 = x_51;
 }
-lean_ctor_set(x_51, 0, x_40);
-lean_ctor_set(x_51, 1, x_44);
-lean_ctor_set(x_51, 2, x_45);
-lean_ctor_set(x_51, 3, x_46);
-lean_ctor_set(x_51, 4, x_47);
-lean_ctor_set(x_51, 5, x_41);
-lean_ctor_set(x_51, 6, x_48);
-lean_ctor_set(x_51, 7, x_49);
-x_52 = lean_apply_7(x_2, x_43, x_4, x_5, x_6, x_51, x_8, x_9);
-return x_52;
+lean_ctor_set(x_52, 0, x_40);
+lean_ctor_set(x_52, 1, x_45);
+lean_ctor_set(x_52, 2, x_46);
+lean_ctor_set(x_52, 3, x_47);
+lean_ctor_set(x_52, 4, x_48);
+lean_ctor_set(x_52, 5, x_41);
+lean_ctor_set(x_52, 6, x_49);
+lean_ctor_set(x_52, 7, x_50);
+x_53 = lean_apply_7(x_2, x_44, x_4, x_5, x_6, x_52, x_8, x_9);
+return x_53;
 }
 }
 }
@@ -31696,7 +31700,7 @@ lean_dec(x_3);
 return x_9;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -31706,11 +31710,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772_(lean_object* x_1) {
+lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
+x_2 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -31881,7 +31885,7 @@ lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lea
 x_97 = lean_ctor_get(x_91, 1);
 lean_inc(x_97);
 lean_dec(x_91);
-x_98 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
+x_98 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 x_99 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_98, x_2, x_3, x_4, x_5, x_6, x_7, x_97);
 x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
@@ -31923,7 +31927,7 @@ lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean
 x_53 = lean_ctor_get(x_47, 1);
 lean_inc(x_53);
 lean_dec(x_47);
-x_54 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
+x_54 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 x_55 = l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(x_54, x_2, x_3, x_4, x_5, x_6, x_7, x_53);
 x_56 = lean_ctor_get(x_55, 0);
 lean_inc(x_56);
@@ -32004,7 +32008,7 @@ x_41 = l_Lean_KernelException_toMessageData___closed__15;
 x_42 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_42, 0, x_40);
 lean_ctor_set(x_42, 1, x_41);
-x_43 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
+x_43 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 x_44 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_43, x_42, x_2, x_3, x_4, x_5, x_6, x_7, x_36);
 x_45 = lean_ctor_get(x_44, 1);
 lean_inc(x_45);
@@ -32066,7 +32070,7 @@ x_79 = l_Lean_KernelException_toMessageData___closed__15;
 x_80 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_80, 0, x_78);
 lean_ctor_set(x_80, 1, x_79);
-x_81 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1;
+x_81 = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1;
 x_82 = l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(x_81, x_80, x_2, x_3, x_4, x_5, x_6, x_7, x_61);
 x_83 = lean_ctor_get(x_82, 1);
 lean_inc(x_83);
@@ -36102,7 +36106,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Elab_Term_getFVarLocalDecl_x21___closed__2;
 x_2 = l_List_mapM___at_Lean_Elab_Term_resolveName_x27___spec__6___closed__2;
-x_3 = lean_unsigned_to_nat(1345u);
+x_3 = lean_unsigned_to_nat(1347u);
 x_4 = lean_unsigned_to_nat(31u);
 x_5 = l_Lean_Name_getString_x21___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -52553,7 +52557,7 @@ lean_dec(x_3);
 return x_11;
 }
 }
-static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1() {
+static lean_object* _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -52563,7 +52567,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445_(lean_object* x_1) {
+lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -52575,7 +52579,7 @@ lean_object* x_4; lean_object* x_5; lean_object* x_6;
 x_4 = lean_ctor_get(x_3, 1);
 lean_inc(x_4);
 lean_dec(x_3);
-x_5 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1;
+x_5 = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1;
 x_6 = l_Lean_registerTraceClass(x_5, x_4);
 if (lean_obj_tag(x_6) == 0)
 {
@@ -52855,7 +52859,7 @@ l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__8 = _init_l_Lean_Elab_Term_
 lean_mark_persistent(l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__8);
 l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__9 = _init_l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__9();
 lean_mark_persistent(l_Lean_Elab_Term_mkTermElabAttributeUnsafe___closed__9);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1071_(lean_io_mk_world());
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_1072_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_Term_termElabAttribute = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_Term_termElabAttribute);
@@ -52926,28 +52930,28 @@ l_Lean_Elab_Term_synthesizeInstMVarCore___closed__7 = _init_l_Lean_Elab_Term_syn
 lean_mark_persistent(l_Lean_Elab_Term_synthesizeInstMVarCore___closed__7);
 l_Lean_Elab_Term_synthesizeInstMVarCore___closed__8 = _init_l_Lean_Elab_Term_synthesizeInstMVarCore___closed__8();
 lean_mark_persistent(l_Lean_Elab_Term_synthesizeInstMVarCore___closed__8);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254____closed__4);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3254_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__2);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__3);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255____closed__4);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3255_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_Term_autoLift = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_Term_autoLift);
 lean_dec_ref(res);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__1);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__3);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276____closed__4);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3276_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__1);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__2 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__2);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__3);
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277____closed__4);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_3277_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Elab_Term_maxCoeSize = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Elab_Term_maxCoeSize);
@@ -53036,9 +53040,9 @@ l_Lean_Elab_Term_mkAuxName___closed__1 = _init_l_Lean_Elab_Term_mkAuxName___clos
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__1);
 l_Lean_Elab_Term_mkAuxName___closed__2 = _init_l_Lean_Elab_Term_mkAuxName___closed__2();
 lean_mark_persistent(l_Lean_Elab_Term_mkAuxName___closed__2);
-l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772____closed__1);
-res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7772_(lean_io_mk_world());
+l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1 = _init_l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787____closed__1);
+res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Term___hyg_7787_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_isLetRecAuxMVar___closed__1 = _init_l_Lean_Elab_Term_isLetRecAuxMVar___closed__1();
@@ -53260,9 +53264,9 @@ l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___closed_
 lean_mark_persistent(l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___closed__3);
 l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___closed__4 = _init_l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___closed__4();
 lean_mark_persistent(l___private_Lean_Elab_Term_0__Lean_Elab_Term_throwStuckAtUniverseCnstr___closed__4);
-l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1();
-lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445____closed__1);
-res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11445_(lean_io_mk_world());
+l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1 = _init_l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1();
+lean_mark_persistent(l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460____closed__1);
+res = l_Lean_Elab_initFn____x40_Lean_Elab_Term___hyg_11460_(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/DiscrTree.c b/stage0/stdlib/Lean/Meta/DiscrTree.c
index f73c0f9ce7..84737d8eb2 100644
--- a/stage0/stdlib/Lean/Meta/DiscrTree.c
+++ b/stage0/stdlib/Lean/Meta/DiscrTree.c
@@ -26,6 +26,7 @@ lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify
 lean_object* l_Std_Format_join(lean_object*);
 uint8_t l_Lean_Expr_isNatLit(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_DiscrTree_insertCore___spec__9(lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__8(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_format___spec__4(lean_object*);
@@ -41,6 +42,7 @@ lean_object* l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrT
 lean_object* l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_DiscrTree_insertCore___spec__8(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify___spec__12___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_Key_format___closed__4;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14(lean_object*);
@@ -48,18 +50,21 @@ uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_DiscrTree_insertCore___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__8___rarg(lean_object*, size_t, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binInsertM___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instDecidableLess___boxed(lean_object*, lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5(lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_instInhabitedKey___closed__1;
 lean_object* l_Lean_Meta_DiscrTree_Key_format___closed__1;
 lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_Meta_DiscrTree_format___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insertCore___rarg___closed__4;
 lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_Meta_DiscrTree_getUnify___spec__13(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -76,10 +81,13 @@ lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_format___closed__2;
 uint8_t l_Lean_Meta_DiscrTree_hasNoindexAnnotation(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_format_match__1(lean_object*);
 lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process_match__2(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__16___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -87,7 +95,6 @@ lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify__
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__2(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__8(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instInhabitedDiscrTree(lean_object*);
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__5(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
@@ -114,6 +121,7 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_whnfEta_matc
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__5___rarg(lean_object*, size_t, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__11___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15(lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_DiscrTree_insertCore___spec__6___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_fmt___at_Lean_Meta_DiscrTree_Key_format___spec__1(lean_object*);
@@ -135,17 +143,20 @@ lean_object* l_List_map___at_Lean_Meta_DiscrTree_Trie_format___spec__2(lean_obje
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_DiscrTree_insertCore___spec__10___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_isOffset___closed__4;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg___boxed(lean_object*, lean_object*);
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13(lean_object*);
 lean_object* l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2(lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_format___closed__3;
 lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_Meta_DiscrTree_getUnify___spec__13___rarg(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_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_lt___boxed(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_format___spec__3___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insert(lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_DiscrTree_insertCore___spec__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(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_array_fget(lean_object*, lean_object*);
 lean_object* l_Std_fmt___at_Lean_Meta_DiscrTree_Trie_format___spec__4___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process_match__1(lean_object*, lean_object*);
@@ -164,7 +175,7 @@ lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___sp
 lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_DiscrTree_insertCore___spec__9___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__3(lean_object*);
-lean_object* l_Lean_Meta_DiscrTree_Key_format_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_Key_format_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getUnify_process___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_createNodes___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -193,6 +204,7 @@ lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_insertCor
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__4___rarg(lean_object*, lean_object*);
 lean_object* l_Array_binInsertM___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__1(lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17(lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_whnfEta(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___spec__2___rarg(lean_object*, size_t, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_insertCore___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -211,10 +223,12 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux_ma
 lean_object* l_Lean_Meta_DiscrTree_getUnify_process(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_DiscrTree_insertCore___spec__6(lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_createNodes(lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId___closed__1;
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_isOffset___closed__1;
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_isCharLit___closed__3;
@@ -279,16 +293,18 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpStar;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_format___spec__4___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_getUnify___spec__11___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_fmt___at_Lean_Meta_DiscrTree_Trie_format___spec__4(lean_object*);
-lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_fmt___at_Lean_Level_PP_Result_format___spec__1(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_format_match__1___rarg(lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binInsertM___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insertCore___rarg___closed__2;
 lean_object* l_Lean_Meta_DiscrTree_getUnify___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6(lean_object*);
+extern lean_object* l_Lean_Syntax_mkApp___closed__1;
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_instInhabitedKey;
@@ -297,6 +313,7 @@ lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__1___rarg(lean_object*, lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__15___rarg(lean_object*, size_t, lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult_match__1(lean_object*, lean_object*);
@@ -316,8 +333,10 @@ lean_object* l_Lean_Meta_DiscrTree_instToFormatTrie___rarg(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__3(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Trie_format___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_DiscrTree_insertCore___spec__4(lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg(lean_object*, size_t, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_isNumeral___closed__6;
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -328,6 +347,7 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs__
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insertCore_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_ignoreArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Array_forInUnsafe_loop___at___private_Init_NotationExtra_0__Lean_mkHintBody___spec__1___closed__4;
 lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_DiscrTree_insertCore___spec__5(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instToFormatKey;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify___spec__12___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -337,7 +357,6 @@ lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch_
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__1(lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_getUnify___spec__11___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_format___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getFunInfoNArgs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_format___rarg___closed__1;
@@ -356,6 +375,7 @@ lean_object* l_Lean_Meta_DiscrTree_hasNoindexAnnotation___boxed(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Trie_format_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getUnify_process_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_lt_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process(lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg(lean_object*, lean_object*);
@@ -367,6 +387,7 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_isNumeral___
 lean_object* l_Lean_Meta_DiscrTree_getMatch___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___spec__2(lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_getUnify___spec__11___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_ignoreArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1(lean_object*);
@@ -389,6 +410,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_format___spec__4
 lean_object* l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__2___rarg(lean_object*, size_t, lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_DiscrTree_insertCore___spec__8___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_stx___x2a___closed__3;
 lean_object* l_Lean_Meta_DiscrTree_insertCore(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__6(lean_object*);
@@ -400,8 +422,10 @@ lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_DiscrTree_insertCo
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_isNumeral___closed__7;
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__5(lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_format___spec__2___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Literal_lt(lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14(lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1(lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__2(lean_object*);
 lean_object* l_Lean_Expr_constName_x21(lean_object*);
@@ -412,9 +436,11 @@ lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___sp
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_format___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insert___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19(lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1___rarg___boxed(lean_object*, lean_object*);
 size_t l_Lean_Meta_DiscrTree_Key_hash(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Trie_format_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_instToFormatArray___rarg___closed__1;
@@ -425,6 +451,8 @@ lean_object* l_Lean_Meta_DiscrTree_Key_lt_match__1(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
 lean_object* l_Std_PersistentHashMap_find_x3f___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_empty(lean_object*);
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg(lean_object*, size_t, lean_object*);
 extern lean_object* l_Std_Format_paren___closed__3;
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -432,74 +460,91 @@ uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux_traverse___at_Lean_Meta_DiscrTree_getUnify___spec__13___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__3(lean_object*);
-lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__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* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__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) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_7 = lean_ctor_get(x_1, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_1, 1);
+x_8 = lean_ctor_get(x_1, 0);
 lean_inc(x_8);
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
 lean_dec(x_1);
-x_9 = lean_apply_2(x_6, x_7, x_8);
-return x_9;
+x_10 = lean_apply_2(x_6, x_8, x_9);
+return x_10;
 }
 case 1:
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_10 = lean_ctor_get(x_1, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 1);
+x_11 = lean_ctor_get(x_1, 0);
 lean_inc(x_11);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
 lean_dec(x_1);
-x_12 = lean_apply_2(x_5, x_10, x_11);
-return x_12;
+x_13 = lean_apply_2(x_5, x_11, x_12);
+return x_13;
 }
 case 2:
 {
-lean_object* x_13; lean_object* x_14; 
+lean_object* x_14; lean_object* x_15; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_13 = lean_ctor_get(x_1, 0);
-lean_inc(x_13);
+x_14 = lean_ctor_get(x_1, 0);
+lean_inc(x_14);
 lean_dec(x_1);
-x_14 = lean_apply_1(x_4, x_13);
-return x_14;
+x_15 = lean_apply_1(x_4, x_14);
+return x_15;
 }
 case 3:
 {
-lean_object* x_15; lean_object* x_16; 
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_15 = lean_box(0);
-x_16 = lean_apply_1(x_2, x_15);
-return x_16;
+x_16 = lean_box(0);
+x_17 = lean_apply_1(x_2, x_16);
+return x_17;
 }
-default: 
+case 4:
 {
-lean_object* x_17; lean_object* x_18; 
+lean_object* x_18; lean_object* x_19; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_17 = lean_box(0);
-x_18 = lean_apply_1(x_3, x_17);
-return x_18;
+x_18 = lean_box(0);
+x_19 = lean_apply_1(x_3, x_18);
+return x_19;
+}
+default: 
+{
+lean_object* x_20; lean_object* x_21; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_box(0);
+x_21 = lean_apply_1(x_7, x_20);
+return x_21;
 }
 }
 }
@@ -508,7 +553,7 @@ lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1___rarg), 7, 0);
 return x_2;
 }
 }
@@ -540,12 +585,18 @@ lean_object* x_5;
 x_5 = lean_unsigned_to_nat(0u);
 return x_5;
 }
-default: 
+case 4:
 {
 lean_object* x_6; 
 x_6 = lean_unsigned_to_nat(1u);
 return x_6;
 }
+default: 
+{
+lean_object* x_7; 
+x_7 = lean_unsigned_to_nat(5u);
+return x_7;
+}
 }
 }
 }
@@ -831,96 +882,114 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Meta_DiscrTree_Key_format_match__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* l_Lean_Meta_DiscrTree_Key_format_match__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:
 {
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+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_8 = lean_ctor_get(x_1, 0);
-lean_inc(x_8);
-x_9 = lean_ctor_get(x_1, 1);
+x_9 = lean_ctor_get(x_1, 0);
 lean_inc(x_9);
+x_10 = lean_ctor_get(x_1, 1);
+lean_inc(x_10);
 lean_dec(x_1);
-x_10 = lean_apply_2(x_6, x_8, x_9);
-return x_10;
+x_11 = lean_apply_2(x_6, x_9, x_10);
+return x_11;
 }
 case 1:
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_11 = lean_ctor_get(x_1, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 1);
+x_12 = lean_ctor_get(x_1, 0);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_2(x_7, x_11, x_12);
-return x_13;
+x_14 = lean_apply_2(x_7, x_12, x_13);
+return x_14;
 }
 case 2:
 {
-lean_object* x_14; 
+lean_object* x_15; 
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_3);
 lean_dec(x_2);
-x_14 = lean_ctor_get(x_1, 0);
-lean_inc(x_14);
-lean_dec(x_1);
-if (lean_obj_tag(x_14) == 0)
-{
-lean_object* x_15; lean_object* x_16; 
-lean_dec(x_5);
-x_15 = lean_ctor_get(x_14, 0);
+x_15 = lean_ctor_get(x_1, 0);
 lean_inc(x_15);
-lean_dec(x_14);
-x_16 = lean_apply_1(x_4, x_15);
-return x_16;
+lean_dec(x_1);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_5);
+x_16 = lean_ctor_get(x_15, 0);
+lean_inc(x_16);
+lean_dec(x_15);
+x_17 = lean_apply_1(x_4, x_16);
+return x_17;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; 
+lean_object* x_18; lean_object* x_19; 
 lean_dec(x_4);
-x_17 = lean_ctor_get(x_14, 0);
-lean_inc(x_17);
-lean_dec(x_14);
-x_18 = lean_apply_1(x_5, x_17);
-return x_18;
+x_18 = lean_ctor_get(x_15, 0);
+lean_inc(x_18);
+lean_dec(x_15);
+x_19 = lean_apply_1(x_5, x_18);
+return x_19;
 }
 }
 case 3:
 {
-lean_object* x_19; lean_object* x_20; 
+lean_object* x_20; lean_object* x_21; 
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_19 = lean_box(0);
-x_20 = lean_apply_1(x_2, x_19);
-return x_20;
+x_20 = lean_box(0);
+x_21 = lean_apply_1(x_2, x_20);
+return x_21;
 }
-default: 
+case 4:
 {
-lean_object* x_21; lean_object* x_22; 
+lean_object* x_22; lean_object* x_23; 
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_21 = lean_box(0);
-x_22 = lean_apply_1(x_3, x_21);
-return x_22;
+x_22 = lean_box(0);
+x_23 = lean_apply_1(x_3, x_22);
+return x_23;
+}
+default: 
+{
+lean_object* x_24; lean_object* x_25; 
+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_24 = lean_box(0);
+x_25 = lean_apply_1(x_8, x_24);
+return x_25;
 }
 }
 }
@@ -929,7 +998,7 @@ lean_object* l_Lean_Meta_DiscrTree_Key_format_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_format_match__1___rarg), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_format_match__1___rarg), 8, 0);
 return x_2;
 }
 }
@@ -972,6 +1041,16 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
+static lean_object* _init_l_Lean_Meta_DiscrTree_Key_format___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Array_forInUnsafe_loop___at___private_Init_NotationExtra_0__Lean_mkHintBody___spec__1___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
 lean_object* l_Lean_Meta_DiscrTree_Key_format(lean_object* x_1) {
 _start:
 {
@@ -1028,12 +1107,18 @@ lean_object* x_12;
 x_12 = l_Lean_Meta_DiscrTree_Key_format___closed__1;
 return x_12;
 }
-default: 
+case 4:
 {
 lean_object* x_13; 
 x_13 = l_Lean_Meta_DiscrTree_Key_format___closed__3;
 return x_13;
 }
+default: 
+{
+lean_object* x_14; 
+x_14 = l_Lean_Meta_DiscrTree_Key_format___closed__4;
+return x_14;
+}
 }
 }
 }
@@ -1053,43 +1138,56 @@ x_1 = l_Lean_Meta_DiscrTree_instToFormatKey___closed__1;
 return x_1;
 }
 }
-lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_5 = lean_ctor_get(x_1, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 1);
+x_6 = lean_ctor_get(x_1, 0);
 lean_inc(x_6);
+x_7 = lean_ctor_get(x_1, 1);
+lean_inc(x_7);
 lean_dec(x_1);
-x_7 = lean_apply_2(x_2, x_5, x_6);
-return x_7;
+x_8 = lean_apply_2(x_2, x_6, x_7);
+return x_8;
 }
 case 1:
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_8 = lean_ctor_get(x_1, 0);
-lean_inc(x_8);
-x_9 = lean_ctor_get(x_1, 1);
+x_9 = lean_ctor_get(x_1, 0);
 lean_inc(x_9);
+x_10 = lean_ctor_get(x_1, 1);
+lean_inc(x_10);
 lean_dec(x_1);
-x_10 = lean_apply_2(x_3, x_8, x_9);
-return x_10;
+x_11 = lean_apply_2(x_3, x_9, x_10);
+return x_11;
+}
+case 5:
+{
+lean_object* x_12; lean_object* x_13; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+x_12 = lean_box(0);
+x_13 = lean_apply_1(x_4, x_12);
+return x_13;
 }
 default: 
 {
-lean_object* x_11; 
+lean_object* x_14; 
+lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_11 = lean_apply_1(x_4, x_1);
-return x_11;
+x_14 = lean_apply_1(x_5, x_1);
+return x_14;
 }
 }
 }
@@ -1098,7 +1196,7 @@ lean_object* l_Lean_Meta_DiscrTree_Key_arity_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_arity_match__1___rarg), 5, 0);
 return x_2;
 }
 }
@@ -1120,12 +1218,18 @@ x_3 = lean_ctor_get(x_1, 1);
 lean_inc(x_3);
 return x_3;
 }
-default: 
+case 5:
 {
 lean_object* x_4; 
-x_4 = lean_unsigned_to_nat(0u);
+x_4 = lean_unsigned_to_nat(2u);
 return x_4;
 }
+default: 
+{
+lean_object* x_5; 
+x_5 = lean_unsigned_to_nat(0u);
+return x_5;
+}
 }
 }
 }
@@ -3250,81 +3354,106 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
-lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__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* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__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) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
 case 1:
 {
-lean_object* x_7; uint64_t x_8; lean_object* x_9; lean_object* x_10; 
+lean_object* x_8; uint64_t x_9; lean_object* x_10; lean_object* x_11; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_7 = lean_ctor_get(x_1, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
 lean_dec(x_1);
-x_9 = lean_box_uint64(x_8);
-x_10 = lean_apply_2(x_4, x_7, x_9);
-return x_10;
+x_10 = lean_box_uint64(x_9);
+x_11 = lean_apply_2(x_4, x_8, x_10);
+return x_11;
 }
 case 2:
 {
-lean_object* x_11; uint64_t x_12; lean_object* x_13; lean_object* x_14; 
+lean_object* x_12; uint64_t x_13; lean_object* x_14; lean_object* x_15; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_11 = lean_ctor_get(x_1, 0);
-lean_inc(x_11);
-x_12 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
+x_12 = lean_ctor_get(x_1, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
 lean_dec(x_1);
-x_13 = lean_box_uint64(x_12);
-x_14 = lean_apply_2(x_5, x_11, x_13);
-return x_14;
+x_14 = lean_box_uint64(x_13);
+x_15 = lean_apply_2(x_5, x_12, x_14);
+return x_15;
 }
 case 4:
 {
-lean_object* x_15; lean_object* x_16; uint64_t x_17; lean_object* x_18; lean_object* x_19; 
+lean_object* x_16; lean_object* x_17; uint64_t x_18; lean_object* x_19; lean_object* x_20; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_15 = lean_ctor_get(x_1, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_1, 1);
+x_16 = lean_ctor_get(x_1, 0);
 lean_inc(x_16);
-x_17 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
+x_17 = lean_ctor_get(x_1, 1);
+lean_inc(x_17);
+x_18 = lean_ctor_get_uint64(x_1, sizeof(void*)*2);
 lean_dec(x_1);
-x_18 = lean_box_uint64(x_17);
-x_19 = lean_apply_3(x_3, x_15, x_16, x_18);
-return x_19;
+x_19 = lean_box_uint64(x_18);
+x_20 = lean_apply_3(x_3, x_16, x_17, x_19);
+return x_20;
+}
+case 7:
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; uint64_t x_24; lean_object* x_25; lean_object* x_26; 
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_21 = lean_ctor_get(x_1, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_1, 1);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_1, 2);
+lean_inc(x_23);
+x_24 = lean_ctor_get_uint64(x_1, sizeof(void*)*3);
+lean_dec(x_1);
+x_25 = lean_box_uint64(x_24);
+x_26 = lean_apply_4(x_6, x_21, x_22, x_23, x_25);
+return x_26;
 }
 case 9:
 {
-lean_object* x_20; uint64_t x_21; lean_object* x_22; lean_object* x_23; 
+lean_object* x_27; uint64_t x_28; lean_object* x_29; lean_object* x_30; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_20 = lean_ctor_get(x_1, 0);
-lean_inc(x_20);
-x_21 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
+x_27 = lean_ctor_get(x_1, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get_uint64(x_1, sizeof(void*)*1);
 lean_dec(x_1);
-x_22 = lean_box_uint64(x_21);
-x_23 = lean_apply_2(x_2, x_20, x_22);
-return x_23;
+x_29 = lean_box_uint64(x_28);
+x_30 = lean_apply_2(x_2, x_27, x_29);
+return x_30;
 }
 default: 
 {
-lean_object* x_24; 
+lean_object* x_31; 
+lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_24 = lean_apply_1(x_6, x_1);
-return x_24;
+x_31 = lean_apply_1(x_7, x_1);
+return x_31;
 }
 }
 }
@@ -3333,7 +3462,7 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_mat
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1___rarg), 7, 0);
 return x_2;
 }
 }
@@ -3841,485 +3970,567 @@ x_90 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___lambda_
 return x_90;
 }
 }
-case 9:
+case 7:
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_object* x_91; lean_object* x_92; uint8_t x_93; 
 lean_dec(x_12);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_91 = lean_ctor_get(x_14, 0);
+x_91 = lean_ctor_get(x_14, 1);
 lean_inc(x_91);
+x_92 = lean_ctor_get(x_14, 2);
+lean_inc(x_92);
 lean_dec(x_14);
-x_92 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_92, 0, x_91);
-x_93 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_93, 0, x_92);
-lean_ctor_set(x_93, 1, x_2);
-lean_ctor_set(x_10, 0, x_93);
+x_93 = l_Lean_Expr_hasLooseBVars(x_92);
+if (x_93 == 0)
+{
+lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_94 = lean_array_push(x_2, x_91);
+x_95 = lean_array_push(x_94, x_92);
+x_96 = lean_box(5);
+x_97 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_97, 0, x_96);
+lean_ctor_set(x_97, 1, x_95);
+lean_ctor_set(x_10, 0, x_97);
+return x_10;
+}
+else
+{
+lean_object* x_98; lean_object* x_99; 
+lean_dec(x_92);
+lean_dec(x_91);
+x_98 = lean_box(4);
+x_99 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_99, 0, x_98);
+lean_ctor_set(x_99, 1, x_2);
+lean_ctor_set(x_10, 0, x_99);
+return x_10;
+}
+}
+case 9:
+{
+lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+lean_dec(x_12);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_100 = lean_ctor_get(x_14, 0);
+lean_inc(x_100);
+lean_dec(x_14);
+x_101 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_101, 0, x_100);
+x_102 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_102, 0, x_101);
+lean_ctor_set(x_102, 1, x_2);
+lean_ctor_set(x_10, 0, x_102);
 return x_10;
 }
 default: 
 {
-lean_object* x_94; lean_object* x_95; 
+lean_object* x_103; lean_object* x_104; 
 lean_dec(x_14);
 lean_dec(x_12);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_94 = lean_box(4);
-x_95 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_95, 0, x_94);
-lean_ctor_set(x_95, 1, x_2);
-lean_ctor_set(x_10, 0, x_95);
+x_103 = lean_box(4);
+x_104 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_103);
+lean_ctor_set(x_104, 1, x_2);
+lean_ctor_set(x_10, 0, x_104);
 return x_10;
 }
 }
 }
 else
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_10, 0);
-x_97 = lean_ctor_get(x_10, 1);
-lean_inc(x_97);
-lean_inc(x_96);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_105 = lean_ctor_get(x_10, 0);
+x_106 = lean_ctor_get(x_10, 1);
+lean_inc(x_106);
+lean_inc(x_105);
 lean_dec(x_10);
-x_98 = l_Lean_Expr_getAppFn(x_96);
-switch (lean_obj_tag(x_98)) {
+x_107 = l_Lean_Expr_getAppFn(x_105);
+switch (lean_obj_tag(x_107)) {
 case 1:
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-x_99 = lean_ctor_get(x_98, 0);
-lean_inc(x_99);
-x_100 = lean_unsigned_to_nat(0u);
-x_101 = l_Lean_Expr_getAppNumArgsAux(x_96, x_100);
-lean_inc(x_101);
-x_102 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_102, 0, x_99);
-lean_ctor_set(x_102, 1, x_101);
+lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
+x_108 = lean_ctor_get(x_107, 0);
+lean_inc(x_108);
+x_109 = lean_unsigned_to_nat(0u);
+x_110 = l_Lean_Expr_getAppNumArgsAux(x_105, x_109);
+lean_inc(x_110);
+x_111 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_111, 0, x_108);
+lean_ctor_set(x_111, 1, x_110);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-lean_inc(x_101);
-x_103 = l_Lean_Meta_getFunInfoNArgs(x_98, x_101, x_4, x_5, x_6, x_7, x_97);
-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; lean_object* 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 = lean_ctor_get(x_104, 0);
-lean_inc(x_106);
-lean_dec(x_104);
-x_107 = lean_unsigned_to_nat(1u);
-x_108 = lean_nat_sub(x_101, x_107);
-lean_dec(x_101);
-x_109 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_106, x_108, x_96, x_2, x_4, x_5, x_6, x_7, x_105);
-lean_dec(x_106);
-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; 
-x_110 = lean_ctor_get(x_109, 0);
 lean_inc(x_110);
-x_111 = lean_ctor_get(x_109, 1);
-lean_inc(x_111);
-if (lean_is_exclusive(x_109)) {
- lean_ctor_release(x_109, 0);
- lean_ctor_release(x_109, 1);
- x_112 = x_109;
-} else {
- lean_dec_ref(x_109);
- x_112 = lean_box(0);
-}
-x_113 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_113, 0, x_102);
-lean_ctor_set(x_113, 1, x_110);
-if (lean_is_scalar(x_112)) {
- x_114 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_114 = x_112;
-}
-lean_ctor_set(x_114, 0, x_113);
-lean_ctor_set(x_114, 1, x_111);
-return x_114;
-}
-else
+x_112 = l_Lean_Meta_getFunInfoNArgs(x_107, x_110, x_4, x_5, x_6, x_7, x_106);
+if (lean_obj_tag(x_112) == 0)
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-lean_dec(x_102);
-x_115 = lean_ctor_get(x_109, 0);
+lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+x_113 = lean_ctor_get(x_112, 0);
+lean_inc(x_113);
+x_114 = lean_ctor_get(x_112, 1);
+lean_inc(x_114);
+lean_dec(x_112);
+x_115 = lean_ctor_get(x_113, 0);
 lean_inc(x_115);
-x_116 = lean_ctor_get(x_109, 1);
-lean_inc(x_116);
-if (lean_is_exclusive(x_109)) {
- lean_ctor_release(x_109, 0);
- lean_ctor_release(x_109, 1);
- x_117 = x_109;
+lean_dec(x_113);
+x_116 = lean_unsigned_to_nat(1u);
+x_117 = lean_nat_sub(x_110, x_116);
+lean_dec(x_110);
+x_118 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_115, x_117, x_105, x_2, x_4, x_5, x_6, x_7, x_114);
+lean_dec(x_115);
+if (lean_obj_tag(x_118) == 0)
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+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_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_121 = x_118;
 } else {
- lean_dec_ref(x_109);
- x_117 = lean_box(0);
+ lean_dec_ref(x_118);
+ x_121 = lean_box(0);
 }
-if (lean_is_scalar(x_117)) {
- x_118 = lean_alloc_ctor(1, 2, 0);
+x_122 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_122, 0, x_111);
+lean_ctor_set(x_122, 1, x_119);
+if (lean_is_scalar(x_121)) {
+ x_123 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_118 = x_117;
+ x_123 = x_121;
 }
-lean_ctor_set(x_118, 0, x_115);
-lean_ctor_set(x_118, 1, x_116);
-return x_118;
+lean_ctor_set(x_123, 0, x_122);
+lean_ctor_set(x_123, 1, x_120);
+return x_123;
+}
+else
+{
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+lean_dec(x_111);
+x_124 = lean_ctor_get(x_118, 0);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_118, 1);
+lean_inc(x_125);
+if (lean_is_exclusive(x_118)) {
+ lean_ctor_release(x_118, 0);
+ lean_ctor_release(x_118, 1);
+ x_126 = x_118;
+} else {
+ lean_dec_ref(x_118);
+ 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-lean_dec(x_102);
-lean_dec(x_101);
-lean_dec(x_96);
+lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; 
+lean_dec(x_111);
+lean_dec(x_110);
+lean_dec(x_105);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_119 = lean_ctor_get(x_103, 0);
-lean_inc(x_119);
-x_120 = lean_ctor_get(x_103, 1);
-lean_inc(x_120);
-if (lean_is_exclusive(x_103)) {
- lean_ctor_release(x_103, 0);
- lean_ctor_release(x_103, 1);
- x_121 = x_103;
+x_128 = lean_ctor_get(x_112, 0);
+lean_inc(x_128);
+x_129 = lean_ctor_get(x_112, 1);
+lean_inc(x_129);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ x_130 = x_112;
 } else {
- lean_dec_ref(x_103);
- x_121 = lean_box(0);
+ lean_dec_ref(x_112);
+ x_130 = lean_box(0);
 }
-if (lean_is_scalar(x_121)) {
- x_122 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_130)) {
+ x_131 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_122 = x_121;
+ x_131 = x_130;
 }
-lean_ctor_set(x_122, 0, x_119);
-lean_ctor_set(x_122, 1, x_120);
-return x_122;
+lean_ctor_set(x_131, 0, x_128);
+lean_ctor_set(x_131, 1, x_129);
+return x_131;
 }
 }
 case 2:
 {
-lean_object* x_123; lean_object* x_124; uint8_t x_125; 
-lean_dec(x_96);
-x_123 = lean_ctor_get(x_98, 0);
-lean_inc(x_123);
-lean_dec(x_98);
-x_124 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
-x_125 = lean_name_eq(x_123, x_124);
-if (x_125 == 0)
+lean_object* x_132; lean_object* x_133; uint8_t x_134; 
+lean_dec(x_105);
+x_132 = lean_ctor_get(x_107, 0);
+lean_inc(x_132);
+lean_dec(x_107);
+x_133 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
+x_134 = lean_name_eq(x_132, x_133);
+if (x_134 == 0)
 {
-lean_object* x_126; 
-x_126 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_123, x_4, x_5, x_6, x_7, x_97);
+lean_object* x_135; 
+x_135 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_132, x_4, x_5, x_6, x_7, x_106);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_obj_tag(x_126) == 0)
+if (lean_obj_tag(x_135) == 0)
 {
-lean_object* x_127; uint8_t x_128; 
-x_127 = lean_ctor_get(x_126, 0);
-lean_inc(x_127);
-x_128 = lean_unbox(x_127);
-lean_dec(x_127);
-if (x_128 == 0)
+lean_object* x_136; uint8_t x_137; 
+x_136 = lean_ctor_get(x_135, 0);
+lean_inc(x_136);
+x_137 = lean_unbox(x_136);
+lean_dec(x_136);
+if (x_137 == 0)
 {
-lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-x_129 = lean_ctor_get(x_126, 1);
-lean_inc(x_129);
-if (lean_is_exclusive(x_126)) {
- lean_ctor_release(x_126, 0);
- lean_ctor_release(x_126, 1);
- x_130 = x_126;
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_138 = lean_ctor_get(x_135, 1);
+lean_inc(x_138);
+if (lean_is_exclusive(x_135)) {
+ lean_ctor_release(x_135, 0);
+ lean_ctor_release(x_135, 1);
+ x_139 = x_135;
 } else {
- lean_dec_ref(x_126);
- x_130 = lean_box(0);
+ lean_dec_ref(x_135);
+ x_139 = lean_box(0);
 }
-x_131 = lean_box(3);
-x_132 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_132, 0, x_131);
-lean_ctor_set(x_132, 1, x_2);
-if (lean_is_scalar(x_130)) {
- x_133 = lean_alloc_ctor(0, 2, 0);
+x_140 = lean_box(3);
+x_141 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_141, 0, x_140);
+lean_ctor_set(x_141, 1, x_2);
+if (lean_is_scalar(x_139)) {
+ x_142 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_133 = x_130;
+ x_142 = x_139;
 }
-lean_ctor_set(x_133, 0, x_132);
-lean_ctor_set(x_133, 1, x_129);
-return x_133;
-}
-else
-{
-lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-x_134 = lean_ctor_get(x_126, 1);
-lean_inc(x_134);
-if (lean_is_exclusive(x_126)) {
- lean_ctor_release(x_126, 0);
- lean_ctor_release(x_126, 1);
- x_135 = x_126;
-} else {
- lean_dec_ref(x_126);
- x_135 = lean_box(0);
-}
-x_136 = lean_box(4);
-x_137 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_137, 0, x_136);
-lean_ctor_set(x_137, 1, x_2);
-if (lean_is_scalar(x_135)) {
- x_138 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_138 = x_135;
-}
-lean_ctor_set(x_138, 0, x_137);
-lean_ctor_set(x_138, 1, x_134);
-return x_138;
-}
-}
-else
-{
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
-lean_dec(x_2);
-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);
+lean_ctor_set(x_142, 0, x_141);
+lean_ctor_set(x_142, 1, x_138);
 return x_142;
 }
+else
+{
+lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+x_143 = lean_ctor_get(x_135, 1);
+lean_inc(x_143);
+if (lean_is_exclusive(x_135)) {
+ lean_ctor_release(x_135, 0);
+ lean_ctor_release(x_135, 1);
+ x_144 = x_135;
+} else {
+ lean_dec_ref(x_135);
+ x_144 = lean_box(0);
+}
+x_145 = lean_box(4);
+x_146 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_146, 0, x_145);
+lean_ctor_set(x_146, 1, x_2);
+if (lean_is_scalar(x_144)) {
+ x_147 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_147 = x_144;
+}
+lean_ctor_set(x_147, 0, x_146);
+lean_ctor_set(x_147, 1, x_143);
+return x_147;
+}
 }
 else
 {
-lean_object* x_143; lean_object* x_144; lean_object* x_145; 
-lean_dec(x_123);
+lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+lean_dec(x_2);
+x_148 = lean_ctor_get(x_135, 0);
+lean_inc(x_148);
+x_149 = lean_ctor_get(x_135, 1);
+lean_inc(x_149);
+if (lean_is_exclusive(x_135)) {
+ lean_ctor_release(x_135, 0);
+ lean_ctor_release(x_135, 1);
+ x_150 = x_135;
+} else {
+ lean_dec_ref(x_135);
+ 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_dec(x_132);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_143 = lean_box(3);
-x_144 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_144, 0, x_143);
-lean_ctor_set(x_144, 1, x_2);
-x_145 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_145, 0, x_144);
-lean_ctor_set(x_145, 1, x_97);
-return x_145;
+x_152 = lean_box(3);
+x_153 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_153, 0, x_152);
+lean_ctor_set(x_153, 1, x_2);
+x_154 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_154, 0, x_153);
+lean_ctor_set(x_154, 1, x_106);
+return x_154;
 }
 }
 case 4:
 {
 if (x_1 == 0)
 {
-lean_object* x_146; lean_object* x_147; 
-x_146 = lean_ctor_get(x_98, 0);
-lean_inc(x_146);
+lean_object* x_155; lean_object* x_156; 
+x_155 = lean_ctor_get(x_107, 0);
+lean_inc(x_155);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_147 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_146, x_96, x_4, x_5, x_6, x_7, x_97);
-if (lean_obj_tag(x_147) == 0)
+x_156 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_155, x_105, x_4, x_5, x_6, x_7, x_106);
+if (lean_obj_tag(x_156) == 0)
 {
-lean_object* x_148; uint8_t x_149; 
-x_148 = lean_ctor_get(x_147, 0);
-lean_inc(x_148);
-x_149 = lean_unbox(x_148);
-lean_dec(x_148);
-if (x_149 == 0)
+lean_object* x_157; uint8_t x_158; 
+x_157 = lean_ctor_get(x_156, 0);
+lean_inc(x_157);
+x_158 = lean_unbox(x_157);
+lean_dec(x_157);
+if (x_158 == 0)
 {
-lean_object* x_150; lean_object* x_151; lean_object* x_152; 
-x_150 = lean_ctor_get(x_147, 1);
-lean_inc(x_150);
-lean_dec(x_147);
-x_151 = lean_box(0);
-x_152 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___lambda__1(x_96, x_146, x_98, x_2, x_151, x_4, x_5, x_6, x_7, x_150);
-return x_152;
+lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_159 = lean_ctor_get(x_156, 1);
+lean_inc(x_159);
+lean_dec(x_156);
+x_160 = lean_box(0);
+x_161 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___lambda__1(x_105, x_155, x_107, x_2, x_160, x_4, x_5, x_6, x_7, x_159);
+return x_161;
 }
 else
 {
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
-lean_dec(x_146);
-lean_dec(x_98);
-lean_dec(x_96);
+lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; 
+lean_dec(x_155);
+lean_dec(x_107);
+lean_dec(x_105);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_153 = lean_ctor_get(x_147, 1);
-lean_inc(x_153);
-if (lean_is_exclusive(x_147)) {
- lean_ctor_release(x_147, 0);
- lean_ctor_release(x_147, 1);
- x_154 = x_147;
+x_162 = lean_ctor_get(x_156, 1);
+lean_inc(x_162);
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ x_163 = x_156;
 } else {
- lean_dec_ref(x_147);
- x_154 = lean_box(0);
+ lean_dec_ref(x_156);
+ x_163 = lean_box(0);
 }
-x_155 = lean_box(3);
-x_156 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_156, 0, x_155);
-lean_ctor_set(x_156, 1, x_2);
-if (lean_is_scalar(x_154)) {
- x_157 = lean_alloc_ctor(0, 2, 0);
+x_164 = lean_box(3);
+x_165 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_165, 0, x_164);
+lean_ctor_set(x_165, 1, x_2);
+if (lean_is_scalar(x_163)) {
+ x_166 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_157 = x_154;
+ x_166 = x_163;
 }
-lean_ctor_set(x_157, 0, x_156);
-lean_ctor_set(x_157, 1, x_153);
-return x_157;
+lean_ctor_set(x_166, 0, x_165);
+lean_ctor_set(x_166, 1, x_162);
+return x_166;
 }
 }
 else
 {
-lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
-lean_dec(x_146);
-lean_dec(x_98);
-lean_dec(x_96);
+lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; 
+lean_dec(x_155);
+lean_dec(x_107);
+lean_dec(x_105);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_158 = lean_ctor_get(x_147, 0);
-lean_inc(x_158);
-x_159 = lean_ctor_get(x_147, 1);
-lean_inc(x_159);
-if (lean_is_exclusive(x_147)) {
- lean_ctor_release(x_147, 0);
- lean_ctor_release(x_147, 1);
- x_160 = x_147;
+x_167 = lean_ctor_get(x_156, 0);
+lean_inc(x_167);
+x_168 = lean_ctor_get(x_156, 1);
+lean_inc(x_168);
+if (lean_is_exclusive(x_156)) {
+ lean_ctor_release(x_156, 0);
+ lean_ctor_release(x_156, 1);
+ x_169 = x_156;
 } else {
- lean_dec_ref(x_147);
- x_160 = lean_box(0);
+ lean_dec_ref(x_156);
+ x_169 = lean_box(0);
 }
-if (lean_is_scalar(x_160)) {
- x_161 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_169)) {
+ x_170 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_161 = x_160;
+ x_170 = x_169;
 }
-lean_ctor_set(x_161, 0, x_158);
-lean_ctor_set(x_161, 1, x_159);
-return x_161;
+lean_ctor_set(x_170, 0, x_167);
+lean_ctor_set(x_170, 1, x_168);
+return x_170;
 }
 }
 else
 {
-lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-x_162 = lean_ctor_get(x_98, 0);
-lean_inc(x_162);
-x_163 = lean_box(0);
-x_164 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___lambda__1(x_96, x_162, x_98, x_2, x_163, x_4, x_5, x_6, x_7, x_97);
-return x_164;
+lean_object* x_171; lean_object* x_172; lean_object* x_173; 
+x_171 = lean_ctor_get(x_107, 0);
+lean_inc(x_171);
+x_172 = lean_box(0);
+x_173 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs___lambda__1(x_105, x_171, x_107, x_2, x_172, x_4, x_5, x_6, x_7, x_106);
+return x_173;
+}
+}
+case 7:
+{
+lean_object* x_174; lean_object* x_175; uint8_t x_176; 
+lean_dec(x_105);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_174 = lean_ctor_get(x_107, 1);
+lean_inc(x_174);
+x_175 = lean_ctor_get(x_107, 2);
+lean_inc(x_175);
+lean_dec(x_107);
+x_176 = l_Lean_Expr_hasLooseBVars(x_175);
+if (x_176 == 0)
+{
+lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; 
+x_177 = lean_array_push(x_2, x_174);
+x_178 = lean_array_push(x_177, x_175);
+x_179 = lean_box(5);
+x_180 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_180, 0, x_179);
+lean_ctor_set(x_180, 1, x_178);
+x_181 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_181, 0, x_180);
+lean_ctor_set(x_181, 1, x_106);
+return x_181;
+}
+else
+{
+lean_object* x_182; lean_object* x_183; lean_object* x_184; 
+lean_dec(x_175);
+lean_dec(x_174);
+x_182 = lean_box(4);
+x_183 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_183, 0, x_182);
+lean_ctor_set(x_183, 1, x_2);
+x_184 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_184, 0, x_183);
+lean_ctor_set(x_184, 1, x_106);
+return x_184;
 }
 }
 case 9:
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
-lean_dec(x_96);
+lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; 
+lean_dec(x_105);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_165 = lean_ctor_get(x_98, 0);
-lean_inc(x_165);
-lean_dec(x_98);
-x_166 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_166, 0, x_165);
-x_167 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_167, 0, x_166);
-lean_ctor_set(x_167, 1, x_2);
-x_168 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_168, 0, x_167);
-lean_ctor_set(x_168, 1, x_97);
-return x_168;
+x_185 = lean_ctor_get(x_107, 0);
+lean_inc(x_185);
+lean_dec(x_107);
+x_186 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_186, 0, x_185);
+x_187 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_187, 0, x_186);
+lean_ctor_set(x_187, 1, x_2);
+x_188 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_188, 0, x_187);
+lean_ctor_set(x_188, 1, x_106);
+return x_188;
 }
 default: 
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-lean_dec(x_98);
-lean_dec(x_96);
+lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+lean_dec(x_107);
+lean_dec(x_105);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_169 = lean_box(4);
-x_170 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_2);
-x_171 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_171, 0, x_170);
-lean_ctor_set(x_171, 1, x_97);
-return x_171;
+x_189 = lean_box(4);
+x_190 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_190, 0, x_189);
+lean_ctor_set(x_190, 1, x_2);
+x_191 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_191, 0, x_190);
+lean_ctor_set(x_191, 1, x_106);
+return x_191;
 }
 }
 }
 }
 else
 {
-uint8_t x_172; 
+uint8_t x_192; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_172 = !lean_is_exclusive(x_10);
-if (x_172 == 0)
+x_192 = !lean_is_exclusive(x_10);
+if (x_192 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; 
-x_173 = lean_ctor_get(x_10, 0);
-x_174 = lean_ctor_get(x_10, 1);
-lean_inc(x_174);
-lean_inc(x_173);
+lean_object* x_193; lean_object* x_194; lean_object* x_195; 
+x_193 = lean_ctor_get(x_10, 0);
+x_194 = lean_ctor_get(x_10, 1);
+lean_inc(x_194);
+lean_inc(x_193);
 lean_dec(x_10);
-x_175 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_175, 0, x_173);
-lean_ctor_set(x_175, 1, x_174);
-return x_175;
+x_195 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_195, 0, x_193);
+lean_ctor_set(x_195, 1, x_194);
+return x_195;
 }
 }
 }
 else
 {
-lean_object* x_176; lean_object* x_177; lean_object* x_178; 
+lean_object* x_196; lean_object* x_197; lean_object* x_198; 
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_176 = lean_box(3);
-x_177 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_177, 0, x_176);
-lean_ctor_set(x_177, 1, x_2);
-x_178 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_178, 0, x_177);
-lean_ctor_set(x_178, 1, x_8);
-return x_178;
+x_196 = lean_box(3);
+x_197 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_197, 0, x_196);
+lean_ctor_set(x_197, 1, x_2);
+x_198 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_198, 0, x_197);
+lean_ctor_set(x_198, 1, x_8);
+return x_198;
 }
 }
 }
@@ -5398,7 +5609,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -5456,7 +5667,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -5623,7 +5834,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_17);
+x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -5720,7 +5931,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_19);
+x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -5754,7 +5965,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_26);
+x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -5875,7 +6086,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_60);
+x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
@@ -6186,7 +6397,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_17);
+x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -6283,7 +6494,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_19);
+x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -6317,7 +6528,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_26);
+x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -6438,7 +6649,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_60);
+x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
@@ -6700,7 +6911,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_DiscrTree_insertCore___rarg___closed__2;
 x_2 = l_Lean_Meta_DiscrTree_insertCore___rarg___closed__3;
-x_3 = lean_unsigned_to_nat(302u);
+x_3 = lean_unsigned_to_nat(310u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Meta_DiscrTree_insertCore___rarg___closed__4;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -7144,299 +7355,377 @@ lean_ctor_set(x_50, 1, x_49);
 lean_ctor_set(x_8, 0, x_50);
 return x_8;
 }
-case 9:
+case 7:
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+lean_object* x_51; lean_object* x_52; uint8_t x_53; 
 lean_dec(x_10);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_51 = lean_ctor_get(x_12, 0);
+x_51 = lean_ctor_get(x_12, 1);
 lean_inc(x_51);
+x_52 = lean_ctor_get(x_12, 2);
+lean_inc(x_52);
 lean_dec(x_12);
-x_52 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_52, 0, x_51);
-x_53 = l_Array_empty___closed__1;
-x_54 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set(x_54, 1, x_53);
-lean_ctor_set(x_8, 0, x_54);
+x_53 = l_Lean_Expr_hasLooseBVars(x_52);
+if (x_53 == 0)
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_54 = l_Lean_Syntax_mkApp___closed__1;
+x_55 = lean_array_push(x_54, x_51);
+x_56 = lean_array_push(x_55, x_52);
+x_57 = lean_box(5);
+x_58 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_58, 0, x_57);
+lean_ctor_set(x_58, 1, x_56);
+lean_ctor_set(x_8, 0, x_58);
+return x_8;
+}
+else
+{
+lean_object* x_59; 
+lean_dec(x_52);
+lean_dec(x_51);
+x_59 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+lean_ctor_set(x_8, 0, x_59);
+return x_8;
+}
+}
+case 9:
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+lean_dec(x_10);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_60 = lean_ctor_get(x_12, 0);
+lean_inc(x_60);
+lean_dec(x_12);
+x_61 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_61, 0, x_60);
+x_62 = l_Array_empty___closed__1;
+x_63 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+lean_ctor_set(x_8, 0, x_63);
 return x_8;
 }
 default: 
 {
-lean_object* x_55; 
+lean_object* x_64; 
 lean_dec(x_12);
 lean_dec(x_10);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_55 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
-lean_ctor_set(x_8, 0, x_55);
+x_64 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+lean_ctor_set(x_8, 0, x_64);
 return x_8;
 }
 }
 }
 else
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_56 = lean_ctor_get(x_8, 0);
-x_57 = lean_ctor_get(x_8, 1);
-lean_inc(x_57);
-lean_inc(x_56);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_8, 0);
+x_66 = lean_ctor_get(x_8, 1);
+lean_inc(x_66);
+lean_inc(x_65);
 lean_dec(x_8);
-x_58 = l_Lean_Expr_getAppFn(x_56);
-switch (lean_obj_tag(x_58)) {
+x_67 = l_Lean_Expr_getAppFn(x_65);
+switch (lean_obj_tag(x_67)) {
 case 1:
 {
-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_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_59 = lean_ctor_get(x_58, 0);
-lean_inc(x_59);
-lean_dec(x_58);
-x_60 = lean_unsigned_to_nat(0u);
-x_61 = l_Lean_Expr_getAppNumArgsAux(x_56, x_60);
-lean_inc(x_61);
-x_62 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_62, 0, x_59);
-lean_ctor_set(x_62, 1, x_61);
-x_63 = lean_mk_empty_array_with_capacity(x_61);
-lean_dec(x_61);
-x_64 = l___private_Lean_Expr_0__Lean_Expr_getAppRevArgsAux(x_56, x_63);
-x_65 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_65, 0, x_62);
-lean_ctor_set(x_65, 1, x_64);
-x_66 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_57);
-return x_66;
+x_68 = lean_ctor_get(x_67, 0);
+lean_inc(x_68);
+lean_dec(x_67);
+x_69 = lean_unsigned_to_nat(0u);
+x_70 = l_Lean_Expr_getAppNumArgsAux(x_65, x_69);
+lean_inc(x_70);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_68);
+lean_ctor_set(x_71, 1, x_70);
+x_72 = lean_mk_empty_array_with_capacity(x_70);
+lean_dec(x_70);
+x_73 = l___private_Lean_Expr_0__Lean_Expr_getAppRevArgsAux(x_65, x_72);
+x_74 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_74, 0, x_71);
+lean_ctor_set(x_74, 1, x_73);
+x_75 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_75, 0, x_74);
+lean_ctor_set(x_75, 1, x_66);
+return x_75;
 }
 case 2:
 {
-lean_dec(x_56);
+lean_dec(x_65);
 if (x_2 == 0)
 {
-lean_object* x_67; uint8_t x_68; 
-x_67 = lean_ctor_get(x_3, 0);
-lean_inc(x_67);
-x_68 = lean_ctor_get_uint8(x_67, 4);
-lean_dec(x_67);
-if (x_68 == 0)
+lean_object* x_76; uint8_t x_77; 
+x_76 = lean_ctor_get(x_3, 0);
+lean_inc(x_76);
+x_77 = lean_ctor_get_uint8(x_76, 4);
+lean_dec(x_76);
+if (x_77 == 0)
 {
-lean_object* x_69; lean_object* x_70; 
-x_69 = lean_ctor_get(x_58, 0);
-lean_inc(x_69);
-lean_dec(x_58);
-x_70 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_69, x_3, x_4, x_5, x_6, x_57);
+lean_object* x_78; lean_object* x_79; 
+x_78 = lean_ctor_get(x_67, 0);
+lean_inc(x_78);
+lean_dec(x_67);
+x_79 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_78, x_3, x_4, x_5, x_6, x_66);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-if (lean_obj_tag(x_70) == 0)
+if (lean_obj_tag(x_79) == 0)
 {
-lean_object* x_71; uint8_t x_72; 
-x_71 = lean_ctor_get(x_70, 0);
-lean_inc(x_71);
-x_72 = lean_unbox(x_71);
-lean_dec(x_71);
-if (x_72 == 0)
+lean_object* x_80; uint8_t x_81; 
+x_80 = lean_ctor_get(x_79, 0);
+lean_inc(x_80);
+x_81 = lean_unbox(x_80);
+lean_dec(x_80);
+if (x_81 == 0)
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_73 = lean_ctor_get(x_70, 1);
-lean_inc(x_73);
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- x_74 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_74 = lean_box(0);
-}
-x_75 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__2;
-if (lean_is_scalar(x_74)) {
- x_76 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_76 = x_74;
-}
-lean_ctor_set(x_76, 0, x_75);
-lean_ctor_set(x_76, 1, x_73);
-return x_76;
-}
-else
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_77 = lean_ctor_get(x_70, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- x_78 = x_70;
-} else {
- lean_dec_ref(x_70);
- x_78 = lean_box(0);
-}
-x_79 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
-if (lean_is_scalar(x_78)) {
- x_80 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_80 = x_78;
-}
-lean_ctor_set(x_80, 0, x_79);
-lean_ctor_set(x_80, 1, x_77);
-return x_80;
-}
-}
-else
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_81 = lean_ctor_get(x_70, 0);
-lean_inc(x_81);
-x_82 = lean_ctor_get(x_70, 1);
+lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_82 = lean_ctor_get(x_79, 1);
 lean_inc(x_82);
-if (lean_is_exclusive(x_70)) {
- lean_ctor_release(x_70, 0);
- lean_ctor_release(x_70, 1);
- x_83 = x_70;
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_83 = x_79;
 } else {
- lean_dec_ref(x_70);
+ lean_dec_ref(x_79);
  x_83 = lean_box(0);
 }
+x_84 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__2;
 if (lean_is_scalar(x_83)) {
- x_84 = lean_alloc_ctor(1, 2, 0);
+ x_85 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_84 = x_83;
+ x_85 = x_83;
 }
-lean_ctor_set(x_84, 0, x_81);
-lean_ctor_set(x_84, 1, x_82);
-return x_84;
+lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 1, x_82);
+return x_85;
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_86 = lean_ctor_get(x_79, 1);
+lean_inc(x_86);
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_87 = x_79;
+} else {
+ lean_dec_ref(x_79);
+ x_87 = lean_box(0);
+}
+x_88 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+if (lean_is_scalar(x_87)) {
+ x_89 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_89 = x_87;
+}
+lean_ctor_set(x_89, 0, x_88);
+lean_ctor_set(x_89, 1, x_86);
+return x_89;
 }
 }
 else
 {
-lean_object* x_85; lean_object* x_86; 
-lean_dec(x_58);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-x_85 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__2;
-x_86 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_86, 0, x_85);
-lean_ctor_set(x_86, 1, x_57);
-return x_86;
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_90 = lean_ctor_get(x_79, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_79, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_79)) {
+ lean_ctor_release(x_79, 0);
+ lean_ctor_release(x_79, 1);
+ x_92 = x_79;
+} else {
+ lean_dec_ref(x_79);
+ x_92 = lean_box(0);
+}
+if (lean_is_scalar(x_92)) {
+ x_93 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_93 = x_92;
+}
+lean_ctor_set(x_93, 0, x_90);
+lean_ctor_set(x_93, 1, x_91);
+return x_93;
 }
 }
 else
 {
-lean_object* x_87; lean_object* x_88; 
-lean_dec(x_58);
+lean_object* x_94; lean_object* x_95; 
+lean_dec(x_67);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_87 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
-x_88 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_88, 0, x_87);
-lean_ctor_set(x_88, 1, x_57);
-return x_88;
+x_94 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__2;
+x_95 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_95, 0, x_94);
+lean_ctor_set(x_95, 1, x_66);
+return x_95;
+}
+}
+else
+{
+lean_object* x_96; lean_object* x_97; 
+lean_dec(x_67);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_96 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+x_97 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_97, 0, x_96);
+lean_ctor_set(x_97, 1, x_66);
+return x_97;
 }
 }
 case 4:
 {
-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_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_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_89 = lean_ctor_get(x_58, 0);
-lean_inc(x_89);
-lean_dec(x_58);
-x_90 = lean_unsigned_to_nat(0u);
-x_91 = l_Lean_Expr_getAppNumArgsAux(x_56, x_90);
-lean_inc(x_91);
-x_92 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_92, 0, x_89);
-lean_ctor_set(x_92, 1, x_91);
-x_93 = lean_mk_empty_array_with_capacity(x_91);
-lean_dec(x_91);
-x_94 = l___private_Lean_Expr_0__Lean_Expr_getAppRevArgsAux(x_56, x_93);
-x_95 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_95, 0, x_92);
-lean_ctor_set(x_95, 1, x_94);
-x_96 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_96, 0, x_95);
-lean_ctor_set(x_96, 1, x_57);
-return x_96;
+x_98 = lean_ctor_get(x_67, 0);
+lean_inc(x_98);
+lean_dec(x_67);
+x_99 = lean_unsigned_to_nat(0u);
+x_100 = l_Lean_Expr_getAppNumArgsAux(x_65, x_99);
+lean_inc(x_100);
+x_101 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_101, 0, x_98);
+lean_ctor_set(x_101, 1, x_100);
+x_102 = lean_mk_empty_array_with_capacity(x_100);
+lean_dec(x_100);
+x_103 = l___private_Lean_Expr_0__Lean_Expr_getAppRevArgsAux(x_65, x_102);
+x_104 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_101);
+lean_ctor_set(x_104, 1, x_103);
+x_105 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_105, 0, x_104);
+lean_ctor_set(x_105, 1, x_66);
+return x_105;
+}
+case 7:
+{
+lean_object* x_106; lean_object* x_107; uint8_t x_108; 
+lean_dec(x_65);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+x_106 = lean_ctor_get(x_67, 1);
+lean_inc(x_106);
+x_107 = lean_ctor_get(x_67, 2);
+lean_inc(x_107);
+lean_dec(x_67);
+x_108 = l_Lean_Expr_hasLooseBVars(x_107);
+if (x_108 == 0)
+{
+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 = l_Lean_Syntax_mkApp___closed__1;
+x_110 = lean_array_push(x_109, x_106);
+x_111 = lean_array_push(x_110, x_107);
+x_112 = lean_box(5);
+x_113 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_113, 0, x_112);
+lean_ctor_set(x_113, 1, x_111);
+x_114 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_114, 0, x_113);
+lean_ctor_set(x_114, 1, x_66);
+return x_114;
+}
+else
+{
+lean_object* x_115; lean_object* x_116; 
+lean_dec(x_107);
+lean_dec(x_106);
+x_115 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+x_116 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_116, 0, x_115);
+lean_ctor_set(x_116, 1, x_66);
+return x_116;
+}
 }
 case 9:
 {
-lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-lean_dec(x_56);
+lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+lean_dec(x_65);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_97 = lean_ctor_get(x_58, 0);
-lean_inc(x_97);
-lean_dec(x_58);
-x_98 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_98, 0, x_97);
-x_99 = l_Array_empty___closed__1;
-x_100 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-x_101 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_101, 0, x_100);
-lean_ctor_set(x_101, 1, x_57);
-return x_101;
+x_117 = lean_ctor_get(x_67, 0);
+lean_inc(x_117);
+lean_dec(x_67);
+x_118 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_118, 0, x_117);
+x_119 = l_Array_empty___closed__1;
+x_120 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_120, 0, x_118);
+lean_ctor_set(x_120, 1, x_119);
+x_121 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_121, 0, x_120);
+lean_ctor_set(x_121, 1, x_66);
+return x_121;
 }
 default: 
 {
-lean_object* x_102; lean_object* x_103; 
-lean_dec(x_58);
-lean_dec(x_56);
+lean_object* x_122; lean_object* x_123; 
+lean_dec(x_67);
+lean_dec(x_65);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_102 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
-x_103 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_103, 0, x_102);
-lean_ctor_set(x_103, 1, x_57);
-return x_103;
+x_122 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs___closed__1;
+x_123 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_123, 0, x_122);
+lean_ctor_set(x_123, 1, x_66);
+return x_123;
 }
 }
 }
 }
 else
 {
-uint8_t x_104; 
+uint8_t x_124; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_104 = !lean_is_exclusive(x_8);
-if (x_104 == 0)
+x_124 = !lean_is_exclusive(x_8);
+if (x_124 == 0)
 {
 return x_8;
 }
 else
 {
-lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_105 = lean_ctor_get(x_8, 0);
-x_106 = lean_ctor_get(x_8, 1);
-lean_inc(x_106);
-lean_inc(x_105);
+lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+x_125 = lean_ctor_get(x_8, 0);
+x_126 = lean_ctor_get(x_8, 1);
+lean_inc(x_126);
+lean_inc(x_125);
 lean_dec(x_8);
-x_107 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_107, 0, x_105);
-lean_ctor_set(x_107, 1, x_106);
-return x_107;
+x_127 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_127, 0, x_125);
+lean_ctor_set(x_127, 1, x_126);
+return x_127;
 }
 }
 }
@@ -7523,7 +7812,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -7581,7 +7870,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -8143,6 +8432,95 @@ x_2 = lean_alloc_closure((void*)(l_Array_binSearchAux___at_Lean_Meta_DiscrTree_g
 return x_2;
 }
 }
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = lean_nat_dec_le(x_3, x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_4);
+lean_dec(x_3);
+x_6 = lean_box(0);
+return x_6;
+}
+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; uint8_t x_14; 
+x_7 = lean_nat_add(x_3, x_4);
+x_8 = lean_unsigned_to_nat(2u);
+x_9 = lean_nat_div(x_7, x_8);
+lean_dec(x_7);
+x_10 = l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
+x_11 = lean_array_get(x_10, x_1, x_9);
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_2, 0);
+x_14 = l_Lean_Meta_DiscrTree_Key_lt(x_12, x_13);
+if (x_14 == 0)
+{
+uint8_t x_15; 
+lean_dec(x_4);
+x_15 = l_Lean_Meta_DiscrTree_Key_lt(x_13, x_12);
+lean_dec(x_12);
+if (x_15 == 0)
+{
+lean_object* x_16; 
+lean_dec(x_9);
+lean_dec(x_3);
+x_16 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_16, 0, x_11);
+return x_16;
+}
+else
+{
+lean_object* x_17; uint8_t x_18; 
+lean_dec(x_11);
+x_17 = lean_unsigned_to_nat(0u);
+x_18 = lean_nat_dec_eq(x_9, x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_sub(x_9, x_19);
+lean_dec(x_9);
+x_4 = x_20;
+goto _start;
+}
+else
+{
+lean_object* x_22; 
+lean_dec(x_9);
+lean_dec(x_3);
+x_22 = lean_box(0);
+return x_22;
+}
+}
+}
+else
+{
+lean_object* x_23; lean_object* x_24; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_3);
+x_23 = lean_unsigned_to_nat(1u);
+x_24 = lean_nat_add(x_9, x_23);
+lean_dec(x_9);
+x_3 = x_24;
+goto _start;
+}
+}
+}
+}
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg___boxed), 4, 0);
+return x_2;
+}
+}
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process___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:
 {
@@ -8208,7 +8586,7 @@ lean_dec(x_10);
 x_50 = lean_ctor_get(x_17, 0);
 lean_inc(x_50);
 x_51 = lean_box(3);
-x_52 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_50, x_51);
+x_52 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_50, x_51);
 lean_dec(x_50);
 if (x_52 == 0)
 {
@@ -8247,7 +8625,7 @@ lean_dec(x_25);
 x_56 = lean_ctor_get(x_17, 0);
 lean_inc(x_56);
 x_57 = lean_box(3);
-x_58 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_56, x_57);
+x_58 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_56, x_57);
 lean_dec(x_56);
 if (x_58 == 0)
 {
@@ -8305,7 +8683,7 @@ lean_dec(x_10);
 x_67 = lean_ctor_get(x_17, 0);
 lean_inc(x_67);
 x_68 = lean_box(3);
-x_69 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_67, x_68);
+x_69 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_67, x_68);
 lean_dec(x_67);
 if (x_69 == 0)
 {
@@ -8344,7 +8722,7 @@ lean_dec(x_25);
 x_73 = lean_ctor_get(x_17, 0);
 lean_inc(x_73);
 x_74 = lean_box(3);
-x_75 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_73, x_74);
+x_75 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_73, x_74);
 lean_dec(x_73);
 if (x_75 == 0)
 {
@@ -8402,7 +8780,7 @@ lean_dec(x_10);
 x_84 = lean_ctor_get(x_17, 0);
 lean_inc(x_84);
 x_85 = lean_box(3);
-x_86 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_84, x_85);
+x_86 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_84, x_85);
 lean_dec(x_84);
 if (x_86 == 0)
 {
@@ -8441,7 +8819,7 @@ lean_dec(x_25);
 x_90 = lean_ctor_get(x_17, 0);
 lean_inc(x_90);
 x_91 = lean_box(3);
-x_92 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_90, x_91);
+x_92 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_90, x_91);
 lean_dec(x_90);
 if (x_92 == 0)
 {
@@ -8488,7 +8866,7 @@ lean_dec(x_10);
 x_96 = lean_ctor_get(x_17, 0);
 lean_inc(x_96);
 x_97 = lean_box(3);
-x_98 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_96, x_97);
+x_98 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_96, x_97);
 lean_dec(x_96);
 if (x_98 == 0)
 {
@@ -8514,7 +8892,7 @@ x_8 = x_23;
 goto _start;
 }
 }
-default: 
+case 4:
 {
 lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; 
 x_101 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
@@ -8534,7 +8912,7 @@ lean_dec(x_10);
 x_106 = lean_ctor_get(x_17, 0);
 lean_inc(x_106);
 x_107 = lean_box(3);
-x_108 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_106, x_107);
+x_108 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_106, x_107);
 lean_dec(x_106);
 if (x_108 == 0)
 {
@@ -8573,7 +8951,7 @@ lean_dec(x_25);
 x_112 = lean_ctor_get(x_17, 0);
 lean_inc(x_112);
 x_113 = lean_box(3);
-x_114 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_112, x_113);
+x_114 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_112, x_113);
 lean_dec(x_112);
 if (x_114 == 0)
 {
@@ -8611,6 +8989,103 @@ goto block_44;
 }
 }
 }
+default: 
+{
+lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; uint8_t x_122; 
+x_118 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+lean_ctor_set(x_21, 1, x_118);
+x_119 = lean_array_get_size(x_10);
+x_120 = lean_unsigned_to_nat(1u);
+x_121 = lean_nat_sub(x_119, x_120);
+x_122 = lean_nat_dec_lt(x_16, x_119);
+lean_dec(x_119);
+if (x_122 == 0)
+{
+lean_object* x_123; lean_object* x_124; uint8_t x_125; 
+lean_dec(x_121);
+lean_dec(x_21);
+lean_dec(x_25);
+lean_dec(x_10);
+x_123 = lean_ctor_get(x_17, 0);
+lean_inc(x_123);
+x_124 = lean_box(3);
+x_125 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_123, x_124);
+lean_dec(x_123);
+if (x_125 == 0)
+{
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_126; 
+lean_free_object(x_19);
+x_126 = lean_ctor_get(x_17, 1);
+lean_inc(x_126);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_126;
+x_8 = x_23;
+goto _start;
+}
+}
+else
+{
+lean_object* x_128; 
+x_128 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(x_10, x_21, x_16, x_121);
+lean_dec(x_21);
+lean_dec(x_10);
+if (lean_obj_tag(x_128) == 0)
+{
+lean_object* x_129; lean_object* x_130; uint8_t x_131; 
+lean_dec(x_25);
+x_129 = lean_ctor_get(x_17, 0);
+lean_inc(x_129);
+x_130 = lean_box(3);
+x_131 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_129, x_130);
+lean_dec(x_129);
+if (x_131 == 0)
+{
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_132; 
+lean_free_object(x_19);
+x_132 = lean_ctor_get(x_17, 1);
+lean_inc(x_132);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_132;
+x_8 = x_23;
+goto _start;
+}
+}
+else
+{
+lean_object* x_134; 
+lean_free_object(x_19);
+x_134 = lean_ctor_get(x_128, 0);
+lean_inc(x_134);
+lean_dec(x_128);
+x_26 = x_134;
+goto block_44;
+}
+}
+}
 }
 block_44:
 {
@@ -8618,7 +9093,7 @@ lean_object* x_27; lean_object* x_28; uint8_t x_29;
 x_27 = lean_ctor_get(x_17, 0);
 lean_inc(x_27);
 x_28 = lean_box(3);
-x_29 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_27, x_28);
+x_29 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_27, x_28);
 lean_dec(x_27);
 if (x_29 == 0)
 {
@@ -8699,39 +9174,39 @@ return x_43;
 }
 else
 {
-lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_118 = lean_ctor_get(x_19, 1);
-x_119 = lean_ctor_get(x_21, 0);
-x_120 = lean_ctor_get(x_21, 1);
-lean_inc(x_120);
-lean_inc(x_119);
+lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_135 = lean_ctor_get(x_19, 1);
+x_136 = lean_ctor_get(x_21, 0);
+x_137 = lean_ctor_get(x_21, 1);
+lean_inc(x_137);
+lean_inc(x_136);
 lean_dec(x_21);
-switch (lean_obj_tag(x_119)) {
+switch (lean_obj_tag(x_136)) {
 case 0:
 {
-lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; uint8_t x_145; 
-x_140 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-x_141 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_141, 0, x_119);
-lean_ctor_set(x_141, 1, x_140);
-x_142 = lean_array_get_size(x_10);
-x_143 = lean_unsigned_to_nat(1u);
-x_144 = lean_nat_sub(x_142, x_143);
-x_145 = lean_nat_dec_lt(x_16, x_142);
-lean_dec(x_142);
-if (x_145 == 0)
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; uint8_t x_162; 
+x_157 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_158 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_158, 0, x_136);
+lean_ctor_set(x_158, 1, x_157);
+x_159 = lean_array_get_size(x_10);
+x_160 = lean_unsigned_to_nat(1u);
+x_161 = lean_nat_sub(x_159, x_160);
+x_162 = lean_nat_dec_lt(x_16, x_159);
+lean_dec(x_159);
+if (x_162 == 0)
 {
-lean_object* x_146; lean_object* x_147; uint8_t x_148; 
-lean_dec(x_144);
-lean_dec(x_141);
-lean_dec(x_120);
+lean_object* x_163; lean_object* x_164; uint8_t x_165; 
+lean_dec(x_161);
+lean_dec(x_158);
+lean_dec(x_137);
 lean_dec(x_10);
-x_146 = lean_ctor_get(x_17, 0);
-lean_inc(x_146);
-x_147 = lean_box(3);
-x_148 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_146, x_147);
-lean_dec(x_146);
-if (x_148 == 0)
+x_163 = lean_ctor_get(x_17, 0);
+lean_inc(x_163);
+x_164 = lean_box(3);
+x_165 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_163, x_164);
+lean_dec(x_163);
+if (x_165 == 0)
 {
 lean_dec(x_17);
 lean_dec(x_14);
@@ -8744,33 +9219,33 @@ return x_19;
 }
 else
 {
-lean_object* x_149; 
+lean_object* x_166; 
 lean_free_object(x_19);
-x_149 = lean_ctor_get(x_17, 1);
-lean_inc(x_149);
+x_166 = lean_ctor_get(x_17, 1);
+lean_inc(x_166);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_149;
-x_8 = x_118;
+x_2 = x_166;
+x_8 = x_135;
 goto _start;
 }
 }
 else
 {
-lean_object* x_151; 
-x_151 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__1___rarg(x_10, x_141, x_16, x_144);
-lean_dec(x_141);
+lean_object* x_168; 
+x_168 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__1___rarg(x_10, x_158, x_16, x_161);
+lean_dec(x_158);
 lean_dec(x_10);
-if (lean_obj_tag(x_151) == 0)
+if (lean_obj_tag(x_168) == 0)
 {
-lean_object* x_152; lean_object* x_153; uint8_t x_154; 
-lean_dec(x_120);
-x_152 = lean_ctor_get(x_17, 0);
-lean_inc(x_152);
-x_153 = lean_box(3);
-x_154 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_152, x_153);
-lean_dec(x_152);
-if (x_154 == 0)
+lean_object* x_169; lean_object* x_170; uint8_t x_171; 
+lean_dec(x_137);
+x_169 = lean_ctor_get(x_17, 0);
+lean_inc(x_169);
+x_170 = lean_box(3);
+x_171 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_169, x_170);
+lean_dec(x_169);
+if (x_171 == 0)
 {
 lean_dec(x_17);
 lean_dec(x_14);
@@ -8783,54 +9258,54 @@ return x_19;
 }
 else
 {
-lean_object* x_155; 
+lean_object* x_172; 
 lean_free_object(x_19);
-x_155 = lean_ctor_get(x_17, 1);
-lean_inc(x_155);
+x_172 = lean_ctor_get(x_17, 1);
+lean_inc(x_172);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_155;
-x_8 = x_118;
+x_2 = x_172;
+x_8 = x_135;
 goto _start;
 }
 }
 else
 {
-lean_object* x_157; 
+lean_object* x_174; 
 lean_free_object(x_19);
-x_157 = lean_ctor_get(x_151, 0);
-lean_inc(x_157);
-lean_dec(x_151);
-x_121 = x_157;
-goto block_139;
+x_174 = lean_ctor_get(x_168, 0);
+lean_inc(x_174);
+lean_dec(x_168);
+x_138 = x_174;
+goto block_156;
 }
 }
 }
 case 1:
 {
-lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; uint8_t x_163; 
-x_158 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-x_159 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_159, 0, x_119);
-lean_ctor_set(x_159, 1, x_158);
-x_160 = lean_array_get_size(x_10);
-x_161 = lean_unsigned_to_nat(1u);
-x_162 = lean_nat_sub(x_160, x_161);
-x_163 = lean_nat_dec_lt(x_16, x_160);
-lean_dec(x_160);
-if (x_163 == 0)
+lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; uint8_t x_180; 
+x_175 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_176 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_176, 0, x_136);
+lean_ctor_set(x_176, 1, x_175);
+x_177 = lean_array_get_size(x_10);
+x_178 = lean_unsigned_to_nat(1u);
+x_179 = lean_nat_sub(x_177, x_178);
+x_180 = lean_nat_dec_lt(x_16, x_177);
+lean_dec(x_177);
+if (x_180 == 0)
 {
-lean_object* x_164; lean_object* x_165; uint8_t x_166; 
-lean_dec(x_162);
-lean_dec(x_159);
-lean_dec(x_120);
+lean_object* x_181; lean_object* x_182; uint8_t x_183; 
+lean_dec(x_179);
+lean_dec(x_176);
+lean_dec(x_137);
 lean_dec(x_10);
-x_164 = lean_ctor_get(x_17, 0);
-lean_inc(x_164);
-x_165 = lean_box(3);
-x_166 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_164, x_165);
-lean_dec(x_164);
-if (x_166 == 0)
+x_181 = lean_ctor_get(x_17, 0);
+lean_inc(x_181);
+x_182 = lean_box(3);
+x_183 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_181, x_182);
+lean_dec(x_181);
+if (x_183 == 0)
 {
 lean_dec(x_17);
 lean_dec(x_14);
@@ -8843,33 +9318,33 @@ return x_19;
 }
 else
 {
-lean_object* x_167; 
+lean_object* x_184; 
 lean_free_object(x_19);
-x_167 = lean_ctor_get(x_17, 1);
-lean_inc(x_167);
+x_184 = lean_ctor_get(x_17, 1);
+lean_inc(x_184);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_167;
-x_8 = x_118;
+x_2 = x_184;
+x_8 = x_135;
 goto _start;
 }
 }
 else
 {
-lean_object* x_169; 
-x_169 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__2___rarg(x_10, x_159, x_16, x_162);
-lean_dec(x_159);
+lean_object* x_186; 
+x_186 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__2___rarg(x_10, x_176, x_16, x_179);
+lean_dec(x_176);
 lean_dec(x_10);
-if (lean_obj_tag(x_169) == 0)
+if (lean_obj_tag(x_186) == 0)
 {
-lean_object* x_170; lean_object* x_171; uint8_t x_172; 
-lean_dec(x_120);
-x_170 = lean_ctor_get(x_17, 0);
-lean_inc(x_170);
-x_171 = lean_box(3);
-x_172 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_170, x_171);
-lean_dec(x_170);
-if (x_172 == 0)
+lean_object* x_187; lean_object* x_188; uint8_t x_189; 
+lean_dec(x_137);
+x_187 = lean_ctor_get(x_17, 0);
+lean_inc(x_187);
+x_188 = lean_box(3);
+x_189 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_187, x_188);
+lean_dec(x_187);
+if (x_189 == 0)
 {
 lean_dec(x_17);
 lean_dec(x_14);
@@ -8882,139 +9357,54 @@ return x_19;
 }
 else
 {
-lean_object* x_173; 
+lean_object* x_190; 
 lean_free_object(x_19);
-x_173 = lean_ctor_get(x_17, 1);
-lean_inc(x_173);
+x_190 = lean_ctor_get(x_17, 1);
+lean_inc(x_190);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_173;
-x_8 = x_118;
+x_2 = x_190;
+x_8 = x_135;
 goto _start;
 }
 }
 else
 {
-lean_object* x_175; 
+lean_object* x_192; 
 lean_free_object(x_19);
-x_175 = lean_ctor_get(x_169, 0);
-lean_inc(x_175);
-lean_dec(x_169);
-x_121 = x_175;
-goto block_139;
+x_192 = lean_ctor_get(x_186, 0);
+lean_inc(x_192);
+lean_dec(x_186);
+x_138 = x_192;
+goto block_156;
 }
 }
 }
 case 2:
 {
-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 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-x_177 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_177, 0, x_119);
-lean_ctor_set(x_177, 1, x_176);
-x_178 = lean_array_get_size(x_10);
-x_179 = lean_unsigned_to_nat(1u);
-x_180 = lean_nat_sub(x_178, x_179);
-x_181 = lean_nat_dec_lt(x_16, x_178);
-lean_dec(x_178);
-if (x_181 == 0)
+lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; uint8_t x_198; 
+x_193 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_194 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_194, 0, x_136);
+lean_ctor_set(x_194, 1, x_193);
+x_195 = lean_array_get_size(x_10);
+x_196 = lean_unsigned_to_nat(1u);
+x_197 = lean_nat_sub(x_195, x_196);
+x_198 = lean_nat_dec_lt(x_16, x_195);
+lean_dec(x_195);
+if (x_198 == 0)
 {
-lean_object* x_182; lean_object* x_183; uint8_t x_184; 
-lean_dec(x_180);
-lean_dec(x_177);
-lean_dec(x_120);
-lean_dec(x_10);
-x_182 = lean_ctor_get(x_17, 0);
-lean_inc(x_182);
-x_183 = lean_box(3);
-x_184 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_182, x_183);
-lean_dec(x_182);
-if (x_184 == 0)
-{
-lean_dec(x_17);
-lean_dec(x_14);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_ctor_set(x_19, 0, x_3);
-return x_19;
-}
-else
-{
-lean_object* x_185; 
-lean_free_object(x_19);
-x_185 = lean_ctor_get(x_17, 1);
-lean_inc(x_185);
-lean_dec(x_17);
-x_1 = x_14;
-x_2 = x_185;
-x_8 = x_118;
-goto _start;
-}
-}
-else
-{
-lean_object* x_187; 
-x_187 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3___rarg(x_10, x_177, x_16, x_180);
-lean_dec(x_177);
-lean_dec(x_10);
-if (lean_obj_tag(x_187) == 0)
-{
-lean_object* x_188; lean_object* x_189; uint8_t x_190; 
-lean_dec(x_120);
-x_188 = lean_ctor_get(x_17, 0);
-lean_inc(x_188);
-x_189 = lean_box(3);
-x_190 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_188, x_189);
-lean_dec(x_188);
-if (x_190 == 0)
-{
-lean_dec(x_17);
-lean_dec(x_14);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_ctor_set(x_19, 0, x_3);
-return x_19;
-}
-else
-{
-lean_object* x_191; 
-lean_free_object(x_19);
-x_191 = lean_ctor_get(x_17, 1);
-lean_inc(x_191);
-lean_dec(x_17);
-x_1 = x_14;
-x_2 = x_191;
-x_8 = x_118;
-goto _start;
-}
-}
-else
-{
-lean_object* x_193; 
-lean_free_object(x_19);
-x_193 = lean_ctor_get(x_187, 0);
-lean_inc(x_193);
-lean_dec(x_187);
-x_121 = x_193;
-goto block_139;
-}
-}
-}
-case 3:
-{
-lean_object* x_194; lean_object* x_195; uint8_t x_196; 
-lean_dec(x_120);
-lean_dec(x_10);
-x_194 = lean_ctor_get(x_17, 0);
-lean_inc(x_194);
-x_195 = lean_box(3);
-x_196 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_194, x_195);
+lean_object* x_199; lean_object* x_200; uint8_t x_201; 
+lean_dec(x_197);
 lean_dec(x_194);
-if (x_196 == 0)
+lean_dec(x_137);
+lean_dec(x_10);
+x_199 = lean_ctor_get(x_17, 0);
+lean_inc(x_199);
+x_200 = lean_box(3);
+x_201 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_199, x_200);
+lean_dec(x_199);
+if (x_201 == 0)
 {
 lean_dec(x_17);
 lean_dec(x_14);
@@ -9027,40 +9417,31 @@ return x_19;
 }
 else
 {
-lean_object* x_197; 
+lean_object* x_202; 
 lean_free_object(x_19);
-x_197 = lean_ctor_get(x_17, 1);
-lean_inc(x_197);
+x_202 = lean_ctor_get(x_17, 1);
+lean_inc(x_202);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_197;
-x_8 = x_118;
+x_2 = x_202;
+x_8 = x_135;
 goto _start;
 }
 }
-default: 
+else
 {
-lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; uint8_t x_204; 
-x_199 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-x_200 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_200, 0, x_119);
-lean_ctor_set(x_200, 1, x_199);
-x_201 = lean_array_get_size(x_10);
-x_202 = lean_unsigned_to_nat(1u);
-x_203 = lean_nat_sub(x_201, x_202);
-x_204 = lean_nat_dec_lt(x_16, x_201);
-lean_dec(x_201);
-if (x_204 == 0)
+lean_object* x_204; 
+x_204 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3___rarg(x_10, x_194, x_16, x_197);
+lean_dec(x_194);
+lean_dec(x_10);
+if (lean_obj_tag(x_204) == 0)
 {
 lean_object* x_205; lean_object* x_206; uint8_t x_207; 
-lean_dec(x_203);
-lean_dec(x_200);
-lean_dec(x_120);
-lean_dec(x_10);
+lean_dec(x_137);
 x_205 = lean_ctor_get(x_17, 0);
 lean_inc(x_205);
 x_206 = lean_box(3);
-x_207 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_205, x_206);
+x_207 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_205, x_206);
 lean_dec(x_205);
 if (x_207 == 0)
 {
@@ -9082,24 +9463,31 @@ lean_inc(x_208);
 lean_dec(x_17);
 x_1 = x_14;
 x_2 = x_208;
-x_8 = x_118;
+x_8 = x_135;
 goto _start;
 }
 }
 else
 {
 lean_object* x_210; 
-x_210 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__4___rarg(x_10, x_200, x_16, x_203);
-lean_dec(x_200);
-lean_dec(x_10);
-if (lean_obj_tag(x_210) == 0)
+lean_free_object(x_19);
+x_210 = lean_ctor_get(x_204, 0);
+lean_inc(x_210);
+lean_dec(x_204);
+x_138 = x_210;
+goto block_156;
+}
+}
+}
+case 3:
 {
 lean_object* x_211; lean_object* x_212; uint8_t x_213; 
-lean_dec(x_120);
+lean_dec(x_137);
+lean_dec(x_10);
 x_211 = lean_ctor_get(x_17, 0);
 lean_inc(x_211);
 x_212 = lean_box(3);
-x_213 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_211, x_212);
+x_213 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_211, x_212);
 lean_dec(x_211);
 if (x_213 == 0)
 {
@@ -9121,106 +9509,292 @@ lean_inc(x_214);
 lean_dec(x_17);
 x_1 = x_14;
 x_2 = x_214;
-x_8 = x_118;
+x_8 = x_135;
 goto _start;
 }
 }
-else
+case 4:
 {
-lean_object* x_216; 
-lean_free_object(x_19);
-x_216 = lean_ctor_get(x_210, 0);
-lean_inc(x_216);
-lean_dec(x_210);
-x_121 = x_216;
-goto block_139;
-}
-}
-}
-}
-block_139:
+lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; uint8_t x_221; 
+x_216 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_217 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_217, 0, x_136);
+lean_ctor_set(x_217, 1, x_216);
+x_218 = lean_array_get_size(x_10);
+x_219 = lean_unsigned_to_nat(1u);
+x_220 = lean_nat_sub(x_218, x_219);
+x_221 = lean_nat_dec_lt(x_16, x_218);
+lean_dec(x_218);
+if (x_221 == 0)
 {
-lean_object* x_122; lean_object* x_123; uint8_t x_124; 
-x_122 = lean_ctor_get(x_17, 0);
-lean_inc(x_122);
-x_123 = lean_box(3);
-x_124 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_122, x_123);
-lean_dec(x_122);
-if (x_124 == 0)
+lean_object* x_222; lean_object* x_223; uint8_t x_224; 
+lean_dec(x_220);
+lean_dec(x_217);
+lean_dec(x_137);
+lean_dec(x_10);
+x_222 = lean_ctor_get(x_17, 0);
+lean_inc(x_222);
+x_223 = lean_box(3);
+x_224 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_222, x_223);
+lean_dec(x_222);
+if (x_224 == 0)
 {
-lean_object* x_125; lean_object* x_126; 
 lean_dec(x_17);
-x_125 = l_Array_append___rarg(x_14, x_120);
-lean_dec(x_120);
-x_126 = lean_ctor_get(x_121, 1);
-lean_inc(x_126);
-lean_dec(x_121);
-x_1 = x_125;
-x_2 = x_126;
-x_8 = x_118;
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_225; 
+lean_free_object(x_19);
+x_225 = lean_ctor_get(x_17, 1);
+lean_inc(x_225);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_225;
+x_8 = x_135;
+goto _start;
+}
+}
+else
+{
+lean_object* x_227; 
+x_227 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__4___rarg(x_10, x_217, x_16, x_220);
+lean_dec(x_217);
+lean_dec(x_10);
+if (lean_obj_tag(x_227) == 0)
+{
+lean_object* x_228; lean_object* x_229; uint8_t x_230; 
+lean_dec(x_137);
+x_228 = lean_ctor_get(x_17, 0);
+lean_inc(x_228);
+x_229 = lean_box(3);
+x_230 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_228, x_229);
+lean_dec(x_228);
+if (x_230 == 0)
+{
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_231; 
+lean_free_object(x_19);
+x_231 = lean_ctor_get(x_17, 1);
+lean_inc(x_231);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_231;
+x_8 = x_135;
+goto _start;
+}
+}
+else
+{
+lean_object* x_233; 
+lean_free_object(x_19);
+x_233 = lean_ctor_get(x_227, 0);
+lean_inc(x_233);
+lean_dec(x_227);
+x_138 = x_233;
+goto block_156;
+}
+}
+}
+default: 
+{
+lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; uint8_t x_239; 
+x_234 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_235 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_235, 0, x_136);
+lean_ctor_set(x_235, 1, x_234);
+x_236 = lean_array_get_size(x_10);
+x_237 = lean_unsigned_to_nat(1u);
+x_238 = lean_nat_sub(x_236, x_237);
+x_239 = lean_nat_dec_lt(x_16, x_236);
+lean_dec(x_236);
+if (x_239 == 0)
+{
+lean_object* x_240; lean_object* x_241; uint8_t x_242; 
+lean_dec(x_238);
+lean_dec(x_235);
+lean_dec(x_137);
+lean_dec(x_10);
+x_240 = lean_ctor_get(x_17, 0);
+lean_inc(x_240);
+x_241 = lean_box(3);
+x_242 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_240, x_241);
+lean_dec(x_240);
+if (x_242 == 0)
+{
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_243; 
+lean_free_object(x_19);
+x_243 = lean_ctor_get(x_17, 1);
+lean_inc(x_243);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_243;
+x_8 = x_135;
+goto _start;
+}
+}
+else
+{
+lean_object* x_245; 
+x_245 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(x_10, x_235, x_16, x_238);
+lean_dec(x_235);
+lean_dec(x_10);
+if (lean_obj_tag(x_245) == 0)
+{
+lean_object* x_246; lean_object* x_247; uint8_t x_248; 
+lean_dec(x_137);
+x_246 = lean_ctor_get(x_17, 0);
+lean_inc(x_246);
+x_247 = lean_box(3);
+x_248 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_246, x_247);
+lean_dec(x_246);
+if (x_248 == 0)
+{
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_19, 0, x_3);
+return x_19;
+}
+else
+{
+lean_object* x_249; 
+lean_free_object(x_19);
+x_249 = lean_ctor_get(x_17, 1);
+lean_inc(x_249);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_249;
+x_8 = x_135;
+goto _start;
+}
+}
+else
+{
+lean_object* x_251; 
+lean_free_object(x_19);
+x_251 = lean_ctor_get(x_245, 0);
+lean_inc(x_251);
+lean_dec(x_245);
+x_138 = x_251;
+goto block_156;
+}
+}
+}
+}
+block_156:
+{
+lean_object* x_139; lean_object* x_140; uint8_t x_141; 
+x_139 = lean_ctor_get(x_17, 0);
+lean_inc(x_139);
+x_140 = lean_box(3);
+x_141 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_139, x_140);
+lean_dec(x_139);
+if (x_141 == 0)
+{
+lean_object* x_142; lean_object* x_143; 
+lean_dec(x_17);
+x_142 = l_Array_append___rarg(x_14, x_137);
+lean_dec(x_137);
+x_143 = lean_ctor_get(x_138, 1);
+lean_inc(x_143);
+lean_dec(x_138);
+x_1 = x_142;
+x_2 = x_143;
+x_8 = x_135;
 goto _start;
 }
 else
 {
-lean_object* x_128; lean_object* x_129; 
-x_128 = lean_ctor_get(x_17, 1);
-lean_inc(x_128);
+lean_object* x_145; lean_object* x_146; 
+x_145 = lean_ctor_get(x_17, 1);
+lean_inc(x_145);
 lean_dec(x_17);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_14);
-x_129 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_14, x_128, x_3, x_4, x_5, x_6, x_7, x_118);
-if (lean_obj_tag(x_129) == 0)
+x_146 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_14, x_145, x_3, x_4, x_5, x_6, x_7, x_135);
+if (lean_obj_tag(x_146) == 0)
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; 
-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_append___rarg(x_14, x_120);
-lean_dec(x_120);
-x_133 = lean_ctor_get(x_121, 1);
-lean_inc(x_133);
-lean_dec(x_121);
-x_1 = x_132;
-x_2 = x_133;
-x_3 = x_130;
-x_8 = x_131;
+lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; 
+x_147 = lean_ctor_get(x_146, 0);
+lean_inc(x_147);
+x_148 = lean_ctor_get(x_146, 1);
+lean_inc(x_148);
+lean_dec(x_146);
+x_149 = l_Array_append___rarg(x_14, x_137);
+lean_dec(x_137);
+x_150 = lean_ctor_get(x_138, 1);
+lean_inc(x_150);
+lean_dec(x_138);
+x_1 = x_149;
+x_2 = x_150;
+x_3 = x_147;
+x_8 = x_148;
 goto _start;
 }
 else
 {
-lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-lean_dec(x_121);
-lean_dec(x_120);
+lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+lean_dec(x_138);
+lean_dec(x_137);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_135 = lean_ctor_get(x_129, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_129, 1);
-lean_inc(x_136);
-if (lean_is_exclusive(x_129)) {
- lean_ctor_release(x_129, 0);
- lean_ctor_release(x_129, 1);
- x_137 = x_129;
+x_152 = lean_ctor_get(x_146, 0);
+lean_inc(x_152);
+x_153 = lean_ctor_get(x_146, 1);
+lean_inc(x_153);
+if (lean_is_exclusive(x_146)) {
+ lean_ctor_release(x_146, 0);
+ lean_ctor_release(x_146, 1);
+ x_154 = x_146;
 } else {
- lean_dec_ref(x_129);
- x_137 = lean_box(0);
+ lean_dec_ref(x_146);
+ x_154 = lean_box(0);
 }
-if (lean_is_scalar(x_137)) {
- x_138 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_154)) {
+ x_155 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_138 = x_137;
+ x_155 = x_154;
 }
-lean_ctor_set(x_138, 0, x_135);
-lean_ctor_set(x_138, 1, x_136);
-return x_138;
+lean_ctor_set(x_155, 0, x_152);
+lean_ctor_set(x_155, 1, x_153);
+return x_155;
 }
 }
 }
@@ -9228,570 +9802,676 @@ return x_138;
 }
 else
 {
-lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
-x_217 = lean_ctor_get(x_19, 0);
-x_218 = lean_ctor_get(x_19, 1);
-lean_inc(x_218);
-lean_inc(x_217);
+lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; 
+x_252 = lean_ctor_get(x_19, 0);
+x_253 = lean_ctor_get(x_19, 1);
+lean_inc(x_253);
+lean_inc(x_252);
 lean_dec(x_19);
-x_219 = lean_ctor_get(x_217, 0);
-lean_inc(x_219);
-x_220 = lean_ctor_get(x_217, 1);
-lean_inc(x_220);
-if (lean_is_exclusive(x_217)) {
- lean_ctor_release(x_217, 0);
- lean_ctor_release(x_217, 1);
- x_221 = x_217;
+x_254 = lean_ctor_get(x_252, 0);
+lean_inc(x_254);
+x_255 = lean_ctor_get(x_252, 1);
+lean_inc(x_255);
+if (lean_is_exclusive(x_252)) {
+ lean_ctor_release(x_252, 0);
+ lean_ctor_release(x_252, 1);
+ x_256 = x_252;
 } else {
- lean_dec_ref(x_217);
- x_221 = lean_box(0);
+ lean_dec_ref(x_252);
+ x_256 = lean_box(0);
 }
-switch (lean_obj_tag(x_219)) {
+switch (lean_obj_tag(x_254)) {
 case 0:
 {
-lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; uint8_t x_246; 
-x_241 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-if (lean_is_scalar(x_221)) {
- x_242 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; uint8_t x_281; 
+x_276 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_256)) {
+ x_277 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_242 = x_221;
+ x_277 = x_256;
 }
-lean_ctor_set(x_242, 0, x_219);
-lean_ctor_set(x_242, 1, x_241);
-x_243 = lean_array_get_size(x_10);
-x_244 = lean_unsigned_to_nat(1u);
-x_245 = lean_nat_sub(x_243, x_244);
-x_246 = lean_nat_dec_lt(x_16, x_243);
-lean_dec(x_243);
-if (x_246 == 0)
+lean_ctor_set(x_277, 0, x_254);
+lean_ctor_set(x_277, 1, x_276);
+x_278 = lean_array_get_size(x_10);
+x_279 = lean_unsigned_to_nat(1u);
+x_280 = lean_nat_sub(x_278, x_279);
+x_281 = lean_nat_dec_lt(x_16, x_278);
+lean_dec(x_278);
+if (x_281 == 0)
 {
-lean_object* x_247; lean_object* x_248; uint8_t x_249; 
-lean_dec(x_245);
-lean_dec(x_242);
-lean_dec(x_220);
+lean_object* x_282; lean_object* x_283; uint8_t x_284; 
+lean_dec(x_280);
+lean_dec(x_277);
+lean_dec(x_255);
 lean_dec(x_10);
-x_247 = lean_ctor_get(x_17, 0);
-lean_inc(x_247);
-x_248 = lean_box(3);
-x_249 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_247, x_248);
-lean_dec(x_247);
-if (x_249 == 0)
+x_282 = lean_ctor_get(x_17, 0);
+lean_inc(x_282);
+x_283 = lean_box(3);
+x_284 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_282, x_283);
+lean_dec(x_282);
+if (x_284 == 0)
 {
-lean_object* x_250; 
+lean_object* x_285; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_250 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_250, 0, x_3);
-lean_ctor_set(x_250, 1, x_218);
-return x_250;
+x_285 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_285, 0, x_3);
+lean_ctor_set(x_285, 1, x_253);
+return x_285;
 }
 else
 {
-lean_object* x_251; 
-x_251 = lean_ctor_get(x_17, 1);
-lean_inc(x_251);
+lean_object* x_286; 
+x_286 = lean_ctor_get(x_17, 1);
+lean_inc(x_286);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_251;
-x_8 = x_218;
+x_2 = x_286;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_253; 
-x_253 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__1___rarg(x_10, x_242, x_16, x_245);
-lean_dec(x_242);
+lean_object* x_288; 
+x_288 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__1___rarg(x_10, x_277, x_16, x_280);
+lean_dec(x_277);
 lean_dec(x_10);
-if (lean_obj_tag(x_253) == 0)
+if (lean_obj_tag(x_288) == 0)
 {
-lean_object* x_254; lean_object* x_255; uint8_t x_256; 
-lean_dec(x_220);
-x_254 = lean_ctor_get(x_17, 0);
-lean_inc(x_254);
-x_255 = lean_box(3);
-x_256 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_254, x_255);
-lean_dec(x_254);
-if (x_256 == 0)
+lean_object* x_289; lean_object* x_290; uint8_t x_291; 
+lean_dec(x_255);
+x_289 = lean_ctor_get(x_17, 0);
+lean_inc(x_289);
+x_290 = lean_box(3);
+x_291 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_289, x_290);
+lean_dec(x_289);
+if (x_291 == 0)
 {
-lean_object* x_257; 
+lean_object* x_292; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_257 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_257, 0, x_3);
-lean_ctor_set(x_257, 1, x_218);
-return x_257;
+x_292 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_292, 0, x_3);
+lean_ctor_set(x_292, 1, x_253);
+return x_292;
 }
 else
 {
-lean_object* x_258; 
-x_258 = lean_ctor_get(x_17, 1);
-lean_inc(x_258);
+lean_object* x_293; 
+x_293 = lean_ctor_get(x_17, 1);
+lean_inc(x_293);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_258;
-x_8 = x_218;
+x_2 = x_293;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_260; 
-x_260 = lean_ctor_get(x_253, 0);
-lean_inc(x_260);
-lean_dec(x_253);
-x_222 = x_260;
-goto block_240;
+lean_object* x_295; 
+x_295 = lean_ctor_get(x_288, 0);
+lean_inc(x_295);
+lean_dec(x_288);
+x_257 = x_295;
+goto block_275;
 }
 }
 }
 case 1:
 {
-lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; uint8_t x_266; 
-x_261 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-if (lean_is_scalar(x_221)) {
- x_262 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; uint8_t x_301; 
+x_296 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_256)) {
+ x_297 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_262 = x_221;
+ x_297 = x_256;
 }
-lean_ctor_set(x_262, 0, x_219);
-lean_ctor_set(x_262, 1, x_261);
-x_263 = lean_array_get_size(x_10);
-x_264 = lean_unsigned_to_nat(1u);
-x_265 = lean_nat_sub(x_263, x_264);
-x_266 = lean_nat_dec_lt(x_16, x_263);
-lean_dec(x_263);
-if (x_266 == 0)
+lean_ctor_set(x_297, 0, x_254);
+lean_ctor_set(x_297, 1, x_296);
+x_298 = lean_array_get_size(x_10);
+x_299 = lean_unsigned_to_nat(1u);
+x_300 = lean_nat_sub(x_298, x_299);
+x_301 = lean_nat_dec_lt(x_16, x_298);
+lean_dec(x_298);
+if (x_301 == 0)
 {
-lean_object* x_267; lean_object* x_268; uint8_t x_269; 
-lean_dec(x_265);
-lean_dec(x_262);
-lean_dec(x_220);
+lean_object* x_302; lean_object* x_303; uint8_t x_304; 
+lean_dec(x_300);
+lean_dec(x_297);
+lean_dec(x_255);
 lean_dec(x_10);
-x_267 = lean_ctor_get(x_17, 0);
-lean_inc(x_267);
-x_268 = lean_box(3);
-x_269 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_267, x_268);
-lean_dec(x_267);
-if (x_269 == 0)
+x_302 = lean_ctor_get(x_17, 0);
+lean_inc(x_302);
+x_303 = lean_box(3);
+x_304 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_302, x_303);
+lean_dec(x_302);
+if (x_304 == 0)
 {
-lean_object* x_270; 
+lean_object* x_305; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_270 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_270, 0, x_3);
-lean_ctor_set(x_270, 1, x_218);
-return x_270;
+x_305 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_305, 0, x_3);
+lean_ctor_set(x_305, 1, x_253);
+return x_305;
 }
 else
 {
-lean_object* x_271; 
-x_271 = lean_ctor_get(x_17, 1);
-lean_inc(x_271);
+lean_object* x_306; 
+x_306 = lean_ctor_get(x_17, 1);
+lean_inc(x_306);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_271;
-x_8 = x_218;
+x_2 = x_306;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_273; 
-x_273 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__2___rarg(x_10, x_262, x_16, x_265);
-lean_dec(x_262);
+lean_object* x_308; 
+x_308 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__2___rarg(x_10, x_297, x_16, x_300);
+lean_dec(x_297);
 lean_dec(x_10);
-if (lean_obj_tag(x_273) == 0)
+if (lean_obj_tag(x_308) == 0)
 {
-lean_object* x_274; lean_object* x_275; uint8_t x_276; 
-lean_dec(x_220);
-x_274 = lean_ctor_get(x_17, 0);
-lean_inc(x_274);
-x_275 = lean_box(3);
-x_276 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_274, x_275);
-lean_dec(x_274);
-if (x_276 == 0)
+lean_object* x_309; lean_object* x_310; uint8_t x_311; 
+lean_dec(x_255);
+x_309 = lean_ctor_get(x_17, 0);
+lean_inc(x_309);
+x_310 = lean_box(3);
+x_311 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_309, x_310);
+lean_dec(x_309);
+if (x_311 == 0)
 {
-lean_object* x_277; 
+lean_object* x_312; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_277 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_277, 0, x_3);
-lean_ctor_set(x_277, 1, x_218);
-return x_277;
+x_312 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_312, 0, x_3);
+lean_ctor_set(x_312, 1, x_253);
+return x_312;
 }
 else
 {
-lean_object* x_278; 
-x_278 = lean_ctor_get(x_17, 1);
-lean_inc(x_278);
+lean_object* x_313; 
+x_313 = lean_ctor_get(x_17, 1);
+lean_inc(x_313);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_278;
-x_8 = x_218;
+x_2 = x_313;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_280; 
-x_280 = lean_ctor_get(x_273, 0);
-lean_inc(x_280);
-lean_dec(x_273);
-x_222 = x_280;
-goto block_240;
+lean_object* x_315; 
+x_315 = lean_ctor_get(x_308, 0);
+lean_inc(x_315);
+lean_dec(x_308);
+x_257 = x_315;
+goto block_275;
 }
 }
 }
 case 2:
 {
-lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; uint8_t x_286; 
-x_281 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-if (lean_is_scalar(x_221)) {
- x_282 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; uint8_t x_321; 
+x_316 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_256)) {
+ x_317 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_282 = x_221;
+ x_317 = x_256;
 }
-lean_ctor_set(x_282, 0, x_219);
-lean_ctor_set(x_282, 1, x_281);
-x_283 = lean_array_get_size(x_10);
-x_284 = lean_unsigned_to_nat(1u);
-x_285 = lean_nat_sub(x_283, x_284);
-x_286 = lean_nat_dec_lt(x_16, x_283);
-lean_dec(x_283);
-if (x_286 == 0)
+lean_ctor_set(x_317, 0, x_254);
+lean_ctor_set(x_317, 1, x_316);
+x_318 = lean_array_get_size(x_10);
+x_319 = lean_unsigned_to_nat(1u);
+x_320 = lean_nat_sub(x_318, x_319);
+x_321 = lean_nat_dec_lt(x_16, x_318);
+lean_dec(x_318);
+if (x_321 == 0)
 {
-lean_object* x_287; lean_object* x_288; uint8_t x_289; 
-lean_dec(x_285);
-lean_dec(x_282);
-lean_dec(x_220);
+lean_object* x_322; lean_object* x_323; uint8_t x_324; 
+lean_dec(x_320);
+lean_dec(x_317);
+lean_dec(x_255);
 lean_dec(x_10);
-x_287 = lean_ctor_get(x_17, 0);
-lean_inc(x_287);
-x_288 = lean_box(3);
-x_289 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_287, x_288);
-lean_dec(x_287);
-if (x_289 == 0)
+x_322 = lean_ctor_get(x_17, 0);
+lean_inc(x_322);
+x_323 = lean_box(3);
+x_324 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_322, x_323);
+lean_dec(x_322);
+if (x_324 == 0)
 {
-lean_object* x_290; 
+lean_object* x_325; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_290 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_290, 0, x_3);
-lean_ctor_set(x_290, 1, x_218);
-return x_290;
+x_325 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_325, 0, x_3);
+lean_ctor_set(x_325, 1, x_253);
+return x_325;
 }
 else
 {
-lean_object* x_291; 
-x_291 = lean_ctor_get(x_17, 1);
-lean_inc(x_291);
+lean_object* x_326; 
+x_326 = lean_ctor_get(x_17, 1);
+lean_inc(x_326);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_291;
-x_8 = x_218;
+x_2 = x_326;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_293; 
-x_293 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3___rarg(x_10, x_282, x_16, x_285);
-lean_dec(x_282);
+lean_object* x_328; 
+x_328 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__3___rarg(x_10, x_317, x_16, x_320);
+lean_dec(x_317);
 lean_dec(x_10);
-if (lean_obj_tag(x_293) == 0)
+if (lean_obj_tag(x_328) == 0)
 {
-lean_object* x_294; lean_object* x_295; uint8_t x_296; 
-lean_dec(x_220);
-x_294 = lean_ctor_get(x_17, 0);
-lean_inc(x_294);
-x_295 = lean_box(3);
-x_296 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_294, x_295);
-lean_dec(x_294);
-if (x_296 == 0)
+lean_object* x_329; lean_object* x_330; uint8_t x_331; 
+lean_dec(x_255);
+x_329 = lean_ctor_get(x_17, 0);
+lean_inc(x_329);
+x_330 = lean_box(3);
+x_331 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_329, x_330);
+lean_dec(x_329);
+if (x_331 == 0)
 {
-lean_object* x_297; 
+lean_object* x_332; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_297 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_297, 0, x_3);
-lean_ctor_set(x_297, 1, x_218);
-return x_297;
+x_332 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_332, 0, x_3);
+lean_ctor_set(x_332, 1, x_253);
+return x_332;
 }
 else
 {
-lean_object* x_298; 
-x_298 = lean_ctor_get(x_17, 1);
-lean_inc(x_298);
+lean_object* x_333; 
+x_333 = lean_ctor_get(x_17, 1);
+lean_inc(x_333);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_298;
-x_8 = x_218;
+x_2 = x_333;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_300; 
-x_300 = lean_ctor_get(x_293, 0);
-lean_inc(x_300);
-lean_dec(x_293);
-x_222 = x_300;
-goto block_240;
+lean_object* x_335; 
+x_335 = lean_ctor_get(x_328, 0);
+lean_inc(x_335);
+lean_dec(x_328);
+x_257 = x_335;
+goto block_275;
 }
 }
 }
 case 3:
 {
-lean_object* x_301; lean_object* x_302; uint8_t x_303; 
-lean_dec(x_221);
-lean_dec(x_220);
+lean_object* x_336; lean_object* x_337; uint8_t x_338; 
+lean_dec(x_256);
+lean_dec(x_255);
 lean_dec(x_10);
-x_301 = lean_ctor_get(x_17, 0);
-lean_inc(x_301);
-x_302 = lean_box(3);
-x_303 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_301, x_302);
-lean_dec(x_301);
-if (x_303 == 0)
+x_336 = lean_ctor_get(x_17, 0);
+lean_inc(x_336);
+x_337 = lean_box(3);
+x_338 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_336, x_337);
+lean_dec(x_336);
+if (x_338 == 0)
 {
-lean_object* x_304; 
+lean_object* x_339; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_304 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_304, 0, x_3);
-lean_ctor_set(x_304, 1, x_218);
-return x_304;
+x_339 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_339, 0, x_3);
+lean_ctor_set(x_339, 1, x_253);
+return x_339;
 }
 else
 {
-lean_object* x_305; 
-x_305 = lean_ctor_get(x_17, 1);
-lean_inc(x_305);
+lean_object* x_340; 
+x_340 = lean_ctor_get(x_17, 1);
+lean_inc(x_340);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_305;
-x_8 = x_218;
+x_2 = x_340;
+x_8 = x_253;
 goto _start;
 }
 }
+case 4:
+{
+lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; uint8_t x_347; 
+x_342 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_256)) {
+ x_343 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_343 = x_256;
+}
+lean_ctor_set(x_343, 0, x_254);
+lean_ctor_set(x_343, 1, x_342);
+x_344 = lean_array_get_size(x_10);
+x_345 = lean_unsigned_to_nat(1u);
+x_346 = lean_nat_sub(x_344, x_345);
+x_347 = lean_nat_dec_lt(x_16, x_344);
+lean_dec(x_344);
+if (x_347 == 0)
+{
+lean_object* x_348; lean_object* x_349; uint8_t x_350; 
+lean_dec(x_346);
+lean_dec(x_343);
+lean_dec(x_255);
+lean_dec(x_10);
+x_348 = lean_ctor_get(x_17, 0);
+lean_inc(x_348);
+x_349 = lean_box(3);
+x_350 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_348, x_349);
+lean_dec(x_348);
+if (x_350 == 0)
+{
+lean_object* x_351; 
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_351 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_351, 0, x_3);
+lean_ctor_set(x_351, 1, x_253);
+return x_351;
+}
+else
+{
+lean_object* x_352; 
+x_352 = lean_ctor_get(x_17, 1);
+lean_inc(x_352);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_352;
+x_8 = x_253;
+goto _start;
+}
+}
+else
+{
+lean_object* x_354; 
+x_354 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__4___rarg(x_10, x_343, x_16, x_346);
+lean_dec(x_343);
+lean_dec(x_10);
+if (lean_obj_tag(x_354) == 0)
+{
+lean_object* x_355; lean_object* x_356; uint8_t x_357; 
+lean_dec(x_255);
+x_355 = lean_ctor_get(x_17, 0);
+lean_inc(x_355);
+x_356 = lean_box(3);
+x_357 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_355, x_356);
+lean_dec(x_355);
+if (x_357 == 0)
+{
+lean_object* x_358; 
+lean_dec(x_17);
+lean_dec(x_14);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_358 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_358, 0, x_3);
+lean_ctor_set(x_358, 1, x_253);
+return x_358;
+}
+else
+{
+lean_object* x_359; 
+x_359 = lean_ctor_get(x_17, 1);
+lean_inc(x_359);
+lean_dec(x_17);
+x_1 = x_14;
+x_2 = x_359;
+x_8 = x_253;
+goto _start;
+}
+}
+else
+{
+lean_object* x_361; 
+x_361 = lean_ctor_get(x_354, 0);
+lean_inc(x_361);
+lean_dec(x_354);
+x_257 = x_361;
+goto block_275;
+}
+}
+}
 default: 
 {
-lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; uint8_t x_312; 
-x_307 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
-if (lean_is_scalar(x_221)) {
- x_308 = lean_alloc_ctor(0, 2, 0);
+lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; uint8_t x_367; 
+x_362 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_256)) {
+ x_363 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_308 = x_221;
+ x_363 = x_256;
 }
-lean_ctor_set(x_308, 0, x_219);
-lean_ctor_set(x_308, 1, x_307);
-x_309 = lean_array_get_size(x_10);
-x_310 = lean_unsigned_to_nat(1u);
-x_311 = lean_nat_sub(x_309, x_310);
-x_312 = lean_nat_dec_lt(x_16, x_309);
-lean_dec(x_309);
-if (x_312 == 0)
+lean_ctor_set(x_363, 0, x_254);
+lean_ctor_set(x_363, 1, x_362);
+x_364 = lean_array_get_size(x_10);
+x_365 = lean_unsigned_to_nat(1u);
+x_366 = lean_nat_sub(x_364, x_365);
+x_367 = lean_nat_dec_lt(x_16, x_364);
+lean_dec(x_364);
+if (x_367 == 0)
 {
-lean_object* x_313; lean_object* x_314; uint8_t x_315; 
-lean_dec(x_311);
-lean_dec(x_308);
-lean_dec(x_220);
+lean_object* x_368; lean_object* x_369; uint8_t x_370; 
+lean_dec(x_366);
+lean_dec(x_363);
+lean_dec(x_255);
 lean_dec(x_10);
-x_313 = lean_ctor_get(x_17, 0);
-lean_inc(x_313);
-x_314 = lean_box(3);
-x_315 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_313, x_314);
-lean_dec(x_313);
-if (x_315 == 0)
+x_368 = lean_ctor_get(x_17, 0);
+lean_inc(x_368);
+x_369 = lean_box(3);
+x_370 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_368, x_369);
+lean_dec(x_368);
+if (x_370 == 0)
 {
-lean_object* x_316; 
+lean_object* x_371; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_316 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_316, 0, x_3);
-lean_ctor_set(x_316, 1, x_218);
-return x_316;
+x_371 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_371, 0, x_3);
+lean_ctor_set(x_371, 1, x_253);
+return x_371;
 }
 else
 {
-lean_object* x_317; 
-x_317 = lean_ctor_get(x_17, 1);
-lean_inc(x_317);
+lean_object* x_372; 
+x_372 = lean_ctor_get(x_17, 1);
+lean_inc(x_372);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_317;
-x_8 = x_218;
+x_2 = x_372;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_319; 
-x_319 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__4___rarg(x_10, x_308, x_16, x_311);
-lean_dec(x_308);
+lean_object* x_374; 
+x_374 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(x_10, x_363, x_16, x_366);
+lean_dec(x_363);
 lean_dec(x_10);
-if (lean_obj_tag(x_319) == 0)
+if (lean_obj_tag(x_374) == 0)
 {
-lean_object* x_320; lean_object* x_321; uint8_t x_322; 
-lean_dec(x_220);
-x_320 = lean_ctor_get(x_17, 0);
-lean_inc(x_320);
-x_321 = lean_box(3);
-x_322 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_320, x_321);
-lean_dec(x_320);
-if (x_322 == 0)
+lean_object* x_375; lean_object* x_376; uint8_t x_377; 
+lean_dec(x_255);
+x_375 = lean_ctor_get(x_17, 0);
+lean_inc(x_375);
+x_376 = lean_box(3);
+x_377 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_375, x_376);
+lean_dec(x_375);
+if (x_377 == 0)
 {
-lean_object* x_323; 
+lean_object* x_378; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_323 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_323, 0, x_3);
-lean_ctor_set(x_323, 1, x_218);
-return x_323;
+x_378 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_378, 0, x_3);
+lean_ctor_set(x_378, 1, x_253);
+return x_378;
 }
 else
 {
-lean_object* x_324; 
-x_324 = lean_ctor_get(x_17, 1);
-lean_inc(x_324);
+lean_object* x_379; 
+x_379 = lean_ctor_get(x_17, 1);
+lean_inc(x_379);
 lean_dec(x_17);
 x_1 = x_14;
-x_2 = x_324;
-x_8 = x_218;
+x_2 = x_379;
+x_8 = x_253;
 goto _start;
 }
 }
 else
 {
-lean_object* x_326; 
-x_326 = lean_ctor_get(x_319, 0);
-lean_inc(x_326);
-lean_dec(x_319);
-x_222 = x_326;
-goto block_240;
+lean_object* x_381; 
+x_381 = lean_ctor_get(x_374, 0);
+lean_inc(x_381);
+lean_dec(x_374);
+x_257 = x_381;
+goto block_275;
 }
 }
 }
 }
-block_240:
+block_275:
 {
-lean_object* x_223; lean_object* x_224; uint8_t x_225; 
-x_223 = lean_ctor_get(x_17, 0);
-lean_inc(x_223);
-x_224 = lean_box(3);
-x_225 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_223, x_224);
-lean_dec(x_223);
-if (x_225 == 0)
+lean_object* x_258; lean_object* x_259; uint8_t x_260; 
+x_258 = lean_ctor_get(x_17, 0);
+lean_inc(x_258);
+x_259 = lean_box(3);
+x_260 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_258, x_259);
+lean_dec(x_258);
+if (x_260 == 0)
 {
-lean_object* x_226; lean_object* x_227; 
+lean_object* x_261; lean_object* x_262; 
 lean_dec(x_17);
-x_226 = l_Array_append___rarg(x_14, x_220);
-lean_dec(x_220);
-x_227 = lean_ctor_get(x_222, 1);
-lean_inc(x_227);
-lean_dec(x_222);
-x_1 = x_226;
-x_2 = x_227;
-x_8 = x_218;
+x_261 = l_Array_append___rarg(x_14, x_255);
+lean_dec(x_255);
+x_262 = lean_ctor_get(x_257, 1);
+lean_inc(x_262);
+lean_dec(x_257);
+x_1 = x_261;
+x_2 = x_262;
+x_8 = x_253;
 goto _start;
 }
 else
 {
-lean_object* x_229; lean_object* x_230; 
-x_229 = lean_ctor_get(x_17, 1);
-lean_inc(x_229);
+lean_object* x_264; lean_object* x_265; 
+x_264 = lean_ctor_get(x_17, 1);
+lean_inc(x_264);
 lean_dec(x_17);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_14);
-x_230 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_14, x_229, x_3, x_4, x_5, x_6, x_7, x_218);
-if (lean_obj_tag(x_230) == 0)
+x_265 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_14, x_264, x_3, x_4, x_5, x_6, x_7, x_253);
+if (lean_obj_tag(x_265) == 0)
 {
-lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; 
-x_231 = lean_ctor_get(x_230, 0);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_230, 1);
-lean_inc(x_232);
-lean_dec(x_230);
-x_233 = l_Array_append___rarg(x_14, x_220);
-lean_dec(x_220);
-x_234 = lean_ctor_get(x_222, 1);
-lean_inc(x_234);
-lean_dec(x_222);
-x_1 = x_233;
-x_2 = x_234;
-x_3 = x_231;
-x_8 = x_232;
+lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
+x_266 = lean_ctor_get(x_265, 0);
+lean_inc(x_266);
+x_267 = lean_ctor_get(x_265, 1);
+lean_inc(x_267);
+lean_dec(x_265);
+x_268 = l_Array_append___rarg(x_14, x_255);
+lean_dec(x_255);
+x_269 = lean_ctor_get(x_257, 1);
+lean_inc(x_269);
+lean_dec(x_257);
+x_1 = x_268;
+x_2 = x_269;
+x_3 = x_266;
+x_8 = x_267;
 goto _start;
 }
 else
 {
-lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; 
-lean_dec(x_222);
-lean_dec(x_220);
+lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
+lean_dec(x_257);
+lean_dec(x_255);
 lean_dec(x_14);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_236 = lean_ctor_get(x_230, 0);
-lean_inc(x_236);
-x_237 = lean_ctor_get(x_230, 1);
-lean_inc(x_237);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_238 = x_230;
+x_271 = lean_ctor_get(x_265, 0);
+lean_inc(x_271);
+x_272 = lean_ctor_get(x_265, 1);
+lean_inc(x_272);
+if (lean_is_exclusive(x_265)) {
+ lean_ctor_release(x_265, 0);
+ lean_ctor_release(x_265, 1);
+ x_273 = x_265;
 } else {
- lean_dec_ref(x_230);
- x_238 = lean_box(0);
+ lean_dec_ref(x_265);
+ x_273 = lean_box(0);
 }
-if (lean_is_scalar(x_238)) {
- x_239 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_273)) {
+ x_274 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_239 = x_238;
+ x_274 = x_273;
 }
-lean_ctor_set(x_239, 0, x_236);
-lean_ctor_set(x_239, 1, x_237);
-return x_239;
+lean_ctor_set(x_274, 0, x_271);
+lean_ctor_set(x_274, 1, x_272);
+return x_274;
 }
 }
 }
@@ -9799,7 +10479,7 @@ return x_239;
 }
 else
 {
-uint8_t x_327; 
+uint8_t x_382; 
 lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_10);
@@ -9808,56 +10488,56 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_327 = !lean_is_exclusive(x_19);
-if (x_327 == 0)
+x_382 = !lean_is_exclusive(x_19);
+if (x_382 == 0)
 {
 return x_19;
 }
 else
 {
-lean_object* x_328; lean_object* x_329; lean_object* x_330; 
-x_328 = lean_ctor_get(x_19, 0);
-x_329 = lean_ctor_get(x_19, 1);
-lean_inc(x_329);
-lean_inc(x_328);
+lean_object* x_383; lean_object* x_384; lean_object* x_385; 
+x_383 = lean_ctor_get(x_19, 0);
+x_384 = lean_ctor_get(x_19, 1);
+lean_inc(x_384);
+lean_inc(x_383);
 lean_dec(x_19);
-x_330 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_330, 0, x_328);
-lean_ctor_set(x_330, 1, x_329);
-return x_330;
+x_385 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_385, 0, x_383);
+lean_ctor_set(x_385, 1, x_384);
+return x_385;
 }
 }
 }
 else
 {
-lean_object* x_331; 
+lean_object* x_386; 
 lean_dec(x_10);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_331 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_331, 0, x_3);
-lean_ctor_set(x_331, 1, x_8);
-return x_331;
+x_386 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_386, 0, x_3);
+lean_ctor_set(x_386, 1, x_8);
+return x_386;
 }
 }
 else
 {
-lean_object* x_332; lean_object* x_333; 
+lean_object* x_387; lean_object* x_388; 
 lean_dec(x_10);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_332 = l_Array_append___rarg(x_3, x_9);
+x_387 = l_Array_append___rarg(x_3, x_9);
 lean_dec(x_9);
-x_333 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_333, 0, x_332);
-lean_ctor_set(x_333, 1, x_8);
-return x_333;
+x_388 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_388, 0, x_387);
+lean_ctor_set(x_388, 1, x_8);
+return x_388;
 }
 }
 }
@@ -9909,6 +10589,16 @@ lean_dec(x_1);
 return x_5;
 }
 }
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg___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_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___spec__5___rarg(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_5;
+}
+}
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__3___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -9927,7 +10617,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -9985,7 +10675,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -10083,7 +10773,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -10141,7 +10831,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -10239,7 +10929,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -10297,7 +10987,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -10395,7 +11085,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -10453,7 +11143,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -10533,6 +11223,162 @@ x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_find_x3f___at_Lean_Meta
 return x_2;
 }
 }
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_get_size(x_1);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_4);
+x_8 = lean_box(0);
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_array_fget(x_1, x_4);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
+lean_dec(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_add(x_4, x_11);
+lean_dec(x_4);
+x_3 = lean_box(0);
+x_4 = x_12;
+goto _start;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_array_fget(x_2, x_4);
+lean_dec(x_4);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+return x_15;
+}
+}
+}
+}
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg(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___rarg___closed__2;
+x_7 = x_2 & x_6;
+x_8 = lean_usize_to_nat(x_7);
+x_9 = lean_box(2);
+x_10 = lean_array_get(x_9, x_4, x_8);
+lean_dec(x_8);
+lean_dec(x_4);
+switch (lean_obj_tag(x_10)) {
+case 0:
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
+lean_dec(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_12);
+x_14 = lean_box(0);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_12);
+return x_15;
+}
+}
+case 1:
+{
+lean_object* x_16; size_t x_17; 
+x_16 = lean_ctor_get(x_10, 0);
+lean_inc(x_16);
+lean_dec(x_10);
+x_17 = x_2 >> x_5 % (sizeof(size_t) * 8);
+x_1 = x_16;
+x_2 = x_17;
+goto _start;
+}
+default: 
+{
+lean_object* x_19; 
+x_19 = lean_box(0);
+return x_19;
+}
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_dec(x_1);
+x_22 = lean_unsigned_to_nat(0u);
+x_23 = l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg(x_20, x_21, lean_box(0), x_22, x_3);
+lean_dec(x_21);
+lean_dec(x_20);
+return x_23;
+}
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; size_t x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+lean_dec(x_1);
+x_4 = l_Lean_Meta_DiscrTree_Key_hash(x_2);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg(x_3, x_4, x_2);
+return x_5;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg___boxed), 2, 0);
+return x_2;
+}
+}
 lean_object* l_Lean_Meta_DiscrTree_getMatch___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:
 {
@@ -11077,7 +11923,7 @@ lean_ctor_set(x_107, 1, x_106);
 return x_107;
 }
 }
-default: 
+case 4:
 {
 uint8_t x_108; 
 x_108 = !lean_is_exclusive(x_14);
@@ -11236,135 +12082,155 @@ return x_136;
 }
 }
 }
-}
-}
-else
+default: 
 {
 uint8_t x_137; 
-lean_dec(x_3);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
 x_137 = !lean_is_exclusive(x_14);
 if (x_137 == 0)
 {
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_138 = lean_ctor_get(x_14, 1);
+x_139 = lean_ctor_get(x_14, 0);
+lean_dec(x_139);
+x_140 = lean_ctor_get(x_15, 1);
+lean_inc(x_140);
+lean_dec(x_15);
+x_141 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(x_1, x_16);
+if (lean_obj_tag(x_141) == 0)
+{
+lean_dec(x_140);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_14, 0, x_8);
 return x_14;
 }
 else
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_14, 0);
-x_139 = lean_ctor_get(x_14, 1);
-lean_inc(x_139);
-lean_inc(x_138);
-lean_dec(x_14);
-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;
+lean_object* x_142; lean_object* x_143; 
+lean_free_object(x_14);
+x_142 = lean_ctor_get(x_141, 0);
+lean_inc(x_142);
+lean_dec(x_141);
+x_143 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_140, x_142, x_8, x_3, x_4, x_5, x_6, x_138);
+if (lean_obj_tag(x_143) == 0)
+{
+uint8_t x_144; 
+x_144 = !lean_is_exclusive(x_143);
+if (x_144 == 0)
+{
+return x_143;
+}
+else
+{
+lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+x_145 = lean_ctor_get(x_143, 0);
+x_146 = lean_ctor_get(x_143, 1);
+lean_inc(x_146);
+lean_inc(x_145);
+lean_dec(x_143);
+x_147 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_147, 0, x_145);
+lean_ctor_set(x_147, 1, x_146);
+return x_147;
+}
+}
+else
+{
+uint8_t x_148; 
+x_148 = !lean_is_exclusive(x_143);
+if (x_148 == 0)
+{
+return x_143;
+}
+else
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_149 = lean_ctor_get(x_143, 0);
+x_150 = lean_ctor_get(x_143, 1);
+lean_inc(x_150);
+lean_inc(x_149);
+lean_dec(x_143);
+x_151 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_151, 0, x_149);
+lean_ctor_set(x_151, 1, x_150);
+return x_151;
+}
 }
 }
 }
 else
 {
-uint8_t x_141; uint8_t x_142; uint8_t x_143; uint8_t x_144; uint8_t x_145; uint8_t x_146; uint8_t x_147; uint8_t x_148; uint8_t x_149; lean_object* x_150; uint8_t x_151; lean_object* x_152; 
-x_141 = lean_ctor_get_uint8(x_10, 0);
-x_142 = lean_ctor_get_uint8(x_10, 1);
-x_143 = lean_ctor_get_uint8(x_10, 2);
-x_144 = lean_ctor_get_uint8(x_10, 3);
-x_145 = lean_ctor_get_uint8(x_10, 4);
-x_146 = lean_ctor_get_uint8(x_10, 6);
-x_147 = lean_ctor_get_uint8(x_10, 7);
-x_148 = lean_ctor_get_uint8(x_10, 8);
-lean_dec(x_10);
-x_149 = 2;
-x_150 = lean_alloc_ctor(0, 0, 9);
-lean_ctor_set_uint8(x_150, 0, x_141);
-lean_ctor_set_uint8(x_150, 1, x_142);
-lean_ctor_set_uint8(x_150, 2, x_143);
-lean_ctor_set_uint8(x_150, 3, x_144);
-lean_ctor_set_uint8(x_150, 4, x_145);
-lean_ctor_set_uint8(x_150, 5, x_149);
-lean_ctor_set_uint8(x_150, 6, x_146);
-lean_ctor_set_uint8(x_150, 7, x_147);
-lean_ctor_set_uint8(x_150, 8, x_148);
-lean_ctor_set(x_3, 0, x_150);
-x_151 = 1;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_3);
-x_152 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_151, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_152) == 0)
-{
-lean_object* x_153; lean_object* x_154; 
-x_153 = lean_ctor_get(x_152, 0);
+lean_object* x_152; lean_object* x_153; lean_object* x_154; 
+x_152 = lean_ctor_get(x_14, 1);
+lean_inc(x_152);
+lean_dec(x_14);
+x_153 = lean_ctor_get(x_15, 1);
 lean_inc(x_153);
-x_154 = lean_ctor_get(x_153, 0);
-lean_inc(x_154);
-switch (lean_obj_tag(x_154)) {
-case 0:
+lean_dec(x_15);
+x_154 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(x_1, x_16);
+if (lean_obj_tag(x_154) == 0)
 {
-lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; 
-x_155 = lean_ctor_get(x_152, 1);
-lean_inc(x_155);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_156 = x_152;
-} else {
- lean_dec_ref(x_152);
- x_156 = lean_box(0);
-}
-x_157 = lean_ctor_get(x_153, 1);
-lean_inc(x_157);
+lean_object* x_155; 
 lean_dec(x_153);
-x_158 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1___rarg(x_1, x_154);
-lean_dec(x_154);
-if (lean_obj_tag(x_158) == 0)
-{
-lean_object* x_159; 
-lean_dec(x_157);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_156)) {
- x_159 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_159 = x_156;
-}
-lean_ctor_set(x_159, 0, x_8);
-lean_ctor_set(x_159, 1, x_155);
-return x_159;
+x_155 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_155, 0, x_8);
+lean_ctor_set(x_155, 1, x_152);
+return x_155;
 }
 else
 {
-lean_object* x_160; lean_object* x_161; 
-lean_dec(x_156);
-x_160 = lean_ctor_get(x_158, 0);
-lean_inc(x_160);
-lean_dec(x_158);
-x_161 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_157, x_160, x_8, x_3, x_4, x_5, x_6, x_155);
-if (lean_obj_tag(x_161) == 0)
+lean_object* x_156; lean_object* x_157; 
+x_156 = lean_ctor_get(x_154, 0);
+lean_inc(x_156);
+lean_dec(x_154);
+x_157 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_153, x_156, x_8, x_3, x_4, x_5, x_6, x_152);
+if (lean_obj_tag(x_157) == 0)
+{
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; 
+x_158 = lean_ctor_get(x_157, 0);
+lean_inc(x_158);
+x_159 = lean_ctor_get(x_157, 1);
+lean_inc(x_159);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_160 = x_157;
+} else {
+ lean_dec_ref(x_157);
+ x_160 = lean_box(0);
+}
+if (lean_is_scalar(x_160)) {
+ x_161 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_161 = x_160;
+}
+lean_ctor_set(x_161, 0, x_158);
+lean_ctor_set(x_161, 1, x_159);
+return x_161;
+}
+else
 {
 lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
-x_162 = lean_ctor_get(x_161, 0);
+x_162 = lean_ctor_get(x_157, 0);
 lean_inc(x_162);
-x_163 = lean_ctor_get(x_161, 1);
+x_163 = lean_ctor_get(x_157, 1);
 lean_inc(x_163);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- lean_ctor_release(x_161, 1);
- x_164 = x_161;
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_164 = x_157;
 } else {
- lean_dec_ref(x_161);
+ lean_dec_ref(x_157);
  x_164 = lean_box(0);
 }
 if (lean_is_scalar(x_164)) {
- x_165 = lean_alloc_ctor(0, 2, 0);
+ x_165 = lean_alloc_ctor(1, 2, 0);
 } else {
  x_165 = x_164;
 }
@@ -11372,305 +12238,255 @@ lean_ctor_set(x_165, 0, x_162);
 lean_ctor_set(x_165, 1, x_163);
 return x_165;
 }
+}
+}
+}
+}
+}
 else
 {
-lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; 
-x_166 = lean_ctor_get(x_161, 0);
-lean_inc(x_166);
-x_167 = lean_ctor_get(x_161, 1);
+uint8_t x_166; 
+lean_dec(x_3);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_166 = !lean_is_exclusive(x_14);
+if (x_166 == 0)
+{
+return x_14;
+}
+else
+{
+lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+x_167 = lean_ctor_get(x_14, 0);
+x_168 = lean_ctor_get(x_14, 1);
+lean_inc(x_168);
 lean_inc(x_167);
-if (lean_is_exclusive(x_161)) {
- lean_ctor_release(x_161, 0);
- lean_ctor_release(x_161, 1);
- x_168 = x_161;
-} else {
- lean_dec_ref(x_161);
- x_168 = lean_box(0);
-}
-if (lean_is_scalar(x_168)) {
- x_169 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_169 = x_168;
-}
-lean_ctor_set(x_169, 0, x_166);
-lean_ctor_set(x_169, 1, x_167);
+lean_dec(x_14);
+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;
 }
 }
 }
+else
+{
+uint8_t x_170; uint8_t x_171; uint8_t x_172; uint8_t x_173; uint8_t x_174; uint8_t x_175; uint8_t x_176; uint8_t x_177; uint8_t x_178; lean_object* x_179; uint8_t x_180; lean_object* x_181; 
+x_170 = lean_ctor_get_uint8(x_10, 0);
+x_171 = lean_ctor_get_uint8(x_10, 1);
+x_172 = lean_ctor_get_uint8(x_10, 2);
+x_173 = lean_ctor_get_uint8(x_10, 3);
+x_174 = lean_ctor_get_uint8(x_10, 4);
+x_175 = lean_ctor_get_uint8(x_10, 6);
+x_176 = lean_ctor_get_uint8(x_10, 7);
+x_177 = lean_ctor_get_uint8(x_10, 8);
+lean_dec(x_10);
+x_178 = 2;
+x_179 = lean_alloc_ctor(0, 0, 9);
+lean_ctor_set_uint8(x_179, 0, x_170);
+lean_ctor_set_uint8(x_179, 1, x_171);
+lean_ctor_set_uint8(x_179, 2, x_172);
+lean_ctor_set_uint8(x_179, 3, x_173);
+lean_ctor_set_uint8(x_179, 4, x_174);
+lean_ctor_set_uint8(x_179, 5, x_178);
+lean_ctor_set_uint8(x_179, 6, x_175);
+lean_ctor_set_uint8(x_179, 7, x_176);
+lean_ctor_set_uint8(x_179, 8, x_177);
+lean_ctor_set(x_3, 0, x_179);
+x_180 = 1;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+x_181 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_180, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_181) == 0)
+{
+lean_object* x_182; lean_object* x_183; 
+x_182 = lean_ctor_get(x_181, 0);
+lean_inc(x_182);
+x_183 = lean_ctor_get(x_182, 0);
+lean_inc(x_183);
+switch (lean_obj_tag(x_183)) {
+case 0:
+{
+lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
+x_184 = lean_ctor_get(x_181, 1);
+lean_inc(x_184);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_185 = x_181;
+} else {
+ lean_dec_ref(x_181);
+ x_185 = lean_box(0);
+}
+x_186 = lean_ctor_get(x_182, 1);
+lean_inc(x_186);
+lean_dec(x_182);
+x_187 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1___rarg(x_1, x_183);
+lean_dec(x_183);
+if (lean_obj_tag(x_187) == 0)
+{
+lean_object* x_188; 
+lean_dec(x_186);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_185)) {
+ x_188 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_188 = x_185;
+}
+lean_ctor_set(x_188, 0, x_8);
+lean_ctor_set(x_188, 1, x_184);
+return x_188;
+}
+else
+{
+lean_object* x_189; lean_object* x_190; 
+lean_dec(x_185);
+x_189 = lean_ctor_get(x_187, 0);
+lean_inc(x_189);
+lean_dec(x_187);
+x_190 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_186, x_189, x_8, x_3, x_4, x_5, x_6, x_184);
+if (lean_obj_tag(x_190) == 0)
+{
+lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
+x_191 = lean_ctor_get(x_190, 0);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_190, 1);
+lean_inc(x_192);
+if (lean_is_exclusive(x_190)) {
+ lean_ctor_release(x_190, 0);
+ lean_ctor_release(x_190, 1);
+ x_193 = x_190;
+} else {
+ lean_dec_ref(x_190);
+ x_193 = lean_box(0);
+}
+if (lean_is_scalar(x_193)) {
+ x_194 = lean_alloc_ctor(0, 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_195 = lean_ctor_get(x_190, 0);
+lean_inc(x_195);
+x_196 = lean_ctor_get(x_190, 1);
+lean_inc(x_196);
+if (lean_is_exclusive(x_190)) {
+ lean_ctor_release(x_190, 0);
+ lean_ctor_release(x_190, 1);
+ x_197 = x_190;
+} else {
+ lean_dec_ref(x_190);
+ x_197 = lean_box(0);
+}
+if (lean_is_scalar(x_197)) {
+ x_198 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_198 = x_197;
+}
+lean_ctor_set(x_198, 0, x_195);
+lean_ctor_set(x_198, 1, x_196);
+return x_198;
+}
+}
+}
 case 1:
 {
-lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; 
-x_170 = lean_ctor_get(x_152, 1);
-lean_inc(x_170);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_171 = x_152;
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; 
+x_199 = lean_ctor_get(x_181, 1);
+lean_inc(x_199);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_200 = x_181;
 } else {
- lean_dec_ref(x_152);
- x_171 = lean_box(0);
+ lean_dec_ref(x_181);
+ x_200 = lean_box(0);
 }
-x_172 = lean_ctor_get(x_153, 1);
-lean_inc(x_172);
-lean_dec(x_153);
-x_173 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__4___rarg(x_1, x_154);
-lean_dec(x_154);
-if (lean_obj_tag(x_173) == 0)
+x_201 = lean_ctor_get(x_182, 1);
+lean_inc(x_201);
+lean_dec(x_182);
+x_202 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__4___rarg(x_1, x_183);
+lean_dec(x_183);
+if (lean_obj_tag(x_202) == 0)
 {
-lean_object* x_174; 
-lean_dec(x_172);
+lean_object* x_203; 
+lean_dec(x_201);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_171)) {
- x_174 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_200)) {
+ x_203 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_174 = x_171;
+ x_203 = x_200;
 }
-lean_ctor_set(x_174, 0, x_8);
-lean_ctor_set(x_174, 1, x_170);
-return x_174;
+lean_ctor_set(x_203, 0, x_8);
+lean_ctor_set(x_203, 1, x_199);
+return x_203;
 }
 else
 {
-lean_object* x_175; lean_object* x_176; 
-lean_dec(x_171);
-x_175 = lean_ctor_get(x_173, 0);
-lean_inc(x_175);
-lean_dec(x_173);
-x_176 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_172, x_175, x_8, x_3, x_4, x_5, x_6, x_170);
-if (lean_obj_tag(x_176) == 0)
+lean_object* x_204; lean_object* x_205; 
+lean_dec(x_200);
+x_204 = lean_ctor_get(x_202, 0);
+lean_inc(x_204);
+lean_dec(x_202);
+x_205 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_201, x_204, x_8, x_3, x_4, x_5, x_6, x_199);
+if (lean_obj_tag(x_205) == 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_inc(x_178);
-if (lean_is_exclusive(x_176)) {
- lean_ctor_release(x_176, 0);
- lean_ctor_release(x_176, 1);
- x_179 = x_176;
+lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; 
+x_206 = lean_ctor_get(x_205, 0);
+lean_inc(x_206);
+x_207 = lean_ctor_get(x_205, 1);
+lean_inc(x_207);
+if (lean_is_exclusive(x_205)) {
+ lean_ctor_release(x_205, 0);
+ lean_ctor_release(x_205, 1);
+ x_208 = x_205;
 } else {
- lean_dec_ref(x_176);
- x_179 = lean_box(0);
+ lean_dec_ref(x_205);
+ x_208 = lean_box(0);
 }
-if (lean_is_scalar(x_179)) {
- x_180 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_208)) {
+ x_209 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_180 = x_179;
+ x_209 = x_208;
 }
-lean_ctor_set(x_180, 0, x_177);
-lean_ctor_set(x_180, 1, x_178);
-return x_180;
+lean_ctor_set(x_209, 0, x_206);
+lean_ctor_set(x_209, 1, x_207);
+return x_209;
 }
 else
 {
-lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; 
-x_181 = lean_ctor_get(x_176, 0);
-lean_inc(x_181);
-x_182 = lean_ctor_get(x_176, 1);
-lean_inc(x_182);
-if (lean_is_exclusive(x_176)) {
- lean_ctor_release(x_176, 0);
- lean_ctor_release(x_176, 1);
- x_183 = x_176;
-} else {
- lean_dec_ref(x_176);
- x_183 = lean_box(0);
-}
-if (lean_is_scalar(x_183)) {
- x_184 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_184 = x_183;
-}
-lean_ctor_set(x_184, 0, x_181);
-lean_ctor_set(x_184, 1, x_182);
-return x_184;
-}
-}
-}
-case 2:
-{
-lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; 
-x_185 = lean_ctor_get(x_152, 1);
-lean_inc(x_185);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_186 = x_152;
-} else {
- lean_dec_ref(x_152);
- x_186 = lean_box(0);
-}
-x_187 = lean_ctor_get(x_153, 1);
-lean_inc(x_187);
-lean_dec(x_153);
-x_188 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg(x_1, x_154);
-lean_dec(x_154);
-if (lean_obj_tag(x_188) == 0)
-{
-lean_object* x_189; 
-lean_dec(x_187);
-lean_dec(x_3);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_186)) {
- x_189 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_189 = x_186;
-}
-lean_ctor_set(x_189, 0, x_8);
-lean_ctor_set(x_189, 1, x_185);
-return x_189;
-}
-else
-{
-lean_object* x_190; lean_object* x_191; 
-lean_dec(x_186);
-x_190 = lean_ctor_get(x_188, 0);
-lean_inc(x_190);
-lean_dec(x_188);
-x_191 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_187, x_190, x_8, x_3, x_4, x_5, x_6, x_185);
-if (lean_obj_tag(x_191) == 0)
-{
-lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; 
-x_192 = lean_ctor_get(x_191, 0);
-lean_inc(x_192);
-x_193 = lean_ctor_get(x_191, 1);
-lean_inc(x_193);
-if (lean_is_exclusive(x_191)) {
- lean_ctor_release(x_191, 0);
- lean_ctor_release(x_191, 1);
- x_194 = x_191;
-} else {
- lean_dec_ref(x_191);
- x_194 = lean_box(0);
-}
-if (lean_is_scalar(x_194)) {
- x_195 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_195 = x_194;
-}
-lean_ctor_set(x_195, 0, x_192);
-lean_ctor_set(x_195, 1, x_193);
-return x_195;
-}
-else
-{
-lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_196 = lean_ctor_get(x_191, 0);
-lean_inc(x_196);
-x_197 = lean_ctor_get(x_191, 1);
-lean_inc(x_197);
-if (lean_is_exclusive(x_191)) {
- lean_ctor_release(x_191, 0);
- lean_ctor_release(x_191, 1);
- x_198 = x_191;
-} else {
- lean_dec_ref(x_191);
- 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;
-}
-}
-}
-case 3:
-{
-lean_object* x_200; lean_object* x_201; lean_object* x_202; 
-lean_dec(x_153);
-lean_dec(x_3);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_200 = lean_ctor_get(x_152, 1);
-lean_inc(x_200);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_201 = x_152;
-} else {
- lean_dec_ref(x_152);
- x_201 = lean_box(0);
-}
-if (lean_is_scalar(x_201)) {
- x_202 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_202 = x_201;
-}
-lean_ctor_set(x_202, 0, x_8);
-lean_ctor_set(x_202, 1, x_200);
-return x_202;
-}
-default: 
-{
-lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
-x_203 = lean_ctor_get(x_152, 1);
-lean_inc(x_203);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_204 = x_152;
-} else {
- lean_dec_ref(x_152);
- x_204 = lean_box(0);
-}
-x_205 = lean_ctor_get(x_153, 1);
-lean_inc(x_205);
-lean_dec(x_153);
-x_206 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__10___rarg(x_1, x_154);
-if (lean_obj_tag(x_206) == 0)
-{
-lean_object* x_207; 
-lean_dec(x_205);
-lean_dec(x_3);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_204)) {
- x_207 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_207 = x_204;
-}
-lean_ctor_set(x_207, 0, x_8);
-lean_ctor_set(x_207, 1, x_203);
-return x_207;
-}
-else
-{
-lean_object* x_208; lean_object* x_209; 
-lean_dec(x_204);
-x_208 = lean_ctor_get(x_206, 0);
-lean_inc(x_208);
-lean_dec(x_206);
-x_209 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_205, x_208, x_8, x_3, x_4, x_5, x_6, x_203);
-if (lean_obj_tag(x_209) == 0)
-{
 lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; 
-x_210 = lean_ctor_get(x_209, 0);
+x_210 = lean_ctor_get(x_205, 0);
 lean_inc(x_210);
-x_211 = lean_ctor_get(x_209, 1);
+x_211 = lean_ctor_get(x_205, 1);
 lean_inc(x_211);
-if (lean_is_exclusive(x_209)) {
- lean_ctor_release(x_209, 0);
- lean_ctor_release(x_209, 1);
- x_212 = x_209;
+if (lean_is_exclusive(x_205)) {
+ lean_ctor_release(x_205, 0);
+ lean_ctor_release(x_205, 1);
+ x_212 = x_205;
 } else {
- lean_dec_ref(x_209);
+ lean_dec_ref(x_205);
  x_212 = lean_box(0);
 }
 if (lean_is_scalar(x_212)) {
- x_213 = lean_alloc_ctor(0, 2, 0);
+ x_213 = lean_alloc_ctor(1, 2, 0);
 } else {
  x_213 = x_212;
 }
@@ -11678,29 +12494,310 @@ lean_ctor_set(x_213, 0, x_210);
 lean_ctor_set(x_213, 1, x_211);
 return x_213;
 }
-else
+}
+}
+case 2:
 {
 lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; 
-x_214 = lean_ctor_get(x_209, 0);
+x_214 = lean_ctor_get(x_181, 1);
 lean_inc(x_214);
-x_215 = lean_ctor_get(x_209, 1);
-lean_inc(x_215);
-if (lean_is_exclusive(x_209)) {
- lean_ctor_release(x_209, 0);
- lean_ctor_release(x_209, 1);
- x_216 = x_209;
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_215 = x_181;
 } else {
- lean_dec_ref(x_209);
- x_216 = lean_box(0);
+ lean_dec_ref(x_181);
+ x_215 = lean_box(0);
 }
-if (lean_is_scalar(x_216)) {
- x_217 = lean_alloc_ctor(1, 2, 0);
+x_216 = lean_ctor_get(x_182, 1);
+lean_inc(x_216);
+lean_dec(x_182);
+x_217 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg(x_1, x_183);
+lean_dec(x_183);
+if (lean_obj_tag(x_217) == 0)
+{
+lean_object* x_218; 
+lean_dec(x_216);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_215)) {
+ x_218 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_217 = x_216;
+ x_218 = x_215;
 }
-lean_ctor_set(x_217, 0, x_214);
-lean_ctor_set(x_217, 1, x_215);
-return x_217;
+lean_ctor_set(x_218, 0, x_8);
+lean_ctor_set(x_218, 1, x_214);
+return x_218;
+}
+else
+{
+lean_object* x_219; lean_object* x_220; 
+lean_dec(x_215);
+x_219 = lean_ctor_get(x_217, 0);
+lean_inc(x_219);
+lean_dec(x_217);
+x_220 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_216, x_219, x_8, x_3, x_4, x_5, x_6, x_214);
+if (lean_obj_tag(x_220) == 0)
+{
+lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; 
+x_221 = lean_ctor_get(x_220, 0);
+lean_inc(x_221);
+x_222 = lean_ctor_get(x_220, 1);
+lean_inc(x_222);
+if (lean_is_exclusive(x_220)) {
+ lean_ctor_release(x_220, 0);
+ lean_ctor_release(x_220, 1);
+ x_223 = x_220;
+} else {
+ lean_dec_ref(x_220);
+ x_223 = lean_box(0);
+}
+if (lean_is_scalar(x_223)) {
+ x_224 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_224 = x_223;
+}
+lean_ctor_set(x_224, 0, x_221);
+lean_ctor_set(x_224, 1, x_222);
+return x_224;
+}
+else
+{
+lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; 
+x_225 = lean_ctor_get(x_220, 0);
+lean_inc(x_225);
+x_226 = lean_ctor_get(x_220, 1);
+lean_inc(x_226);
+if (lean_is_exclusive(x_220)) {
+ lean_ctor_release(x_220, 0);
+ lean_ctor_release(x_220, 1);
+ x_227 = x_220;
+} else {
+ lean_dec_ref(x_220);
+ x_227 = lean_box(0);
+}
+if (lean_is_scalar(x_227)) {
+ x_228 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_228 = x_227;
+}
+lean_ctor_set(x_228, 0, x_225);
+lean_ctor_set(x_228, 1, x_226);
+return x_228;
+}
+}
+}
+case 3:
+{
+lean_object* x_229; lean_object* x_230; lean_object* x_231; 
+lean_dec(x_182);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_229 = lean_ctor_get(x_181, 1);
+lean_inc(x_229);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_230 = x_181;
+} else {
+ lean_dec_ref(x_181);
+ x_230 = lean_box(0);
+}
+if (lean_is_scalar(x_230)) {
+ x_231 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_231 = x_230;
+}
+lean_ctor_set(x_231, 0, x_8);
+lean_ctor_set(x_231, 1, x_229);
+return x_231;
+}
+case 4:
+{
+lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+x_232 = lean_ctor_get(x_181, 1);
+lean_inc(x_232);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_233 = x_181;
+} else {
+ lean_dec_ref(x_181);
+ x_233 = lean_box(0);
+}
+x_234 = lean_ctor_get(x_182, 1);
+lean_inc(x_234);
+lean_dec(x_182);
+x_235 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__10___rarg(x_1, x_183);
+if (lean_obj_tag(x_235) == 0)
+{
+lean_object* x_236; 
+lean_dec(x_234);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_233)) {
+ x_236 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_236 = x_233;
+}
+lean_ctor_set(x_236, 0, x_8);
+lean_ctor_set(x_236, 1, x_232);
+return x_236;
+}
+else
+{
+lean_object* x_237; lean_object* x_238; 
+lean_dec(x_233);
+x_237 = lean_ctor_get(x_235, 0);
+lean_inc(x_237);
+lean_dec(x_235);
+x_238 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_234, x_237, x_8, x_3, x_4, x_5, x_6, x_232);
+if (lean_obj_tag(x_238) == 0)
+{
+lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; 
+x_239 = lean_ctor_get(x_238, 0);
+lean_inc(x_239);
+x_240 = lean_ctor_get(x_238, 1);
+lean_inc(x_240);
+if (lean_is_exclusive(x_238)) {
+ lean_ctor_release(x_238, 0);
+ lean_ctor_release(x_238, 1);
+ x_241 = x_238;
+} else {
+ lean_dec_ref(x_238);
+ x_241 = lean_box(0);
+}
+if (lean_is_scalar(x_241)) {
+ x_242 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_242 = x_241;
+}
+lean_ctor_set(x_242, 0, x_239);
+lean_ctor_set(x_242, 1, x_240);
+return x_242;
+}
+else
+{
+lean_object* x_243; lean_object* x_244; lean_object* x_245; lean_object* x_246; 
+x_243 = lean_ctor_get(x_238, 0);
+lean_inc(x_243);
+x_244 = lean_ctor_get(x_238, 1);
+lean_inc(x_244);
+if (lean_is_exclusive(x_238)) {
+ lean_ctor_release(x_238, 0);
+ lean_ctor_release(x_238, 1);
+ x_245 = x_238;
+} else {
+ lean_dec_ref(x_238);
+ x_245 = lean_box(0);
+}
+if (lean_is_scalar(x_245)) {
+ x_246 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_246 = x_245;
+}
+lean_ctor_set(x_246, 0, x_243);
+lean_ctor_set(x_246, 1, x_244);
+return x_246;
+}
+}
+}
+default: 
+{
+lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; 
+x_247 = lean_ctor_get(x_181, 1);
+lean_inc(x_247);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_248 = x_181;
+} else {
+ lean_dec_ref(x_181);
+ x_248 = lean_box(0);
+}
+x_249 = lean_ctor_get(x_182, 1);
+lean_inc(x_249);
+lean_dec(x_182);
+x_250 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(x_1, x_183);
+if (lean_obj_tag(x_250) == 0)
+{
+lean_object* x_251; 
+lean_dec(x_249);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_248)) {
+ x_251 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_251 = x_248;
+}
+lean_ctor_set(x_251, 0, x_8);
+lean_ctor_set(x_251, 1, x_247);
+return x_251;
+}
+else
+{
+lean_object* x_252; lean_object* x_253; 
+lean_dec(x_248);
+x_252 = lean_ctor_get(x_250, 0);
+lean_inc(x_252);
+lean_dec(x_250);
+x_253 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_249, x_252, x_8, x_3, x_4, x_5, x_6, x_247);
+if (lean_obj_tag(x_253) == 0)
+{
+lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; 
+x_254 = lean_ctor_get(x_253, 0);
+lean_inc(x_254);
+x_255 = lean_ctor_get(x_253, 1);
+lean_inc(x_255);
+if (lean_is_exclusive(x_253)) {
+ lean_ctor_release(x_253, 0);
+ lean_ctor_release(x_253, 1);
+ x_256 = x_253;
+} else {
+ lean_dec_ref(x_253);
+ x_256 = lean_box(0);
+}
+if (lean_is_scalar(x_256)) {
+ x_257 = lean_alloc_ctor(0, 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; 
+x_258 = lean_ctor_get(x_253, 0);
+lean_inc(x_258);
+x_259 = lean_ctor_get(x_253, 1);
+lean_inc(x_259);
+if (lean_is_exclusive(x_253)) {
+ lean_ctor_release(x_253, 0);
+ lean_ctor_release(x_253, 1);
+ x_260 = x_253;
+} else {
+ lean_dec_ref(x_253);
+ 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;
 }
 }
 }
@@ -11708,462 +12805,180 @@ return x_217;
 }
 else
 {
-lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; 
+lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; 
 lean_dec(x_3);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_218 = lean_ctor_get(x_152, 0);
-lean_inc(x_218);
-x_219 = lean_ctor_get(x_152, 1);
-lean_inc(x_219);
-if (lean_is_exclusive(x_152)) {
- lean_ctor_release(x_152, 0);
- lean_ctor_release(x_152, 1);
- x_220 = x_152;
+x_262 = lean_ctor_get(x_181, 0);
+lean_inc(x_262);
+x_263 = lean_ctor_get(x_181, 1);
+lean_inc(x_263);
+if (lean_is_exclusive(x_181)) {
+ lean_ctor_release(x_181, 0);
+ lean_ctor_release(x_181, 1);
+ x_264 = x_181;
 } else {
- lean_dec_ref(x_152);
- x_220 = lean_box(0);
+ lean_dec_ref(x_181);
+ x_264 = lean_box(0);
 }
-if (lean_is_scalar(x_220)) {
- x_221 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_264)) {
+ x_265 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_221 = x_220;
+ x_265 = x_264;
 }
-lean_ctor_set(x_221, 0, x_218);
-lean_ctor_set(x_221, 1, x_219);
-return x_221;
+lean_ctor_set(x_265, 0, x_262);
+lean_ctor_set(x_265, 1, x_263);
+return x_265;
 }
 }
 }
 else
 {
-lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; uint8_t x_226; uint8_t x_227; uint8_t x_228; uint8_t x_229; uint8_t x_230; uint8_t x_231; uint8_t x_232; uint8_t x_233; lean_object* x_234; uint8_t x_235; lean_object* x_236; lean_object* x_237; uint8_t x_238; lean_object* x_239; 
-x_222 = lean_ctor_get(x_3, 0);
-x_223 = lean_ctor_get(x_3, 1);
-x_224 = lean_ctor_get(x_3, 2);
-x_225 = lean_ctor_get(x_3, 3);
-lean_inc(x_225);
-lean_inc(x_224);
-lean_inc(x_223);
-lean_inc(x_222);
+lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; uint8_t x_270; uint8_t x_271; uint8_t x_272; uint8_t x_273; uint8_t x_274; uint8_t x_275; uint8_t x_276; uint8_t x_277; lean_object* x_278; uint8_t x_279; lean_object* x_280; lean_object* x_281; uint8_t x_282; lean_object* x_283; 
+x_266 = lean_ctor_get(x_3, 0);
+x_267 = lean_ctor_get(x_3, 1);
+x_268 = lean_ctor_get(x_3, 2);
+x_269 = lean_ctor_get(x_3, 3);
+lean_inc(x_269);
+lean_inc(x_268);
+lean_inc(x_267);
+lean_inc(x_266);
 lean_dec(x_3);
-x_226 = lean_ctor_get_uint8(x_222, 0);
-x_227 = lean_ctor_get_uint8(x_222, 1);
-x_228 = lean_ctor_get_uint8(x_222, 2);
-x_229 = lean_ctor_get_uint8(x_222, 3);
-x_230 = lean_ctor_get_uint8(x_222, 4);
-x_231 = lean_ctor_get_uint8(x_222, 6);
-x_232 = lean_ctor_get_uint8(x_222, 7);
-x_233 = lean_ctor_get_uint8(x_222, 8);
-if (lean_is_exclusive(x_222)) {
- x_234 = x_222;
+x_270 = lean_ctor_get_uint8(x_266, 0);
+x_271 = lean_ctor_get_uint8(x_266, 1);
+x_272 = lean_ctor_get_uint8(x_266, 2);
+x_273 = lean_ctor_get_uint8(x_266, 3);
+x_274 = lean_ctor_get_uint8(x_266, 4);
+x_275 = lean_ctor_get_uint8(x_266, 6);
+x_276 = lean_ctor_get_uint8(x_266, 7);
+x_277 = lean_ctor_get_uint8(x_266, 8);
+if (lean_is_exclusive(x_266)) {
+ x_278 = x_266;
 } else {
- lean_dec_ref(x_222);
- x_234 = lean_box(0);
+ lean_dec_ref(x_266);
+ x_278 = lean_box(0);
 }
-x_235 = 2;
-if (lean_is_scalar(x_234)) {
- x_236 = lean_alloc_ctor(0, 0, 9);
+x_279 = 2;
+if (lean_is_scalar(x_278)) {
+ x_280 = lean_alloc_ctor(0, 0, 9);
 } else {
- x_236 = x_234;
+ x_280 = x_278;
 }
-lean_ctor_set_uint8(x_236, 0, x_226);
-lean_ctor_set_uint8(x_236, 1, x_227);
-lean_ctor_set_uint8(x_236, 2, x_228);
-lean_ctor_set_uint8(x_236, 3, x_229);
-lean_ctor_set_uint8(x_236, 4, x_230);
-lean_ctor_set_uint8(x_236, 5, x_235);
-lean_ctor_set_uint8(x_236, 6, x_231);
-lean_ctor_set_uint8(x_236, 7, x_232);
-lean_ctor_set_uint8(x_236, 8, x_233);
-x_237 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_237, 0, x_236);
-lean_ctor_set(x_237, 1, x_223);
-lean_ctor_set(x_237, 2, x_224);
-lean_ctor_set(x_237, 3, x_225);
-x_238 = 1;
+lean_ctor_set_uint8(x_280, 0, x_270);
+lean_ctor_set_uint8(x_280, 1, x_271);
+lean_ctor_set_uint8(x_280, 2, x_272);
+lean_ctor_set_uint8(x_280, 3, x_273);
+lean_ctor_set_uint8(x_280, 4, x_274);
+lean_ctor_set_uint8(x_280, 5, x_279);
+lean_ctor_set_uint8(x_280, 6, x_275);
+lean_ctor_set_uint8(x_280, 7, x_276);
+lean_ctor_set_uint8(x_280, 8, x_277);
+x_281 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_281, 0, x_280);
+lean_ctor_set(x_281, 1, x_267);
+lean_ctor_set(x_281, 2, x_268);
+lean_ctor_set(x_281, 3, x_269);
+x_282 = 1;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-lean_inc(x_237);
-x_239 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_238, x_237, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_239) == 0)
+lean_inc(x_281);
+x_283 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_282, x_281, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_283) == 0)
 {
-lean_object* x_240; lean_object* x_241; 
-x_240 = lean_ctor_get(x_239, 0);
-lean_inc(x_240);
-x_241 = lean_ctor_get(x_240, 0);
-lean_inc(x_241);
-switch (lean_obj_tag(x_241)) {
+lean_object* x_284; lean_object* x_285; 
+x_284 = lean_ctor_get(x_283, 0);
+lean_inc(x_284);
+x_285 = lean_ctor_get(x_284, 0);
+lean_inc(x_285);
+switch (lean_obj_tag(x_285)) {
 case 0:
 {
-lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; 
-x_242 = lean_ctor_get(x_239, 1);
-lean_inc(x_242);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_243 = x_239;
+lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; 
+x_286 = lean_ctor_get(x_283, 1);
+lean_inc(x_286);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_287 = x_283;
 } else {
- lean_dec_ref(x_239);
- x_243 = lean_box(0);
+ lean_dec_ref(x_283);
+ x_287 = lean_box(0);
 }
-x_244 = lean_ctor_get(x_240, 1);
-lean_inc(x_244);
-lean_dec(x_240);
-x_245 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1___rarg(x_1, x_241);
-lean_dec(x_241);
-if (lean_obj_tag(x_245) == 0)
+x_288 = lean_ctor_get(x_284, 1);
+lean_inc(x_288);
+lean_dec(x_284);
+x_289 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__1___rarg(x_1, x_285);
+lean_dec(x_285);
+if (lean_obj_tag(x_289) == 0)
 {
-lean_object* x_246; 
-lean_dec(x_244);
-lean_dec(x_237);
+lean_object* x_290; 
+lean_dec(x_288);
+lean_dec(x_281);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_243)) {
- x_246 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_287)) {
+ x_290 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_246 = x_243;
+ x_290 = x_287;
 }
-lean_ctor_set(x_246, 0, x_8);
-lean_ctor_set(x_246, 1, x_242);
-return x_246;
+lean_ctor_set(x_290, 0, x_8);
+lean_ctor_set(x_290, 1, x_286);
+return x_290;
 }
 else
 {
-lean_object* x_247; lean_object* x_248; 
-lean_dec(x_243);
-x_247 = lean_ctor_get(x_245, 0);
-lean_inc(x_247);
-lean_dec(x_245);
-x_248 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_244, x_247, x_8, x_237, x_4, x_5, x_6, x_242);
-if (lean_obj_tag(x_248) == 0)
+lean_object* x_291; lean_object* x_292; 
+lean_dec(x_287);
+x_291 = lean_ctor_get(x_289, 0);
+lean_inc(x_291);
+lean_dec(x_289);
+x_292 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_288, x_291, x_8, x_281, x_4, x_5, x_6, x_286);
+if (lean_obj_tag(x_292) == 0)
 {
-lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; 
-x_249 = lean_ctor_get(x_248, 0);
-lean_inc(x_249);
-x_250 = lean_ctor_get(x_248, 1);
-lean_inc(x_250);
-if (lean_is_exclusive(x_248)) {
- lean_ctor_release(x_248, 0);
- lean_ctor_release(x_248, 1);
- x_251 = x_248;
+lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; 
+x_293 = lean_ctor_get(x_292, 0);
+lean_inc(x_293);
+x_294 = lean_ctor_get(x_292, 1);
+lean_inc(x_294);
+if (lean_is_exclusive(x_292)) {
+ lean_ctor_release(x_292, 0);
+ lean_ctor_release(x_292, 1);
+ x_295 = x_292;
 } else {
- lean_dec_ref(x_248);
- x_251 = lean_box(0);
+ lean_dec_ref(x_292);
+ x_295 = lean_box(0);
 }
-if (lean_is_scalar(x_251)) {
- x_252 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_295)) {
+ x_296 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_252 = x_251;
+ x_296 = x_295;
 }
-lean_ctor_set(x_252, 0, x_249);
-lean_ctor_set(x_252, 1, x_250);
-return x_252;
+lean_ctor_set(x_296, 0, x_293);
+lean_ctor_set(x_296, 1, x_294);
+return x_296;
 }
 else
 {
-lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; 
-x_253 = lean_ctor_get(x_248, 0);
-lean_inc(x_253);
-x_254 = lean_ctor_get(x_248, 1);
-lean_inc(x_254);
-if (lean_is_exclusive(x_248)) {
- lean_ctor_release(x_248, 0);
- lean_ctor_release(x_248, 1);
- x_255 = x_248;
-} else {
- lean_dec_ref(x_248);
- x_255 = lean_box(0);
-}
-if (lean_is_scalar(x_255)) {
- x_256 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_256 = x_255;
-}
-lean_ctor_set(x_256, 0, x_253);
-lean_ctor_set(x_256, 1, x_254);
-return x_256;
-}
-}
-}
-case 1:
-{
-lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; 
-x_257 = lean_ctor_get(x_239, 1);
-lean_inc(x_257);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_258 = x_239;
-} else {
- lean_dec_ref(x_239);
- x_258 = lean_box(0);
-}
-x_259 = lean_ctor_get(x_240, 1);
-lean_inc(x_259);
-lean_dec(x_240);
-x_260 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__4___rarg(x_1, x_241);
-lean_dec(x_241);
-if (lean_obj_tag(x_260) == 0)
-{
-lean_object* x_261; 
-lean_dec(x_259);
-lean_dec(x_237);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_258)) {
- x_261 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_261 = x_258;
-}
-lean_ctor_set(x_261, 0, x_8);
-lean_ctor_set(x_261, 1, x_257);
-return x_261;
-}
-else
-{
-lean_object* x_262; lean_object* x_263; 
-lean_dec(x_258);
-x_262 = lean_ctor_get(x_260, 0);
-lean_inc(x_262);
-lean_dec(x_260);
-x_263 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_259, x_262, x_8, x_237, x_4, x_5, x_6, x_257);
-if (lean_obj_tag(x_263) == 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;
-} else {
- lean_dec_ref(x_263);
- x_266 = lean_box(0);
-}
-if (lean_is_scalar(x_266)) {
- x_267 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_267 = x_266;
-}
-lean_ctor_set(x_267, 0, x_264);
-lean_ctor_set(x_267, 1, x_265);
-return x_267;
-}
-else
-{
-lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; 
-x_268 = lean_ctor_get(x_263, 0);
-lean_inc(x_268);
-x_269 = lean_ctor_get(x_263, 1);
-lean_inc(x_269);
-if (lean_is_exclusive(x_263)) {
- lean_ctor_release(x_263, 0);
- lean_ctor_release(x_263, 1);
- x_270 = x_263;
-} else {
- lean_dec_ref(x_263);
- x_270 = lean_box(0);
-}
-if (lean_is_scalar(x_270)) {
- x_271 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_271 = x_270;
-}
-lean_ctor_set(x_271, 0, x_268);
-lean_ctor_set(x_271, 1, x_269);
-return x_271;
-}
-}
-}
-case 2:
-{
-lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; 
-x_272 = lean_ctor_get(x_239, 1);
-lean_inc(x_272);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_273 = x_239;
-} else {
- lean_dec_ref(x_239);
- x_273 = lean_box(0);
-}
-x_274 = lean_ctor_get(x_240, 1);
-lean_inc(x_274);
-lean_dec(x_240);
-x_275 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg(x_1, x_241);
-lean_dec(x_241);
-if (lean_obj_tag(x_275) == 0)
-{
-lean_object* x_276; 
-lean_dec(x_274);
-lean_dec(x_237);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_273)) {
- x_276 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_276 = x_273;
-}
-lean_ctor_set(x_276, 0, x_8);
-lean_ctor_set(x_276, 1, x_272);
-return x_276;
-}
-else
-{
-lean_object* x_277; lean_object* x_278; 
-lean_dec(x_273);
-x_277 = lean_ctor_get(x_275, 0);
-lean_inc(x_277);
-lean_dec(x_275);
-x_278 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_274, x_277, x_8, x_237, x_4, x_5, x_6, x_272);
-if (lean_obj_tag(x_278) == 0)
-{
-lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; 
-x_279 = lean_ctor_get(x_278, 0);
-lean_inc(x_279);
-x_280 = lean_ctor_get(x_278, 1);
-lean_inc(x_280);
-if (lean_is_exclusive(x_278)) {
- lean_ctor_release(x_278, 0);
- lean_ctor_release(x_278, 1);
- x_281 = x_278;
-} else {
- lean_dec_ref(x_278);
- x_281 = lean_box(0);
-}
-if (lean_is_scalar(x_281)) {
- x_282 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_282 = x_281;
-}
-lean_ctor_set(x_282, 0, x_279);
-lean_ctor_set(x_282, 1, x_280);
-return x_282;
-}
-else
-{
-lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; 
-x_283 = lean_ctor_get(x_278, 0);
-lean_inc(x_283);
-x_284 = lean_ctor_get(x_278, 1);
-lean_inc(x_284);
-if (lean_is_exclusive(x_278)) {
- lean_ctor_release(x_278, 0);
- lean_ctor_release(x_278, 1);
- x_285 = x_278;
-} else {
- lean_dec_ref(x_278);
- x_285 = lean_box(0);
-}
-if (lean_is_scalar(x_285)) {
- x_286 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_286 = x_285;
-}
-lean_ctor_set(x_286, 0, x_283);
-lean_ctor_set(x_286, 1, x_284);
-return x_286;
-}
-}
-}
-case 3:
-{
-lean_object* x_287; lean_object* x_288; lean_object* x_289; 
-lean_dec(x_240);
-lean_dec(x_237);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_1);
-x_287 = lean_ctor_get(x_239, 1);
-lean_inc(x_287);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_288 = x_239;
-} else {
- lean_dec_ref(x_239);
- x_288 = lean_box(0);
-}
-if (lean_is_scalar(x_288)) {
- x_289 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_289 = x_288;
-}
-lean_ctor_set(x_289, 0, x_8);
-lean_ctor_set(x_289, 1, x_287);
-return x_289;
-}
-default: 
-{
-lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; 
-x_290 = lean_ctor_get(x_239, 1);
-lean_inc(x_290);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_291 = x_239;
-} else {
- lean_dec_ref(x_239);
- x_291 = lean_box(0);
-}
-x_292 = lean_ctor_get(x_240, 1);
-lean_inc(x_292);
-lean_dec(x_240);
-x_293 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__10___rarg(x_1, x_241);
-if (lean_obj_tag(x_293) == 0)
-{
-lean_object* x_294; 
-lean_dec(x_292);
-lean_dec(x_237);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_291)) {
- x_294 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_294 = x_291;
-}
-lean_ctor_set(x_294, 0, x_8);
-lean_ctor_set(x_294, 1, x_290);
-return x_294;
-}
-else
-{
-lean_object* x_295; lean_object* x_296; 
-lean_dec(x_291);
-x_295 = lean_ctor_get(x_293, 0);
-lean_inc(x_295);
-lean_dec(x_293);
-x_296 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_292, x_295, x_8, x_237, x_4, x_5, x_6, x_290);
-if (lean_obj_tag(x_296) == 0)
-{
 lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; 
-x_297 = lean_ctor_get(x_296, 0);
+x_297 = lean_ctor_get(x_292, 0);
 lean_inc(x_297);
-x_298 = lean_ctor_get(x_296, 1);
+x_298 = lean_ctor_get(x_292, 1);
 lean_inc(x_298);
-if (lean_is_exclusive(x_296)) {
- lean_ctor_release(x_296, 0);
- lean_ctor_release(x_296, 1);
- x_299 = x_296;
+if (lean_is_exclusive(x_292)) {
+ lean_ctor_release(x_292, 0);
+ lean_ctor_release(x_292, 1);
+ x_299 = x_292;
 } else {
- lean_dec_ref(x_296);
+ lean_dec_ref(x_292);
  x_299 = lean_box(0);
 }
 if (lean_is_scalar(x_299)) {
- x_300 = lean_alloc_ctor(0, 2, 0);
+ x_300 = lean_alloc_ctor(1, 2, 0);
 } else {
  x_300 = x_299;
 }
@@ -12171,29 +12986,403 @@ lean_ctor_set(x_300, 0, x_297);
 lean_ctor_set(x_300, 1, x_298);
 return x_300;
 }
-else
+}
+}
+case 1:
 {
 lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; 
-x_301 = lean_ctor_get(x_296, 0);
+x_301 = lean_ctor_get(x_283, 1);
 lean_inc(x_301);
-x_302 = lean_ctor_get(x_296, 1);
-lean_inc(x_302);
-if (lean_is_exclusive(x_296)) {
- lean_ctor_release(x_296, 0);
- lean_ctor_release(x_296, 1);
- x_303 = x_296;
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_302 = x_283;
 } else {
- lean_dec_ref(x_296);
- x_303 = lean_box(0);
+ lean_dec_ref(x_283);
+ x_302 = lean_box(0);
 }
-if (lean_is_scalar(x_303)) {
- x_304 = lean_alloc_ctor(1, 2, 0);
+x_303 = lean_ctor_get(x_284, 1);
+lean_inc(x_303);
+lean_dec(x_284);
+x_304 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__4___rarg(x_1, x_285);
+lean_dec(x_285);
+if (lean_obj_tag(x_304) == 0)
+{
+lean_object* x_305; 
+lean_dec(x_303);
+lean_dec(x_281);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_302)) {
+ x_305 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_304 = x_303;
+ x_305 = x_302;
 }
-lean_ctor_set(x_304, 0, x_301);
-lean_ctor_set(x_304, 1, x_302);
-return x_304;
+lean_ctor_set(x_305, 0, x_8);
+lean_ctor_set(x_305, 1, x_301);
+return x_305;
+}
+else
+{
+lean_object* x_306; lean_object* x_307; 
+lean_dec(x_302);
+x_306 = lean_ctor_get(x_304, 0);
+lean_inc(x_306);
+lean_dec(x_304);
+x_307 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_303, x_306, x_8, x_281, x_4, x_5, x_6, x_301);
+if (lean_obj_tag(x_307) == 0)
+{
+lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; 
+x_308 = lean_ctor_get(x_307, 0);
+lean_inc(x_308);
+x_309 = lean_ctor_get(x_307, 1);
+lean_inc(x_309);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_310 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_310 = lean_box(0);
+}
+if (lean_is_scalar(x_310)) {
+ x_311 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_311 = x_310;
+}
+lean_ctor_set(x_311, 0, x_308);
+lean_ctor_set(x_311, 1, x_309);
+return x_311;
+}
+else
+{
+lean_object* x_312; lean_object* x_313; lean_object* x_314; lean_object* x_315; 
+x_312 = lean_ctor_get(x_307, 0);
+lean_inc(x_312);
+x_313 = lean_ctor_get(x_307, 1);
+lean_inc(x_313);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_314 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_314 = lean_box(0);
+}
+if (lean_is_scalar(x_314)) {
+ x_315 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_315 = x_314;
+}
+lean_ctor_set(x_315, 0, x_312);
+lean_ctor_set(x_315, 1, x_313);
+return x_315;
+}
+}
+}
+case 2:
+{
+lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; 
+x_316 = lean_ctor_get(x_283, 1);
+lean_inc(x_316);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_317 = x_283;
+} else {
+ lean_dec_ref(x_283);
+ x_317 = lean_box(0);
+}
+x_318 = lean_ctor_get(x_284, 1);
+lean_inc(x_318);
+lean_dec(x_284);
+x_319 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg(x_1, x_285);
+lean_dec(x_285);
+if (lean_obj_tag(x_319) == 0)
+{
+lean_object* x_320; 
+lean_dec(x_318);
+lean_dec(x_281);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_317)) {
+ x_320 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_320 = x_317;
+}
+lean_ctor_set(x_320, 0, x_8);
+lean_ctor_set(x_320, 1, x_316);
+return x_320;
+}
+else
+{
+lean_object* x_321; lean_object* x_322; 
+lean_dec(x_317);
+x_321 = lean_ctor_get(x_319, 0);
+lean_inc(x_321);
+lean_dec(x_319);
+x_322 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_318, x_321, x_8, x_281, x_4, x_5, x_6, x_316);
+if (lean_obj_tag(x_322) == 0)
+{
+lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; 
+x_323 = lean_ctor_get(x_322, 0);
+lean_inc(x_323);
+x_324 = lean_ctor_get(x_322, 1);
+lean_inc(x_324);
+if (lean_is_exclusive(x_322)) {
+ lean_ctor_release(x_322, 0);
+ lean_ctor_release(x_322, 1);
+ x_325 = x_322;
+} else {
+ lean_dec_ref(x_322);
+ x_325 = lean_box(0);
+}
+if (lean_is_scalar(x_325)) {
+ x_326 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_326 = x_325;
+}
+lean_ctor_set(x_326, 0, x_323);
+lean_ctor_set(x_326, 1, x_324);
+return x_326;
+}
+else
+{
+lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; 
+x_327 = lean_ctor_get(x_322, 0);
+lean_inc(x_327);
+x_328 = lean_ctor_get(x_322, 1);
+lean_inc(x_328);
+if (lean_is_exclusive(x_322)) {
+ lean_ctor_release(x_322, 0);
+ lean_ctor_release(x_322, 1);
+ x_329 = x_322;
+} else {
+ lean_dec_ref(x_322);
+ x_329 = lean_box(0);
+}
+if (lean_is_scalar(x_329)) {
+ x_330 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_330 = x_329;
+}
+lean_ctor_set(x_330, 0, x_327);
+lean_ctor_set(x_330, 1, x_328);
+return x_330;
+}
+}
+}
+case 3:
+{
+lean_object* x_331; lean_object* x_332; lean_object* x_333; 
+lean_dec(x_284);
+lean_dec(x_281);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_1);
+x_331 = lean_ctor_get(x_283, 1);
+lean_inc(x_331);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_332 = x_283;
+} else {
+ lean_dec_ref(x_283);
+ x_332 = lean_box(0);
+}
+if (lean_is_scalar(x_332)) {
+ x_333 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_333 = x_332;
+}
+lean_ctor_set(x_333, 0, x_8);
+lean_ctor_set(x_333, 1, x_331);
+return x_333;
+}
+case 4:
+{
+lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; 
+x_334 = lean_ctor_get(x_283, 1);
+lean_inc(x_334);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_335 = x_283;
+} else {
+ lean_dec_ref(x_283);
+ x_335 = lean_box(0);
+}
+x_336 = lean_ctor_get(x_284, 1);
+lean_inc(x_336);
+lean_dec(x_284);
+x_337 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__10___rarg(x_1, x_285);
+if (lean_obj_tag(x_337) == 0)
+{
+lean_object* x_338; 
+lean_dec(x_336);
+lean_dec(x_281);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_335)) {
+ x_338 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_338 = x_335;
+}
+lean_ctor_set(x_338, 0, x_8);
+lean_ctor_set(x_338, 1, x_334);
+return x_338;
+}
+else
+{
+lean_object* x_339; lean_object* x_340; 
+lean_dec(x_335);
+x_339 = lean_ctor_get(x_337, 0);
+lean_inc(x_339);
+lean_dec(x_337);
+x_340 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_336, x_339, x_8, x_281, x_4, x_5, x_6, x_334);
+if (lean_obj_tag(x_340) == 0)
+{
+lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; 
+x_341 = lean_ctor_get(x_340, 0);
+lean_inc(x_341);
+x_342 = lean_ctor_get(x_340, 1);
+lean_inc(x_342);
+if (lean_is_exclusive(x_340)) {
+ lean_ctor_release(x_340, 0);
+ lean_ctor_release(x_340, 1);
+ x_343 = x_340;
+} else {
+ lean_dec_ref(x_340);
+ x_343 = lean_box(0);
+}
+if (lean_is_scalar(x_343)) {
+ x_344 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_344 = x_343;
+}
+lean_ctor_set(x_344, 0, x_341);
+lean_ctor_set(x_344, 1, x_342);
+return x_344;
+}
+else
+{
+lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; 
+x_345 = lean_ctor_get(x_340, 0);
+lean_inc(x_345);
+x_346 = lean_ctor_get(x_340, 1);
+lean_inc(x_346);
+if (lean_is_exclusive(x_340)) {
+ lean_ctor_release(x_340, 0);
+ lean_ctor_release(x_340, 1);
+ x_347 = x_340;
+} else {
+ lean_dec_ref(x_340);
+ x_347 = lean_box(0);
+}
+if (lean_is_scalar(x_347)) {
+ x_348 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_348 = x_347;
+}
+lean_ctor_set(x_348, 0, x_345);
+lean_ctor_set(x_348, 1, x_346);
+return x_348;
+}
+}
+}
+default: 
+{
+lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; 
+x_349 = lean_ctor_get(x_283, 1);
+lean_inc(x_349);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_350 = x_283;
+} else {
+ lean_dec_ref(x_283);
+ x_350 = lean_box(0);
+}
+x_351 = lean_ctor_get(x_284, 1);
+lean_inc(x_351);
+lean_dec(x_284);
+x_352 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(x_1, x_285);
+if (lean_obj_tag(x_352) == 0)
+{
+lean_object* x_353; 
+lean_dec(x_351);
+lean_dec(x_281);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_350)) {
+ x_353 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_353 = x_350;
+}
+lean_ctor_set(x_353, 0, x_8);
+lean_ctor_set(x_353, 1, x_349);
+return x_353;
+}
+else
+{
+lean_object* x_354; lean_object* x_355; 
+lean_dec(x_350);
+x_354 = lean_ctor_get(x_352, 0);
+lean_inc(x_354);
+lean_dec(x_352);
+x_355 = l_Lean_Meta_DiscrTree_getMatch_process___rarg(x_351, x_354, x_8, x_281, x_4, x_5, x_6, x_349);
+if (lean_obj_tag(x_355) == 0)
+{
+lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; 
+x_356 = lean_ctor_get(x_355, 0);
+lean_inc(x_356);
+x_357 = lean_ctor_get(x_355, 1);
+lean_inc(x_357);
+if (lean_is_exclusive(x_355)) {
+ lean_ctor_release(x_355, 0);
+ lean_ctor_release(x_355, 1);
+ x_358 = x_355;
+} else {
+ lean_dec_ref(x_355);
+ x_358 = lean_box(0);
+}
+if (lean_is_scalar(x_358)) {
+ x_359 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_359 = x_358;
+}
+lean_ctor_set(x_359, 0, x_356);
+lean_ctor_set(x_359, 1, x_357);
+return x_359;
+}
+else
+{
+lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; 
+x_360 = lean_ctor_get(x_355, 0);
+lean_inc(x_360);
+x_361 = lean_ctor_get(x_355, 1);
+lean_inc(x_361);
+if (lean_is_exclusive(x_355)) {
+ lean_ctor_release(x_355, 0);
+ lean_ctor_release(x_355, 1);
+ x_362 = x_355;
+} else {
+ lean_dec_ref(x_355);
+ x_362 = lean_box(0);
+}
+if (lean_is_scalar(x_362)) {
+ x_363 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_363 = x_362;
+}
+lean_ctor_set(x_363, 0, x_360);
+lean_ctor_set(x_363, 1, x_361);
+return x_363;
 }
 }
 }
@@ -12201,33 +13390,33 @@ return x_304;
 }
 else
 {
-lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; 
-lean_dec(x_237);
+lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; 
+lean_dec(x_281);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_305 = lean_ctor_get(x_239, 0);
-lean_inc(x_305);
-x_306 = lean_ctor_get(x_239, 1);
-lean_inc(x_306);
-if (lean_is_exclusive(x_239)) {
- lean_ctor_release(x_239, 0);
- lean_ctor_release(x_239, 1);
- x_307 = x_239;
+x_364 = lean_ctor_get(x_283, 0);
+lean_inc(x_364);
+x_365 = lean_ctor_get(x_283, 1);
+lean_inc(x_365);
+if (lean_is_exclusive(x_283)) {
+ lean_ctor_release(x_283, 0);
+ lean_ctor_release(x_283, 1);
+ x_366 = x_283;
 } else {
- lean_dec_ref(x_239);
- x_307 = lean_box(0);
+ lean_dec_ref(x_283);
+ x_366 = lean_box(0);
 }
-if (lean_is_scalar(x_307)) {
- x_308 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_366)) {
+ x_367 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_308 = x_307;
+ x_367 = x_366;
 }
-lean_ctor_set(x_308, 0, x_305);
-lean_ctor_set(x_308, 1, x_306);
-return x_308;
+lean_ctor_set(x_367, 0, x_364);
+lean_ctor_set(x_367, 1, x_365);
+return x_367;
 }
 }
 }
@@ -12364,6 +13553,37 @@ lean_dec(x_2);
 return x_3;
 }
 }
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getMatch___spec__15___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; lean_object* x_5; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getMatch___spec__14___rarg(x_1, x_4, x_3);
+lean_dec(x_3);
+return x_5;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__13___rarg(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
 lean_object* l_Lean_Meta_DiscrTree_getUnify_process_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -12859,7 +14079,96 @@ x_2 = lean_alloc_closure((void*)(l_Array_binSearchAux___at_Lean_Meta_DiscrTree_g
 return x_2;
 }
 }
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = lean_nat_dec_le(x_3, x_4);
+if (x_5 == 0)
+{
+lean_object* x_6; 
+lean_dec(x_4);
+lean_dec(x_3);
+x_6 = lean_box(0);
+return x_6;
+}
+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; uint8_t x_14; 
+x_7 = lean_nat_add(x_3, x_4);
+x_8 = lean_unsigned_to_nat(2u);
+x_9 = lean_nat_div(x_7, x_8);
+lean_dec(x_7);
+x_10 = l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
+x_11 = lean_array_get(x_10, x_1, x_9);
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_ctor_get(x_2, 0);
+x_14 = l_Lean_Meta_DiscrTree_Key_lt(x_12, x_13);
+if (x_14 == 0)
+{
+uint8_t x_15; 
+lean_dec(x_4);
+x_15 = l_Lean_Meta_DiscrTree_Key_lt(x_13, x_12);
+lean_dec(x_12);
+if (x_15 == 0)
+{
+lean_object* x_16; 
+lean_dec(x_9);
+lean_dec(x_3);
+x_16 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_16, 0, x_11);
+return x_16;
+}
+else
+{
+lean_object* x_17; uint8_t x_18; 
+lean_dec(x_11);
+x_17 = lean_unsigned_to_nat(0u);
+x_18 = lean_nat_dec_eq(x_9, x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_sub(x_9, x_19);
+lean_dec(x_9);
+x_4 = x_20;
+goto _start;
+}
+else
+{
+lean_object* x_22; 
+lean_dec(x_9);
+lean_dec(x_3);
+x_22 = lean_box(0);
+return x_22;
+}
+}
+}
+else
+{
+lean_object* x_23; lean_object* x_24; 
+lean_dec(x_12);
+lean_dec(x_11);
+lean_dec(x_3);
+x_23 = lean_unsigned_to_nat(1u);
+x_24 = lean_nat_add(x_9, x_23);
+lean_dec(x_9);
+x_3 = x_24;
+goto _start;
+}
+}
+}
+}
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg___boxed), 4, 0);
+return x_2;
+}
+}
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, size_t x_4, size_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; 
@@ -12941,11 +14250,11 @@ return x_28;
 }
 }
 }
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6(lean_object* x_1) {
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg___boxed), 11, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg___boxed), 11, 0);
 return x_2;
 }
 }
@@ -13012,7 +14321,7 @@ size_t x_21; size_t x_22; lean_object* x_23;
 x_21 = 0;
 x_22 = lean_usize_of_nat(x_16);
 lean_dec(x_16);
-x_23 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_2, x_13, x_14, x_21, x_22, x_4, x_5, x_6, x_7, x_8, x_9);
+x_23 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg(x_2, x_13, x_14, x_21, x_22, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_14);
 lean_dec(x_13);
 return x_23;
@@ -13105,7 +14414,7 @@ lean_dec(x_26);
 x_48 = lean_ctor_get(x_42, 0);
 lean_inc(x_48);
 x_49 = lean_box(3);
-x_50 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_48, x_49);
+x_50 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_48, x_49);
 lean_dec(x_48);
 if (x_50 == 0)
 {
@@ -13145,7 +14454,7 @@ lean_dec(x_39);
 x_54 = lean_ctor_get(x_42, 0);
 lean_inc(x_54);
 x_55 = lean_box(3);
-x_56 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_54, x_55);
+x_56 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_54, x_55);
 lean_dec(x_54);
 if (x_56 == 0)
 {
@@ -13182,7 +14491,7 @@ lean_dec(x_53);
 x_60 = lean_ctor_get(x_42, 0);
 lean_inc(x_60);
 x_61 = lean_box(3);
-x_62 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_60, x_61);
+x_62 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_60, x_61);
 lean_dec(x_60);
 if (x_62 == 0)
 {
@@ -13291,7 +14600,7 @@ lean_dec(x_26);
 x_86 = lean_ctor_get(x_79, 0);
 lean_inc(x_86);
 x_87 = lean_box(3);
-x_88 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_86, x_87);
+x_88 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_86, x_87);
 lean_dec(x_86);
 if (x_88 == 0)
 {
@@ -13331,7 +14640,7 @@ lean_dec(x_77);
 x_92 = lean_ctor_get(x_79, 0);
 lean_inc(x_92);
 x_93 = lean_box(3);
-x_94 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_92, x_93);
+x_94 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_92, x_93);
 lean_dec(x_92);
 if (x_94 == 0)
 {
@@ -13368,7 +14677,7 @@ lean_dec(x_91);
 x_98 = lean_ctor_get(x_79, 0);
 lean_inc(x_98);
 x_99 = lean_box(3);
-x_100 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_98, x_99);
+x_100 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_98, x_99);
 lean_dec(x_98);
 if (x_100 == 0)
 {
@@ -13494,7 +14803,7 @@ lean_dec(x_26);
 x_126 = lean_ctor_get(x_119, 0);
 lean_inc(x_126);
 x_127 = lean_box(3);
-x_128 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_126, x_127);
+x_128 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_126, x_127);
 lean_dec(x_126);
 if (x_128 == 0)
 {
@@ -13536,7 +14845,7 @@ lean_dec(x_116);
 x_133 = lean_ctor_get(x_119, 0);
 lean_inc(x_133);
 x_134 = lean_box(3);
-x_135 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_133, x_134);
+x_135 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_133, x_134);
 lean_dec(x_133);
 if (x_135 == 0)
 {
@@ -13574,7 +14883,7 @@ lean_dec(x_132);
 x_140 = lean_ctor_get(x_119, 0);
 lean_inc(x_140);
 x_141 = lean_box(3);
-x_142 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_140, x_141);
+x_142 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_140, x_141);
 lean_dec(x_140);
 if (x_142 == 0)
 {
@@ -13695,7 +15004,7 @@ lean_dec(x_26);
 x_170 = lean_ctor_get(x_164, 0);
 lean_inc(x_170);
 x_171 = lean_box(3);
-x_172 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_170, x_171);
+x_172 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_170, x_171);
 lean_dec(x_170);
 if (x_172 == 0)
 {
@@ -13735,7 +15044,7 @@ lean_dec(x_161);
 x_176 = lean_ctor_get(x_164, 0);
 lean_inc(x_176);
 x_177 = lean_box(3);
-x_178 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_176, x_177);
+x_178 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_176, x_177);
 lean_dec(x_176);
 if (x_178 == 0)
 {
@@ -13772,7 +15081,7 @@ lean_dec(x_175);
 x_182 = lean_ctor_get(x_164, 0);
 lean_inc(x_182);
 x_183 = lean_box(3);
-x_184 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_182, x_183);
+x_184 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_182, x_183);
 lean_dec(x_182);
 if (x_184 == 0)
 {
@@ -13881,7 +15190,7 @@ lean_dec(x_26);
 x_208 = lean_ctor_get(x_201, 0);
 lean_inc(x_208);
 x_209 = lean_box(3);
-x_210 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_208, x_209);
+x_210 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_208, x_209);
 lean_dec(x_208);
 if (x_210 == 0)
 {
@@ -13921,7 +15230,7 @@ lean_dec(x_199);
 x_214 = lean_ctor_get(x_201, 0);
 lean_inc(x_214);
 x_215 = lean_box(3);
-x_216 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_214, x_215);
+x_216 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_214, x_215);
 lean_dec(x_214);
 if (x_216 == 0)
 {
@@ -13958,7 +15267,7 @@ lean_dec(x_213);
 x_220 = lean_ctor_get(x_201, 0);
 lean_inc(x_220);
 x_221 = lean_box(3);
-x_222 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_220, x_221);
+x_222 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_220, x_221);
 lean_dec(x_220);
 if (x_222 == 0)
 {
@@ -14084,7 +15393,7 @@ lean_dec(x_26);
 x_248 = lean_ctor_get(x_241, 0);
 lean_inc(x_248);
 x_249 = lean_box(3);
-x_250 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_248, x_249);
+x_250 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_248, x_249);
 lean_dec(x_248);
 if (x_250 == 0)
 {
@@ -14126,7 +15435,7 @@ lean_dec(x_238);
 x_255 = lean_ctor_get(x_241, 0);
 lean_inc(x_255);
 x_256 = lean_box(3);
-x_257 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_255, x_256);
+x_257 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_255, x_256);
 lean_dec(x_255);
 if (x_257 == 0)
 {
@@ -14164,7 +15473,7 @@ lean_dec(x_254);
 x_262 = lean_ctor_get(x_241, 0);
 lean_inc(x_262);
 x_263 = lean_box(3);
-x_264 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_262, x_263);
+x_264 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_262, x_263);
 lean_dec(x_262);
 if (x_264 == 0)
 {
@@ -14285,7 +15594,7 @@ lean_dec(x_26);
 x_292 = lean_ctor_get(x_286, 0);
 lean_inc(x_292);
 x_293 = lean_box(3);
-x_294 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_292, x_293);
+x_294 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_292, x_293);
 lean_dec(x_292);
 if (x_294 == 0)
 {
@@ -14325,7 +15634,7 @@ lean_dec(x_283);
 x_298 = lean_ctor_get(x_286, 0);
 lean_inc(x_298);
 x_299 = lean_box(3);
-x_300 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_298, x_299);
+x_300 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_298, x_299);
 lean_dec(x_298);
 if (x_300 == 0)
 {
@@ -14362,7 +15671,7 @@ lean_dec(x_297);
 x_304 = lean_ctor_get(x_286, 0);
 lean_inc(x_304);
 x_305 = lean_box(3);
-x_306 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_304, x_305);
+x_306 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_304, x_305);
 lean_dec(x_304);
 if (x_306 == 0)
 {
@@ -14471,7 +15780,7 @@ lean_dec(x_26);
 x_330 = lean_ctor_get(x_323, 0);
 lean_inc(x_330);
 x_331 = lean_box(3);
-x_332 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_330, x_331);
+x_332 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_330, x_331);
 lean_dec(x_330);
 if (x_332 == 0)
 {
@@ -14511,7 +15820,7 @@ lean_dec(x_321);
 x_336 = lean_ctor_get(x_323, 0);
 lean_inc(x_336);
 x_337 = lean_box(3);
-x_338 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_336, x_337);
+x_338 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_336, x_337);
 lean_dec(x_336);
 if (x_338 == 0)
 {
@@ -14548,7 +15857,7 @@ lean_dec(x_335);
 x_342 = lean_ctor_get(x_323, 0);
 lean_inc(x_342);
 x_343 = lean_box(3);
-x_344 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_342, x_343);
+x_344 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_342, x_343);
 lean_dec(x_342);
 if (x_344 == 0)
 {
@@ -14674,7 +15983,7 @@ lean_dec(x_26);
 x_370 = lean_ctor_get(x_363, 0);
 lean_inc(x_370);
 x_371 = lean_box(3);
-x_372 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_370, x_371);
+x_372 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_370, x_371);
 lean_dec(x_370);
 if (x_372 == 0)
 {
@@ -14716,7 +16025,7 @@ lean_dec(x_360);
 x_377 = lean_ctor_get(x_363, 0);
 lean_inc(x_377);
 x_378 = lean_box(3);
-x_379 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_377, x_378);
+x_379 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_377, x_378);
 lean_dec(x_377);
 if (x_379 == 0)
 {
@@ -14754,7 +16063,7 @@ lean_dec(x_376);
 x_384 = lean_ctor_get(x_363, 0);
 lean_inc(x_384);
 x_385 = lean_box(3);
-x_386 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_384, x_385);
+x_386 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_384, x_385);
 lean_dec(x_384);
 if (x_386 == 0)
 {
@@ -14948,7 +16257,7 @@ return x_418;
 }
 }
 }
-default: 
+case 4:
 {
 uint8_t x_419; 
 x_419 = !lean_is_exclusive(x_32);
@@ -14984,7 +16293,7 @@ lean_dec(x_26);
 x_432 = lean_ctor_get(x_426, 0);
 lean_inc(x_432);
 x_433 = lean_box(3);
-x_434 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_432, x_433);
+x_434 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_432, x_433);
 lean_dec(x_432);
 if (x_434 == 0)
 {
@@ -15024,7 +16333,7 @@ lean_dec(x_423);
 x_438 = lean_ctor_get(x_426, 0);
 lean_inc(x_438);
 x_439 = lean_box(3);
-x_440 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_438, x_439);
+x_440 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_438, x_439);
 lean_dec(x_438);
 if (x_440 == 0)
 {
@@ -15061,7 +16370,7 @@ lean_dec(x_437);
 x_444 = lean_ctor_get(x_426, 0);
 lean_inc(x_444);
 x_445 = lean_box(3);
-x_446 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_444, x_445);
+x_446 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_444, x_445);
 lean_dec(x_444);
 if (x_446 == 0)
 {
@@ -15170,7 +16479,7 @@ lean_dec(x_26);
 x_470 = lean_ctor_get(x_463, 0);
 lean_inc(x_470);
 x_471 = lean_box(3);
-x_472 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_470, x_471);
+x_472 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_470, x_471);
 lean_dec(x_470);
 if (x_472 == 0)
 {
@@ -15210,7 +16519,7 @@ lean_dec(x_461);
 x_476 = lean_ctor_get(x_463, 0);
 lean_inc(x_476);
 x_477 = lean_box(3);
-x_478 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_476, x_477);
+x_478 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_476, x_477);
 lean_dec(x_476);
 if (x_478 == 0)
 {
@@ -15247,7 +16556,7 @@ lean_dec(x_475);
 x_482 = lean_ctor_get(x_463, 0);
 lean_inc(x_482);
 x_483 = lean_box(3);
-x_484 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_482, x_483);
+x_484 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_482, x_483);
 lean_dec(x_482);
 if (x_484 == 0)
 {
@@ -15373,7 +16682,7 @@ lean_dec(x_26);
 x_510 = lean_ctor_get(x_503, 0);
 lean_inc(x_510);
 x_511 = lean_box(3);
-x_512 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_510, x_511);
+x_512 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_510, x_511);
 lean_dec(x_510);
 if (x_512 == 0)
 {
@@ -15415,7 +16724,7 @@ lean_dec(x_500);
 x_517 = lean_ctor_get(x_503, 0);
 lean_inc(x_517);
 x_518 = lean_box(3);
-x_519 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_517, x_518);
+x_519 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_517, x_518);
 lean_dec(x_517);
 if (x_519 == 0)
 {
@@ -15453,7 +16762,7 @@ lean_dec(x_516);
 x_524 = lean_ctor_get(x_503, 0);
 lean_inc(x_524);
 x_525 = lean_box(3);
-x_526 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_524, x_525);
+x_526 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_524, x_525);
 lean_dec(x_524);
 if (x_526 == 0)
 {
@@ -15538,11 +16847,601 @@ return x_540;
 }
 }
 }
+default: 
+{
+uint8_t x_541; 
+x_541 = !lean_is_exclusive(x_32);
+if (x_541 == 0)
+{
+lean_object* x_542; lean_object* x_543; uint8_t x_544; 
+x_542 = lean_ctor_get(x_32, 1);
+x_543 = lean_ctor_get(x_32, 0);
+lean_dec(x_543);
+x_544 = !lean_is_exclusive(x_33);
+if (x_544 == 0)
+{
+lean_object* x_545; lean_object* x_546; lean_object* x_547; lean_object* x_548; lean_object* x_549; lean_object* x_550; lean_object* x_551; lean_object* x_552; uint8_t x_553; 
+x_545 = lean_ctor_get(x_33, 1);
+x_546 = lean_ctor_get(x_33, 0);
+lean_dec(x_546);
+x_547 = l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
+x_548 = lean_array_get(x_547, x_26, x_10);
+x_549 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+lean_ctor_set(x_33, 1, x_549);
+x_550 = lean_array_get_size(x_26);
+x_551 = lean_unsigned_to_nat(1u);
+x_552 = lean_nat_sub(x_550, x_551);
+x_553 = lean_nat_dec_lt(x_10, x_550);
+lean_dec(x_550);
+if (x_553 == 0)
+{
+lean_object* x_554; lean_object* x_555; uint8_t x_556; 
+lean_dec(x_552);
+lean_dec(x_33);
+lean_dec(x_545);
+lean_dec(x_26);
+x_554 = lean_ctor_get(x_548, 0);
+lean_inc(x_554);
+x_555 = lean_box(3);
+x_556 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_554, x_555);
+lean_dec(x_554);
+if (x_556 == 0)
+{
+lean_dec(x_548);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_32, 0, x_4);
+return x_32;
+}
+else
+{
+lean_object* x_557; 
+lean_free_object(x_32);
+x_557 = lean_ctor_get(x_548, 1);
+lean_inc(x_557);
+lean_dec(x_548);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_557;
+x_9 = x_542;
+goto _start;
 }
 }
 else
 {
-uint8_t x_541; 
+lean_object* x_559; 
+x_559 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_26, x_33, x_10, x_552);
+lean_dec(x_33);
+lean_dec(x_26);
+if (lean_obj_tag(x_559) == 0)
+{
+lean_object* x_560; lean_object* x_561; uint8_t x_562; 
+lean_dec(x_545);
+x_560 = lean_ctor_get(x_548, 0);
+lean_inc(x_560);
+x_561 = lean_box(3);
+x_562 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_560, x_561);
+lean_dec(x_560);
+if (x_562 == 0)
+{
+lean_dec(x_548);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_32, 0, x_4);
+return x_32;
+}
+else
+{
+lean_object* x_563; 
+lean_free_object(x_32);
+x_563 = lean_ctor_get(x_548, 1);
+lean_inc(x_563);
+lean_dec(x_548);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_563;
+x_9 = x_542;
+goto _start;
+}
+}
+else
+{
+lean_object* x_565; lean_object* x_566; lean_object* x_567; uint8_t x_568; 
+lean_free_object(x_32);
+x_565 = lean_ctor_get(x_559, 0);
+lean_inc(x_565);
+lean_dec(x_559);
+x_566 = lean_ctor_get(x_548, 0);
+lean_inc(x_566);
+x_567 = lean_box(3);
+x_568 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_566, x_567);
+lean_dec(x_566);
+if (x_568 == 0)
+{
+lean_object* x_569; lean_object* x_570; 
+lean_dec(x_548);
+x_569 = l_Array_append___rarg(x_30, x_545);
+lean_dec(x_545);
+x_570 = lean_ctor_get(x_565, 1);
+lean_inc(x_570);
+lean_dec(x_565);
+x_1 = x_10;
+x_2 = x_569;
+x_3 = x_570;
+x_9 = x_542;
+goto _start;
+}
+else
+{
+lean_object* x_572; lean_object* x_573; 
+x_572 = lean_ctor_get(x_548, 1);
+lean_inc(x_572);
+lean_dec(x_548);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_30);
+x_573 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_10, x_30, x_572, x_4, x_5, x_6, x_7, x_8, x_542);
+if (lean_obj_tag(x_573) == 0)
+{
+lean_object* x_574; lean_object* x_575; lean_object* x_576; lean_object* x_577; 
+x_574 = lean_ctor_get(x_573, 0);
+lean_inc(x_574);
+x_575 = lean_ctor_get(x_573, 1);
+lean_inc(x_575);
+lean_dec(x_573);
+x_576 = l_Array_append___rarg(x_30, x_545);
+lean_dec(x_545);
+x_577 = lean_ctor_get(x_565, 1);
+lean_inc(x_577);
+lean_dec(x_565);
+x_1 = x_10;
+x_2 = x_576;
+x_3 = x_577;
+x_4 = x_574;
+x_9 = x_575;
+goto _start;
+}
+else
+{
+uint8_t x_579; 
+lean_dec(x_565);
+lean_dec(x_545);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_579 = !lean_is_exclusive(x_573);
+if (x_579 == 0)
+{
+return x_573;
+}
+else
+{
+lean_object* x_580; lean_object* x_581; lean_object* x_582; 
+x_580 = lean_ctor_get(x_573, 0);
+x_581 = lean_ctor_get(x_573, 1);
+lean_inc(x_581);
+lean_inc(x_580);
+lean_dec(x_573);
+x_582 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_582, 0, x_580);
+lean_ctor_set(x_582, 1, x_581);
+return x_582;
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_583; lean_object* x_584; lean_object* x_585; lean_object* x_586; lean_object* x_587; lean_object* x_588; lean_object* x_589; lean_object* x_590; uint8_t x_591; 
+x_583 = lean_ctor_get(x_33, 1);
+lean_inc(x_583);
+lean_dec(x_33);
+x_584 = l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
+x_585 = lean_array_get(x_584, x_26, x_10);
+x_586 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+x_587 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_587, 0, x_34);
+lean_ctor_set(x_587, 1, x_586);
+x_588 = lean_array_get_size(x_26);
+x_589 = lean_unsigned_to_nat(1u);
+x_590 = lean_nat_sub(x_588, x_589);
+x_591 = lean_nat_dec_lt(x_10, x_588);
+lean_dec(x_588);
+if (x_591 == 0)
+{
+lean_object* x_592; lean_object* x_593; uint8_t x_594; 
+lean_dec(x_590);
+lean_dec(x_587);
+lean_dec(x_583);
+lean_dec(x_26);
+x_592 = lean_ctor_get(x_585, 0);
+lean_inc(x_592);
+x_593 = lean_box(3);
+x_594 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_592, x_593);
+lean_dec(x_592);
+if (x_594 == 0)
+{
+lean_dec(x_585);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_32, 0, x_4);
+return x_32;
+}
+else
+{
+lean_object* x_595; 
+lean_free_object(x_32);
+x_595 = lean_ctor_get(x_585, 1);
+lean_inc(x_595);
+lean_dec(x_585);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_595;
+x_9 = x_542;
+goto _start;
+}
+}
+else
+{
+lean_object* x_597; 
+x_597 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_26, x_587, x_10, x_590);
+lean_dec(x_587);
+lean_dec(x_26);
+if (lean_obj_tag(x_597) == 0)
+{
+lean_object* x_598; lean_object* x_599; uint8_t x_600; 
+lean_dec(x_583);
+x_598 = lean_ctor_get(x_585, 0);
+lean_inc(x_598);
+x_599 = lean_box(3);
+x_600 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_598, x_599);
+lean_dec(x_598);
+if (x_600 == 0)
+{
+lean_dec(x_585);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_32, 0, x_4);
+return x_32;
+}
+else
+{
+lean_object* x_601; 
+lean_free_object(x_32);
+x_601 = lean_ctor_get(x_585, 1);
+lean_inc(x_601);
+lean_dec(x_585);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_601;
+x_9 = x_542;
+goto _start;
+}
+}
+else
+{
+lean_object* x_603; lean_object* x_604; lean_object* x_605; uint8_t x_606; 
+lean_free_object(x_32);
+x_603 = lean_ctor_get(x_597, 0);
+lean_inc(x_603);
+lean_dec(x_597);
+x_604 = lean_ctor_get(x_585, 0);
+lean_inc(x_604);
+x_605 = lean_box(3);
+x_606 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_604, x_605);
+lean_dec(x_604);
+if (x_606 == 0)
+{
+lean_object* x_607; lean_object* x_608; 
+lean_dec(x_585);
+x_607 = l_Array_append___rarg(x_30, x_583);
+lean_dec(x_583);
+x_608 = lean_ctor_get(x_603, 1);
+lean_inc(x_608);
+lean_dec(x_603);
+x_1 = x_10;
+x_2 = x_607;
+x_3 = x_608;
+x_9 = x_542;
+goto _start;
+}
+else
+{
+lean_object* x_610; lean_object* x_611; 
+x_610 = lean_ctor_get(x_585, 1);
+lean_inc(x_610);
+lean_dec(x_585);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_30);
+x_611 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_10, x_30, x_610, x_4, x_5, x_6, x_7, x_8, x_542);
+if (lean_obj_tag(x_611) == 0)
+{
+lean_object* x_612; lean_object* x_613; lean_object* x_614; lean_object* x_615; 
+x_612 = lean_ctor_get(x_611, 0);
+lean_inc(x_612);
+x_613 = lean_ctor_get(x_611, 1);
+lean_inc(x_613);
+lean_dec(x_611);
+x_614 = l_Array_append___rarg(x_30, x_583);
+lean_dec(x_583);
+x_615 = lean_ctor_get(x_603, 1);
+lean_inc(x_615);
+lean_dec(x_603);
+x_1 = x_10;
+x_2 = x_614;
+x_3 = x_615;
+x_4 = x_612;
+x_9 = x_613;
+goto _start;
+}
+else
+{
+lean_object* x_617; lean_object* x_618; lean_object* x_619; lean_object* x_620; 
+lean_dec(x_603);
+lean_dec(x_583);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_617 = lean_ctor_get(x_611, 0);
+lean_inc(x_617);
+x_618 = lean_ctor_get(x_611, 1);
+lean_inc(x_618);
+if (lean_is_exclusive(x_611)) {
+ lean_ctor_release(x_611, 0);
+ lean_ctor_release(x_611, 1);
+ x_619 = x_611;
+} else {
+ lean_dec_ref(x_611);
+ x_619 = lean_box(0);
+}
+if (lean_is_scalar(x_619)) {
+ x_620 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_620 = x_619;
+}
+lean_ctor_set(x_620, 0, x_617);
+lean_ctor_set(x_620, 1, x_618);
+return x_620;
+}
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_621; 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; lean_object* x_629; lean_object* x_630; uint8_t x_631; 
+x_621 = lean_ctor_get(x_32, 1);
+lean_inc(x_621);
+lean_dec(x_32);
+x_622 = lean_ctor_get(x_33, 1);
+lean_inc(x_622);
+if (lean_is_exclusive(x_33)) {
+ lean_ctor_release(x_33, 0);
+ lean_ctor_release(x_33, 1);
+ x_623 = x_33;
+} else {
+ lean_dec_ref(x_33);
+ x_623 = lean_box(0);
+}
+x_624 = l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
+x_625 = lean_array_get(x_624, x_26, x_10);
+x_626 = l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+if (lean_is_scalar(x_623)) {
+ x_627 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_627 = x_623;
+}
+lean_ctor_set(x_627, 0, x_34);
+lean_ctor_set(x_627, 1, x_626);
+x_628 = lean_array_get_size(x_26);
+x_629 = lean_unsigned_to_nat(1u);
+x_630 = lean_nat_sub(x_628, x_629);
+x_631 = lean_nat_dec_lt(x_10, x_628);
+lean_dec(x_628);
+if (x_631 == 0)
+{
+lean_object* x_632; lean_object* x_633; uint8_t x_634; 
+lean_dec(x_630);
+lean_dec(x_627);
+lean_dec(x_622);
+lean_dec(x_26);
+x_632 = lean_ctor_get(x_625, 0);
+lean_inc(x_632);
+x_633 = lean_box(3);
+x_634 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_632, x_633);
+lean_dec(x_632);
+if (x_634 == 0)
+{
+lean_object* x_635; 
+lean_dec(x_625);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_635 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_635, 0, x_4);
+lean_ctor_set(x_635, 1, x_621);
+return x_635;
+}
+else
+{
+lean_object* x_636; 
+x_636 = lean_ctor_get(x_625, 1);
+lean_inc(x_636);
+lean_dec(x_625);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_636;
+x_9 = x_621;
+goto _start;
+}
+}
+else
+{
+lean_object* x_638; 
+x_638 = l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_26, x_627, x_10, x_630);
+lean_dec(x_627);
+lean_dec(x_26);
+if (lean_obj_tag(x_638) == 0)
+{
+lean_object* x_639; lean_object* x_640; uint8_t x_641; 
+lean_dec(x_622);
+x_639 = lean_ctor_get(x_625, 0);
+lean_inc(x_639);
+x_640 = lean_box(3);
+x_641 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_639, x_640);
+lean_dec(x_639);
+if (x_641 == 0)
+{
+lean_object* x_642; 
+lean_dec(x_625);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_642 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_642, 0, x_4);
+lean_ctor_set(x_642, 1, x_621);
+return x_642;
+}
+else
+{
+lean_object* x_643; 
+x_643 = lean_ctor_get(x_625, 1);
+lean_inc(x_643);
+lean_dec(x_625);
+x_1 = x_10;
+x_2 = x_30;
+x_3 = x_643;
+x_9 = x_621;
+goto _start;
+}
+}
+else
+{
+lean_object* x_645; lean_object* x_646; lean_object* x_647; uint8_t x_648; 
+x_645 = lean_ctor_get(x_638, 0);
+lean_inc(x_645);
+lean_dec(x_638);
+x_646 = lean_ctor_get(x_625, 0);
+lean_inc(x_646);
+x_647 = lean_box(3);
+x_648 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_646, x_647);
+lean_dec(x_646);
+if (x_648 == 0)
+{
+lean_object* x_649; lean_object* x_650; 
+lean_dec(x_625);
+x_649 = l_Array_append___rarg(x_30, x_622);
+lean_dec(x_622);
+x_650 = lean_ctor_get(x_645, 1);
+lean_inc(x_650);
+lean_dec(x_645);
+x_1 = x_10;
+x_2 = x_649;
+x_3 = x_650;
+x_9 = x_621;
+goto _start;
+}
+else
+{
+lean_object* x_652; lean_object* x_653; 
+x_652 = lean_ctor_get(x_625, 1);
+lean_inc(x_652);
+lean_dec(x_625);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_30);
+x_653 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_10, x_30, x_652, x_4, x_5, x_6, x_7, x_8, x_621);
+if (lean_obj_tag(x_653) == 0)
+{
+lean_object* x_654; lean_object* x_655; lean_object* x_656; lean_object* x_657; 
+x_654 = lean_ctor_get(x_653, 0);
+lean_inc(x_654);
+x_655 = lean_ctor_get(x_653, 1);
+lean_inc(x_655);
+lean_dec(x_653);
+x_656 = l_Array_append___rarg(x_30, x_622);
+lean_dec(x_622);
+x_657 = lean_ctor_get(x_645, 1);
+lean_inc(x_657);
+lean_dec(x_645);
+x_1 = x_10;
+x_2 = x_656;
+x_3 = x_657;
+x_4 = x_654;
+x_9 = x_655;
+goto _start;
+}
+else
+{
+lean_object* x_659; lean_object* x_660; lean_object* x_661; lean_object* x_662; 
+lean_dec(x_645);
+lean_dec(x_622);
+lean_dec(x_30);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+x_659 = lean_ctor_get(x_653, 0);
+lean_inc(x_659);
+x_660 = lean_ctor_get(x_653, 1);
+lean_inc(x_660);
+if (lean_is_exclusive(x_653)) {
+ lean_ctor_release(x_653, 0);
+ lean_ctor_release(x_653, 1);
+ x_661 = x_653;
+} else {
+ lean_dec_ref(x_653);
+ x_661 = lean_box(0);
+}
+if (lean_is_scalar(x_661)) {
+ x_662 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_662 = x_661;
+}
+lean_ctor_set(x_662, 0, x_659);
+lean_ctor_set(x_662, 1, x_660);
+return x_662;
+}
+}
+}
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_663; 
 lean_dec(x_30);
 lean_dec(x_26);
 lean_dec(x_8);
@@ -15550,56 +17449,56 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-x_541 = !lean_is_exclusive(x_32);
-if (x_541 == 0)
+x_663 = !lean_is_exclusive(x_32);
+if (x_663 == 0)
 {
 return x_32;
 }
 else
 {
-lean_object* x_542; lean_object* x_543; lean_object* x_544; 
-x_542 = lean_ctor_get(x_32, 0);
-x_543 = lean_ctor_get(x_32, 1);
-lean_inc(x_543);
-lean_inc(x_542);
+lean_object* x_664; lean_object* x_665; lean_object* x_666; 
+x_664 = lean_ctor_get(x_32, 0);
+x_665 = lean_ctor_get(x_32, 1);
+lean_inc(x_665);
+lean_inc(x_664);
 lean_dec(x_32);
-x_544 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_544, 0, x_542);
-lean_ctor_set(x_544, 1, x_543);
-return x_544;
+x_666 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_666, 0, x_664);
+lean_ctor_set(x_666, 1, x_665);
+return x_666;
 }
 }
 }
 else
 {
-lean_object* x_545; 
+lean_object* x_667; 
 lean_dec(x_26);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_2);
-x_545 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_545, 0, x_4);
-lean_ctor_set(x_545, 1, x_9);
-return x_545;
+x_667 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_667, 0, x_4);
+lean_ctor_set(x_667, 1, x_9);
+return x_667;
 }
 }
 else
 {
-lean_object* x_546; lean_object* x_547; 
+lean_object* x_668; lean_object* x_669; 
 lean_dec(x_26);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_2);
-x_546 = l_Array_append___rarg(x_4, x_25);
+x_668 = l_Array_append___rarg(x_4, x_25);
 lean_dec(x_25);
-x_547 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_547, 0, x_546);
-lean_ctor_set(x_547, 1, x_9);
-return x_547;
+x_669 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_669, 0, x_668);
+lean_ctor_set(x_669, 1, x_9);
+return x_669;
 }
 }
 }
@@ -15665,7 +17564,17 @@ lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg___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_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_5;
+}
+}
+lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___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, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 size_t x_12; size_t x_13; lean_object* x_14; 
@@ -15673,7 +17582,7 @@ x_12 = lean_unbox_usize(x_4);
 lean_dec(x_4);
 x_13 = lean_unbox_usize(x_5);
 lean_dec(x_5);
-x_14 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__6___rarg(x_1, x_2, x_3, x_12, x_13, x_6, x_7, x_8, x_9, x_10, x_11);
+x_14 = l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__7___rarg(x_1, x_2, x_3, x_12, x_13, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_14;
@@ -15697,7 +17606,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -15755,7 +17664,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -15853,7 +17762,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -15911,7 +17820,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -16009,7 +17918,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -16067,7 +17976,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -16513,7 +18422,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -16571,7 +18480,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -16651,6 +18560,162 @@ x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_find_x3f___at_Lean_Meta
 return x_2;
 }
 }
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_get_size(x_1);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_4);
+x_8 = lean_box(0);
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_array_fget(x_1, x_4);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
+lean_dec(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_add(x_4, x_11);
+lean_dec(x_4);
+x_3 = lean_box(0);
+x_4 = x_12;
+goto _start;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_array_fget(x_2, x_4);
+lean_dec(x_4);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+return x_15;
+}
+}
+}
+}
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg(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___rarg___closed__2;
+x_7 = x_2 & x_6;
+x_8 = lean_usize_to_nat(x_7);
+x_9 = lean_box(2);
+x_10 = lean_array_get(x_9, x_4, x_8);
+lean_dec(x_8);
+lean_dec(x_4);
+switch (lean_obj_tag(x_10)) {
+case 0:
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
+lean_dec(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_12);
+x_14 = lean_box(0);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_12);
+return x_15;
+}
+}
+case 1:
+{
+lean_object* x_16; size_t x_17; 
+x_16 = lean_ctor_get(x_10, 0);
+lean_inc(x_16);
+lean_dec(x_10);
+x_17 = x_2 >> x_5 % (sizeof(size_t) * 8);
+x_1 = x_16;
+x_2 = x_17;
+goto _start;
+}
+default: 
+{
+lean_object* x_19; 
+x_19 = lean_box(0);
+return x_19;
+}
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_dec(x_1);
+x_22 = lean_unsigned_to_nat(0u);
+x_23 = l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg(x_20, x_21, lean_box(0), x_22, x_3);
+lean_dec(x_21);
+lean_dec(x_20);
+return x_23;
+}
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; size_t x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+lean_dec(x_1);
+x_4 = l_Lean_Meta_DiscrTree_Key_hash(x_2);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg(x_3, x_4, x_2);
+return x_5;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg___boxed), 2, 0);
+return x_2;
+}
+}
 lean_object* l_Lean_Meta_DiscrTree_getUnify___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:
 {
@@ -17236,7 +19301,7 @@ return x_125;
 }
 }
 }
-default: 
+case 4:
 {
 uint8_t x_126; 
 x_126 = !lean_is_exclusive(x_13);
@@ -17401,513 +19466,773 @@ return x_158;
 }
 }
 }
+default: 
+{
+uint8_t x_159; 
+x_159 = !lean_is_exclusive(x_13);
+if (x_159 == 0)
+{
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_160 = lean_ctor_get(x_13, 1);
+x_161 = lean_ctor_get(x_13, 0);
+lean_dec(x_161);
+x_162 = lean_ctor_get(x_14, 1);
+lean_inc(x_162);
+lean_dec(x_14);
+lean_inc(x_1);
+x_163 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_164 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(x_1, x_15);
+if (lean_obj_tag(x_164) == 0)
+{
+lean_dec(x_162);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_ctor_set(x_13, 0, x_163);
+return x_13;
+}
+else
+{
+lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+lean_free_object(x_13);
+x_165 = lean_ctor_get(x_164, 0);
+lean_inc(x_165);
+lean_dec(x_164);
+x_166 = lean_unsigned_to_nat(0u);
+x_167 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_166, x_162, x_165, x_163, x_3, x_4, x_5, x_6, x_160);
+if (lean_obj_tag(x_167) == 0)
+{
+uint8_t x_168; 
+x_168 = !lean_is_exclusive(x_167);
+if (x_168 == 0)
+{
+return x_167;
+}
+else
+{
+lean_object* x_169; lean_object* x_170; lean_object* x_171; 
+x_169 = lean_ctor_get(x_167, 0);
+x_170 = lean_ctor_get(x_167, 1);
+lean_inc(x_170);
+lean_inc(x_169);
+lean_dec(x_167);
+x_171 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_171, 0, x_169);
+lean_ctor_set(x_171, 1, x_170);
+return x_171;
 }
 }
 else
 {
-uint8_t x_159; 
+uint8_t x_172; 
+x_172 = !lean_is_exclusive(x_167);
+if (x_172 == 0)
+{
+return x_167;
+}
+else
+{
+lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+x_173 = lean_ctor_get(x_167, 0);
+x_174 = lean_ctor_get(x_167, 1);
+lean_inc(x_174);
+lean_inc(x_173);
+lean_dec(x_167);
+x_175 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_175, 0, x_173);
+lean_ctor_set(x_175, 1, x_174);
+return x_175;
+}
+}
+}
+}
+else
+{
+lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; 
+x_176 = lean_ctor_get(x_13, 1);
+lean_inc(x_176);
+lean_dec(x_13);
+x_177 = lean_ctor_get(x_14, 1);
+lean_inc(x_177);
+lean_dec(x_14);
+lean_inc(x_1);
+x_178 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_179 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(x_1, x_15);
+if (lean_obj_tag(x_179) == 0)
+{
+lean_object* x_180; 
+lean_dec(x_177);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_180 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_180, 0, x_178);
+lean_ctor_set(x_180, 1, x_176);
+return x_180;
+}
+else
+{
+lean_object* x_181; lean_object* x_182; lean_object* x_183; 
+x_181 = lean_ctor_get(x_179, 0);
+lean_inc(x_181);
+lean_dec(x_179);
+x_182 = lean_unsigned_to_nat(0u);
+x_183 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_182, x_177, x_181, x_178, x_3, x_4, x_5, x_6, x_176);
+if (lean_obj_tag(x_183) == 0)
+{
+lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; 
+x_184 = lean_ctor_get(x_183, 0);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_183, 1);
+lean_inc(x_185);
+if (lean_is_exclusive(x_183)) {
+ lean_ctor_release(x_183, 0);
+ lean_ctor_release(x_183, 1);
+ x_186 = x_183;
+} else {
+ lean_dec_ref(x_183);
+ x_186 = lean_box(0);
+}
+if (lean_is_scalar(x_186)) {
+ x_187 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_187 = x_186;
+}
+lean_ctor_set(x_187, 0, x_184);
+lean_ctor_set(x_187, 1, x_185);
+return x_187;
+}
+else
+{
+lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+x_188 = lean_ctor_get(x_183, 0);
+lean_inc(x_188);
+x_189 = lean_ctor_get(x_183, 1);
+lean_inc(x_189);
+if (lean_is_exclusive(x_183)) {
+ lean_ctor_release(x_183, 0);
+ lean_ctor_release(x_183, 1);
+ x_190 = x_183;
+} else {
+ lean_dec_ref(x_183);
+ x_190 = lean_box(0);
+}
+if (lean_is_scalar(x_190)) {
+ x_191 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_191 = x_190;
+}
+lean_ctor_set(x_191, 0, x_188);
+lean_ctor_set(x_191, 1, x_189);
+return x_191;
+}
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_192; 
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_159 = !lean_is_exclusive(x_13);
-if (x_159 == 0)
+x_192 = !lean_is_exclusive(x_13);
+if (x_192 == 0)
 {
 return x_13;
 }
 else
 {
-lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-x_160 = lean_ctor_get(x_13, 0);
-x_161 = lean_ctor_get(x_13, 1);
-lean_inc(x_161);
-lean_inc(x_160);
+lean_object* x_193; lean_object* x_194; lean_object* x_195; 
+x_193 = lean_ctor_get(x_13, 0);
+x_194 = lean_ctor_get(x_13, 1);
+lean_inc(x_194);
+lean_inc(x_193);
 lean_dec(x_13);
-x_162 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_162, 0, x_160);
-lean_ctor_set(x_162, 1, x_161);
-return x_162;
+x_195 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_195, 0, x_193);
+lean_ctor_set(x_195, 1, x_194);
+return x_195;
 }
 }
 }
 else
 {
-uint8_t x_163; uint8_t x_164; uint8_t x_165; uint8_t x_166; uint8_t x_167; uint8_t x_168; uint8_t x_169; uint8_t x_170; uint8_t x_171; lean_object* x_172; uint8_t x_173; lean_object* x_174; 
-x_163 = lean_ctor_get_uint8(x_9, 0);
-x_164 = lean_ctor_get_uint8(x_9, 1);
-x_165 = lean_ctor_get_uint8(x_9, 2);
-x_166 = lean_ctor_get_uint8(x_9, 3);
-x_167 = lean_ctor_get_uint8(x_9, 4);
-x_168 = lean_ctor_get_uint8(x_9, 6);
-x_169 = lean_ctor_get_uint8(x_9, 7);
-x_170 = lean_ctor_get_uint8(x_9, 8);
+uint8_t x_196; uint8_t x_197; uint8_t x_198; uint8_t x_199; uint8_t x_200; uint8_t x_201; uint8_t x_202; uint8_t x_203; uint8_t x_204; lean_object* x_205; uint8_t x_206; lean_object* x_207; 
+x_196 = lean_ctor_get_uint8(x_9, 0);
+x_197 = lean_ctor_get_uint8(x_9, 1);
+x_198 = lean_ctor_get_uint8(x_9, 2);
+x_199 = lean_ctor_get_uint8(x_9, 3);
+x_200 = lean_ctor_get_uint8(x_9, 4);
+x_201 = lean_ctor_get_uint8(x_9, 6);
+x_202 = lean_ctor_get_uint8(x_9, 7);
+x_203 = lean_ctor_get_uint8(x_9, 8);
 lean_dec(x_9);
-x_171 = 2;
-x_172 = lean_alloc_ctor(0, 0, 9);
-lean_ctor_set_uint8(x_172, 0, x_163);
-lean_ctor_set_uint8(x_172, 1, x_164);
-lean_ctor_set_uint8(x_172, 2, x_165);
-lean_ctor_set_uint8(x_172, 3, x_166);
-lean_ctor_set_uint8(x_172, 4, x_167);
-lean_ctor_set_uint8(x_172, 5, x_171);
-lean_ctor_set_uint8(x_172, 6, x_168);
-lean_ctor_set_uint8(x_172, 7, x_169);
-lean_ctor_set_uint8(x_172, 8, x_170);
-lean_ctor_set(x_3, 0, x_172);
-x_173 = 0;
+x_204 = 2;
+x_205 = lean_alloc_ctor(0, 0, 9);
+lean_ctor_set_uint8(x_205, 0, x_196);
+lean_ctor_set_uint8(x_205, 1, x_197);
+lean_ctor_set_uint8(x_205, 2, x_198);
+lean_ctor_set_uint8(x_205, 3, x_199);
+lean_ctor_set_uint8(x_205, 4, x_200);
+lean_ctor_set_uint8(x_205, 5, x_204);
+lean_ctor_set_uint8(x_205, 6, x_201);
+lean_ctor_set_uint8(x_205, 7, x_202);
+lean_ctor_set_uint8(x_205, 8, x_203);
+lean_ctor_set(x_3, 0, x_205);
+x_206 = 0;
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_174 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_173, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_174) == 0)
+x_207 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_206, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_207) == 0)
 {
-lean_object* x_175; lean_object* x_176; 
-x_175 = lean_ctor_get(x_174, 0);
-lean_inc(x_175);
-x_176 = lean_ctor_get(x_175, 0);
-lean_inc(x_176);
-switch (lean_obj_tag(x_176)) {
+lean_object* x_208; lean_object* x_209; 
+x_208 = lean_ctor_get(x_207, 0);
+lean_inc(x_208);
+x_209 = lean_ctor_get(x_208, 0);
+lean_inc(x_209);
+switch (lean_obj_tag(x_209)) {
 case 0:
 {
-lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; 
-x_177 = lean_ctor_get(x_174, 1);
-lean_inc(x_177);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_178 = x_174;
+lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; 
+x_210 = lean_ctor_get(x_207, 1);
+lean_inc(x_210);
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_211 = x_207;
 } else {
- lean_dec_ref(x_174);
- x_178 = lean_box(0);
+ lean_dec_ref(x_207);
+ x_211 = lean_box(0);
 }
-x_179 = lean_ctor_get(x_175, 1);
-lean_inc(x_179);
-lean_dec(x_175);
+x_212 = lean_ctor_get(x_208, 1);
+lean_inc(x_212);
+lean_dec(x_208);
 lean_inc(x_1);
-x_180 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_181 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__1___rarg(x_1, x_176);
-lean_dec(x_176);
-if (lean_obj_tag(x_181) == 0)
+x_213 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_214 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__1___rarg(x_1, x_209);
+lean_dec(x_209);
+if (lean_obj_tag(x_214) == 0)
 {
-lean_object* x_182; 
-lean_dec(x_179);
+lean_object* x_215; 
+lean_dec(x_212);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_178)) {
- x_182 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_211)) {
+ x_215 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_182 = x_178;
+ x_215 = x_211;
 }
-lean_ctor_set(x_182, 0, x_180);
-lean_ctor_set(x_182, 1, x_177);
-return x_182;
+lean_ctor_set(x_215, 0, x_213);
+lean_ctor_set(x_215, 1, x_210);
+return x_215;
 }
 else
 {
-lean_object* x_183; lean_object* x_184; lean_object* x_185; 
-lean_dec(x_178);
-x_183 = lean_ctor_get(x_181, 0);
-lean_inc(x_183);
-lean_dec(x_181);
-x_184 = lean_unsigned_to_nat(0u);
-x_185 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_184, x_179, x_183, x_180, x_3, x_4, x_5, x_6, x_177);
-if (lean_obj_tag(x_185) == 0)
+lean_object* x_216; lean_object* x_217; lean_object* x_218; 
+lean_dec(x_211);
+x_216 = lean_ctor_get(x_214, 0);
+lean_inc(x_216);
+lean_dec(x_214);
+x_217 = lean_unsigned_to_nat(0u);
+x_218 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_217, x_212, x_216, x_213, x_3, x_4, x_5, x_6, x_210);
+if (lean_obj_tag(x_218) == 0)
 {
-lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; 
-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;
+lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+x_219 = lean_ctor_get(x_218, 0);
+lean_inc(x_219);
+x_220 = lean_ctor_get(x_218, 1);
+lean_inc(x_220);
+if (lean_is_exclusive(x_218)) {
+ lean_ctor_release(x_218, 0);
+ lean_ctor_release(x_218, 1);
+ x_221 = x_218;
 } else {
- lean_dec_ref(x_185);
- x_188 = lean_box(0);
+ lean_dec_ref(x_218);
+ x_221 = lean_box(0);
 }
-if (lean_is_scalar(x_188)) {
- x_189 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_221)) {
+ x_222 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_189 = x_188;
+ x_222 = x_221;
 }
-lean_ctor_set(x_189, 0, x_186);
-lean_ctor_set(x_189, 1, x_187);
-return x_189;
+lean_ctor_set(x_222, 0, x_219);
+lean_ctor_set(x_222, 1, x_220);
+return x_222;
 }
 else
 {
-lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; 
-x_190 = lean_ctor_get(x_185, 0);
-lean_inc(x_190);
-x_191 = lean_ctor_get(x_185, 1);
-lean_inc(x_191);
-if (lean_is_exclusive(x_185)) {
- lean_ctor_release(x_185, 0);
- lean_ctor_release(x_185, 1);
- x_192 = x_185;
+lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; 
+x_223 = lean_ctor_get(x_218, 0);
+lean_inc(x_223);
+x_224 = lean_ctor_get(x_218, 1);
+lean_inc(x_224);
+if (lean_is_exclusive(x_218)) {
+ lean_ctor_release(x_218, 0);
+ lean_ctor_release(x_218, 1);
+ x_225 = x_218;
 } else {
- lean_dec_ref(x_185);
- x_192 = lean_box(0);
+ lean_dec_ref(x_218);
+ x_225 = lean_box(0);
 }
-if (lean_is_scalar(x_192)) {
- x_193 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_225)) {
+ x_226 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_193 = x_192;
+ x_226 = x_225;
 }
-lean_ctor_set(x_193, 0, x_190);
-lean_ctor_set(x_193, 1, x_191);
-return x_193;
+lean_ctor_set(x_226, 0, x_223);
+lean_ctor_set(x_226, 1, x_224);
+return x_226;
 }
 }
 }
 case 1:
 {
-lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; 
-x_194 = lean_ctor_get(x_174, 1);
-lean_inc(x_194);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_195 = x_174;
+lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; 
+x_227 = lean_ctor_get(x_207, 1);
+lean_inc(x_227);
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_228 = x_207;
 } else {
- lean_dec_ref(x_174);
- x_195 = lean_box(0);
+ lean_dec_ref(x_207);
+ x_228 = lean_box(0);
 }
-x_196 = lean_ctor_get(x_175, 1);
-lean_inc(x_196);
-lean_dec(x_175);
+x_229 = lean_ctor_get(x_208, 1);
+lean_inc(x_229);
+lean_dec(x_208);
 lean_inc(x_1);
-x_197 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_198 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__4___rarg(x_1, x_176);
-lean_dec(x_176);
-if (lean_obj_tag(x_198) == 0)
+x_230 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_231 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__4___rarg(x_1, x_209);
+lean_dec(x_209);
+if (lean_obj_tag(x_231) == 0)
 {
-lean_object* x_199; 
-lean_dec(x_196);
+lean_object* x_232; 
+lean_dec(x_229);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_195)) {
- x_199 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_228)) {
+ x_232 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_199 = x_195;
+ x_232 = x_228;
 }
-lean_ctor_set(x_199, 0, x_197);
-lean_ctor_set(x_199, 1, x_194);
-return x_199;
+lean_ctor_set(x_232, 0, x_230);
+lean_ctor_set(x_232, 1, x_227);
+return x_232;
 }
 else
 {
-lean_object* x_200; lean_object* x_201; lean_object* x_202; 
-lean_dec(x_195);
-x_200 = lean_ctor_get(x_198, 0);
-lean_inc(x_200);
-lean_dec(x_198);
-x_201 = lean_unsigned_to_nat(0u);
-x_202 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_201, x_196, x_200, x_197, x_3, x_4, x_5, x_6, x_194);
-if (lean_obj_tag(x_202) == 0)
+lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+lean_dec(x_228);
+x_233 = lean_ctor_get(x_231, 0);
+lean_inc(x_233);
+lean_dec(x_231);
+x_234 = lean_unsigned_to_nat(0u);
+x_235 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_234, x_229, x_233, x_230, x_3, x_4, x_5, x_6, x_227);
+if (lean_obj_tag(x_235) == 0)
 {
-lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; 
-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;
+lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; 
+x_236 = lean_ctor_get(x_235, 0);
+lean_inc(x_236);
+x_237 = lean_ctor_get(x_235, 1);
+lean_inc(x_237);
+if (lean_is_exclusive(x_235)) {
+ lean_ctor_release(x_235, 0);
+ lean_ctor_release(x_235, 1);
+ x_238 = x_235;
 } else {
- lean_dec_ref(x_202);
- x_205 = lean_box(0);
+ lean_dec_ref(x_235);
+ x_238 = lean_box(0);
 }
-if (lean_is_scalar(x_205)) {
- x_206 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_238)) {
+ x_239 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_206 = x_205;
+ x_239 = x_238;
 }
-lean_ctor_set(x_206, 0, x_203);
-lean_ctor_set(x_206, 1, x_204);
-return x_206;
+lean_ctor_set(x_239, 0, x_236);
+lean_ctor_set(x_239, 1, x_237);
+return x_239;
 }
 else
 {
-lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; 
-x_207 = lean_ctor_get(x_202, 0);
-lean_inc(x_207);
-x_208 = lean_ctor_get(x_202, 1);
-lean_inc(x_208);
-if (lean_is_exclusive(x_202)) {
- lean_ctor_release(x_202, 0);
- lean_ctor_release(x_202, 1);
- x_209 = x_202;
+lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; 
+x_240 = lean_ctor_get(x_235, 0);
+lean_inc(x_240);
+x_241 = lean_ctor_get(x_235, 1);
+lean_inc(x_241);
+if (lean_is_exclusive(x_235)) {
+ lean_ctor_release(x_235, 0);
+ lean_ctor_release(x_235, 1);
+ x_242 = x_235;
 } else {
- lean_dec_ref(x_202);
- x_209 = lean_box(0);
+ lean_dec_ref(x_235);
+ x_242 = lean_box(0);
 }
-if (lean_is_scalar(x_209)) {
- x_210 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_242)) {
+ x_243 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_210 = x_209;
+ x_243 = x_242;
 }
-lean_ctor_set(x_210, 0, x_207);
-lean_ctor_set(x_210, 1, x_208);
-return x_210;
+lean_ctor_set(x_243, 0, x_240);
+lean_ctor_set(x_243, 1, x_241);
+return x_243;
 }
 }
 }
 case 2:
 {
-lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; 
-x_211 = lean_ctor_get(x_174, 1);
-lean_inc(x_211);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_212 = x_174;
+lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; 
+x_244 = lean_ctor_get(x_207, 1);
+lean_inc(x_244);
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_245 = x_207;
 } else {
- lean_dec_ref(x_174);
- x_212 = lean_box(0);
+ lean_dec_ref(x_207);
+ x_245 = lean_box(0);
 }
-x_213 = lean_ctor_get(x_175, 1);
-lean_inc(x_213);
-lean_dec(x_175);
+x_246 = lean_ctor_get(x_208, 1);
+lean_inc(x_246);
+lean_dec(x_208);
 lean_inc(x_1);
-x_214 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_215 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg(x_1, x_176);
-lean_dec(x_176);
-if (lean_obj_tag(x_215) == 0)
+x_247 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_248 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg(x_1, x_209);
+lean_dec(x_209);
+if (lean_obj_tag(x_248) == 0)
 {
-lean_object* x_216; 
-lean_dec(x_213);
+lean_object* x_249; 
+lean_dec(x_246);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_212)) {
- x_216 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_245)) {
+ x_249 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_216 = x_212;
+ x_249 = x_245;
 }
-lean_ctor_set(x_216, 0, x_214);
-lean_ctor_set(x_216, 1, x_211);
-return x_216;
+lean_ctor_set(x_249, 0, x_247);
+lean_ctor_set(x_249, 1, x_244);
+return x_249;
 }
 else
 {
-lean_object* x_217; lean_object* x_218; lean_object* x_219; 
-lean_dec(x_212);
-x_217 = lean_ctor_get(x_215, 0);
-lean_inc(x_217);
-lean_dec(x_215);
-x_218 = lean_unsigned_to_nat(0u);
-x_219 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_218, x_213, x_217, x_214, x_3, x_4, x_5, x_6, x_211);
-if (lean_obj_tag(x_219) == 0)
+lean_object* x_250; lean_object* x_251; lean_object* x_252; 
+lean_dec(x_245);
+x_250 = lean_ctor_get(x_248, 0);
+lean_inc(x_250);
+lean_dec(x_248);
+x_251 = lean_unsigned_to_nat(0u);
+x_252 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_251, x_246, x_250, x_247, x_3, x_4, x_5, x_6, x_244);
+if (lean_obj_tag(x_252) == 0)
 {
-lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; 
-x_220 = lean_ctor_get(x_219, 0);
-lean_inc(x_220);
-x_221 = lean_ctor_get(x_219, 1);
-lean_inc(x_221);
-if (lean_is_exclusive(x_219)) {
- lean_ctor_release(x_219, 0);
- lean_ctor_release(x_219, 1);
- x_222 = x_219;
+lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; 
+x_253 = lean_ctor_get(x_252, 0);
+lean_inc(x_253);
+x_254 = lean_ctor_get(x_252, 1);
+lean_inc(x_254);
+if (lean_is_exclusive(x_252)) {
+ lean_ctor_release(x_252, 0);
+ lean_ctor_release(x_252, 1);
+ x_255 = x_252;
 } else {
- lean_dec_ref(x_219);
- x_222 = lean_box(0);
+ lean_dec_ref(x_252);
+ x_255 = lean_box(0);
 }
-if (lean_is_scalar(x_222)) {
- x_223 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_255)) {
+ x_256 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_223 = x_222;
+ x_256 = x_255;
 }
-lean_ctor_set(x_223, 0, x_220);
-lean_ctor_set(x_223, 1, x_221);
-return x_223;
+lean_ctor_set(x_256, 0, x_253);
+lean_ctor_set(x_256, 1, x_254);
+return x_256;
 }
 else
 {
-lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; 
-x_224 = lean_ctor_get(x_219, 0);
-lean_inc(x_224);
-x_225 = lean_ctor_get(x_219, 1);
-lean_inc(x_225);
-if (lean_is_exclusive(x_219)) {
- lean_ctor_release(x_219, 0);
- lean_ctor_release(x_219, 1);
- x_226 = x_219;
+lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; 
+x_257 = lean_ctor_get(x_252, 0);
+lean_inc(x_257);
+x_258 = lean_ctor_get(x_252, 1);
+lean_inc(x_258);
+if (lean_is_exclusive(x_252)) {
+ lean_ctor_release(x_252, 0);
+ lean_ctor_release(x_252, 1);
+ x_259 = x_252;
 } else {
- lean_dec_ref(x_219);
- x_226 = lean_box(0);
+ lean_dec_ref(x_252);
+ x_259 = lean_box(0);
 }
-if (lean_is_scalar(x_226)) {
- x_227 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_259)) {
+ x_260 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_227 = x_226;
+ x_260 = x_259;
 }
-lean_ctor_set(x_227, 0, x_224);
-lean_ctor_set(x_227, 1, x_225);
-return x_227;
+lean_ctor_set(x_260, 0, x_257);
+lean_ctor_set(x_260, 1, x_258);
+return x_260;
 }
 }
 }
 case 3:
 {
-lean_object* x_228; lean_object* x_229; lean_object* x_230; 
-lean_dec(x_175);
-x_228 = lean_ctor_get(x_174, 1);
-lean_inc(x_228);
-lean_dec(x_174);
-x_229 = l_Array_empty___closed__1;
-x_230 = l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg(x_1, x_229, x_3, x_4, x_5, x_6, x_228);
+lean_object* x_261; lean_object* x_262; lean_object* x_263; 
+lean_dec(x_208);
+x_261 = lean_ctor_get(x_207, 1);
+lean_inc(x_261);
+lean_dec(x_207);
+x_262 = l_Array_empty___closed__1;
+x_263 = l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg(x_1, x_262, x_3, x_4, x_5, x_6, x_261);
 lean_dec(x_1);
-if (lean_obj_tag(x_230) == 0)
+if (lean_obj_tag(x_263) == 0)
 {
-lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; 
-x_231 = lean_ctor_get(x_230, 0);
-lean_inc(x_231);
-x_232 = lean_ctor_get(x_230, 1);
-lean_inc(x_232);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_233 = x_230;
+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;
 } else {
- lean_dec_ref(x_230);
- x_233 = lean_box(0);
+ lean_dec_ref(x_263);
+ x_266 = lean_box(0);
 }
-if (lean_is_scalar(x_233)) {
- x_234 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_266)) {
+ x_267 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_234 = x_233;
+ x_267 = x_266;
 }
-lean_ctor_set(x_234, 0, x_231);
-lean_ctor_set(x_234, 1, x_232);
-return x_234;
+lean_ctor_set(x_267, 0, x_264);
+lean_ctor_set(x_267, 1, x_265);
+return x_267;
 }
 else
 {
-lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; 
-x_235 = lean_ctor_get(x_230, 0);
-lean_inc(x_235);
-x_236 = lean_ctor_get(x_230, 1);
-lean_inc(x_236);
-if (lean_is_exclusive(x_230)) {
- lean_ctor_release(x_230, 0);
- lean_ctor_release(x_230, 1);
- x_237 = x_230;
+lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; 
+x_268 = lean_ctor_get(x_263, 0);
+lean_inc(x_268);
+x_269 = lean_ctor_get(x_263, 1);
+lean_inc(x_269);
+if (lean_is_exclusive(x_263)) {
+ lean_ctor_release(x_263, 0);
+ lean_ctor_release(x_263, 1);
+ x_270 = x_263;
 } else {
- lean_dec_ref(x_230);
- x_237 = lean_box(0);
+ lean_dec_ref(x_263);
+ x_270 = lean_box(0);
 }
-if (lean_is_scalar(x_237)) {
- x_238 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_270)) {
+ x_271 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_238 = x_237;
+ x_271 = x_270;
+}
+lean_ctor_set(x_271, 0, x_268);
+lean_ctor_set(x_271, 1, x_269);
+return x_271;
+}
+}
+case 4:
+{
+lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; 
+x_272 = lean_ctor_get(x_207, 1);
+lean_inc(x_272);
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_273 = x_207;
+} else {
+ lean_dec_ref(x_207);
+ x_273 = lean_box(0);
+}
+x_274 = lean_ctor_get(x_208, 1);
+lean_inc(x_274);
+lean_dec(x_208);
+lean_inc(x_1);
+x_275 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_276 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg(x_1, x_209);
+if (lean_obj_tag(x_276) == 0)
+{
+lean_object* x_277; 
+lean_dec(x_274);
+lean_dec(x_3);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_273)) {
+ x_277 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_277 = x_273;
+}
+lean_ctor_set(x_277, 0, x_275);
+lean_ctor_set(x_277, 1, x_272);
+return x_277;
+}
+else
+{
+lean_object* x_278; lean_object* x_279; lean_object* x_280; 
+lean_dec(x_273);
+x_278 = lean_ctor_get(x_276, 0);
+lean_inc(x_278);
+lean_dec(x_276);
+x_279 = lean_unsigned_to_nat(0u);
+x_280 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_279, x_274, x_278, x_275, x_3, x_4, x_5, x_6, x_272);
+if (lean_obj_tag(x_280) == 0)
+{
+lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 
+x_281 = lean_ctor_get(x_280, 0);
+lean_inc(x_281);
+x_282 = lean_ctor_get(x_280, 1);
+lean_inc(x_282);
+if (lean_is_exclusive(x_280)) {
+ lean_ctor_release(x_280, 0);
+ lean_ctor_release(x_280, 1);
+ x_283 = x_280;
+} else {
+ lean_dec_ref(x_280);
+ x_283 = lean_box(0);
+}
+if (lean_is_scalar(x_283)) {
+ x_284 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_284 = x_283;
+}
+lean_ctor_set(x_284, 0, x_281);
+lean_ctor_set(x_284, 1, x_282);
+return x_284;
+}
+else
+{
+lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; 
+x_285 = lean_ctor_get(x_280, 0);
+lean_inc(x_285);
+x_286 = lean_ctor_get(x_280, 1);
+lean_inc(x_286);
+if (lean_is_exclusive(x_280)) {
+ lean_ctor_release(x_280, 0);
+ lean_ctor_release(x_280, 1);
+ x_287 = x_280;
+} else {
+ lean_dec_ref(x_280);
+ x_287 = lean_box(0);
+}
+if (lean_is_scalar(x_287)) {
+ x_288 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_288 = x_287;
+}
+lean_ctor_set(x_288, 0, x_285);
+lean_ctor_set(x_288, 1, x_286);
+return x_288;
 }
-lean_ctor_set(x_238, 0, x_235);
-lean_ctor_set(x_238, 1, x_236);
-return x_238;
 }
 }
 default: 
 {
-lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; 
-x_239 = lean_ctor_get(x_174, 1);
-lean_inc(x_239);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_240 = x_174;
+lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; 
+x_289 = lean_ctor_get(x_207, 1);
+lean_inc(x_289);
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_290 = x_207;
 } else {
- lean_dec_ref(x_174);
- x_240 = lean_box(0);
+ lean_dec_ref(x_207);
+ x_290 = lean_box(0);
 }
-x_241 = lean_ctor_get(x_175, 1);
-lean_inc(x_241);
-lean_dec(x_175);
+x_291 = lean_ctor_get(x_208, 1);
+lean_inc(x_291);
+lean_dec(x_208);
 lean_inc(x_1);
-x_242 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_243 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg(x_1, x_176);
-if (lean_obj_tag(x_243) == 0)
+x_292 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_293 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(x_1, x_209);
+if (lean_obj_tag(x_293) == 0)
 {
-lean_object* x_244; 
-lean_dec(x_241);
+lean_object* x_294; 
+lean_dec(x_291);
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_240)) {
- x_244 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_290)) {
+ x_294 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_244 = x_240;
+ x_294 = x_290;
 }
-lean_ctor_set(x_244, 0, x_242);
-lean_ctor_set(x_244, 1, x_239);
-return x_244;
+lean_ctor_set(x_294, 0, x_292);
+lean_ctor_set(x_294, 1, x_289);
+return x_294;
 }
 else
 {
-lean_object* x_245; lean_object* x_246; lean_object* x_247; 
-lean_dec(x_240);
-x_245 = lean_ctor_get(x_243, 0);
-lean_inc(x_245);
-lean_dec(x_243);
-x_246 = lean_unsigned_to_nat(0u);
-x_247 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_246, x_241, x_245, x_242, x_3, x_4, x_5, x_6, x_239);
-if (lean_obj_tag(x_247) == 0)
+lean_object* x_295; lean_object* x_296; lean_object* x_297; 
+lean_dec(x_290);
+x_295 = lean_ctor_get(x_293, 0);
+lean_inc(x_295);
+lean_dec(x_293);
+x_296 = lean_unsigned_to_nat(0u);
+x_297 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_296, x_291, x_295, x_292, x_3, x_4, x_5, x_6, x_289);
+if (lean_obj_tag(x_297) == 0)
 {
-lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
-x_248 = lean_ctor_get(x_247, 0);
-lean_inc(x_248);
-x_249 = lean_ctor_get(x_247, 1);
-lean_inc(x_249);
-if (lean_is_exclusive(x_247)) {
- lean_ctor_release(x_247, 0);
- lean_ctor_release(x_247, 1);
- x_250 = x_247;
+lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
+x_298 = lean_ctor_get(x_297, 0);
+lean_inc(x_298);
+x_299 = lean_ctor_get(x_297, 1);
+lean_inc(x_299);
+if (lean_is_exclusive(x_297)) {
+ lean_ctor_release(x_297, 0);
+ lean_ctor_release(x_297, 1);
+ x_300 = x_297;
 } else {
- lean_dec_ref(x_247);
- x_250 = lean_box(0);
+ lean_dec_ref(x_297);
+ x_300 = lean_box(0);
 }
-if (lean_is_scalar(x_250)) {
- x_251 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_300)) {
+ x_301 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_251 = x_250;
+ x_301 = x_300;
 }
-lean_ctor_set(x_251, 0, x_248);
-lean_ctor_set(x_251, 1, x_249);
-return x_251;
+lean_ctor_set(x_301, 0, x_298);
+lean_ctor_set(x_301, 1, x_299);
+return x_301;
 }
 else
 {
-lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; 
-x_252 = lean_ctor_get(x_247, 0);
-lean_inc(x_252);
-x_253 = lean_ctor_get(x_247, 1);
-lean_inc(x_253);
-if (lean_is_exclusive(x_247)) {
- lean_ctor_release(x_247, 0);
- lean_ctor_release(x_247, 1);
- x_254 = x_247;
+lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; 
+x_302 = lean_ctor_get(x_297, 0);
+lean_inc(x_302);
+x_303 = lean_ctor_get(x_297, 1);
+lean_inc(x_303);
+if (lean_is_exclusive(x_297)) {
+ lean_ctor_release(x_297, 0);
+ lean_ctor_release(x_297, 1);
+ x_304 = x_297;
 } else {
- lean_dec_ref(x_247);
- x_254 = lean_box(0);
+ lean_dec_ref(x_297);
+ x_304 = lean_box(0);
 }
-if (lean_is_scalar(x_254)) {
- x_255 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_304)) {
+ x_305 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_255 = x_254;
+ x_305 = x_304;
 }
-lean_ctor_set(x_255, 0, x_252);
-lean_ctor_set(x_255, 1, x_253);
-return x_255;
+lean_ctor_set(x_305, 0, x_302);
+lean_ctor_set(x_305, 1, x_303);
+return x_305;
 }
 }
 }
@@ -17915,254 +20240,26 @@ return x_255;
 }
 else
 {
-lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; 
+lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; 
 lean_dec(x_3);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_256 = lean_ctor_get(x_174, 0);
-lean_inc(x_256);
-x_257 = lean_ctor_get(x_174, 1);
-lean_inc(x_257);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_258 = x_174;
-} else {
- lean_dec_ref(x_174);
- x_258 = lean_box(0);
-}
-if (lean_is_scalar(x_258)) {
- x_259 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_259 = x_258;
-}
-lean_ctor_set(x_259, 0, x_256);
-lean_ctor_set(x_259, 1, x_257);
-return x_259;
-}
-}
-}
-else
-{
-lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; uint8_t x_264; uint8_t x_265; uint8_t x_266; uint8_t x_267; uint8_t x_268; uint8_t x_269; uint8_t x_270; uint8_t x_271; lean_object* x_272; uint8_t x_273; lean_object* x_274; lean_object* x_275; uint8_t x_276; lean_object* x_277; 
-x_260 = lean_ctor_get(x_3, 0);
-x_261 = lean_ctor_get(x_3, 1);
-x_262 = lean_ctor_get(x_3, 2);
-x_263 = lean_ctor_get(x_3, 3);
-lean_inc(x_263);
-lean_inc(x_262);
-lean_inc(x_261);
-lean_inc(x_260);
-lean_dec(x_3);
-x_264 = lean_ctor_get_uint8(x_260, 0);
-x_265 = lean_ctor_get_uint8(x_260, 1);
-x_266 = lean_ctor_get_uint8(x_260, 2);
-x_267 = lean_ctor_get_uint8(x_260, 3);
-x_268 = lean_ctor_get_uint8(x_260, 4);
-x_269 = lean_ctor_get_uint8(x_260, 6);
-x_270 = lean_ctor_get_uint8(x_260, 7);
-x_271 = lean_ctor_get_uint8(x_260, 8);
-if (lean_is_exclusive(x_260)) {
- x_272 = x_260;
-} else {
- lean_dec_ref(x_260);
- x_272 = lean_box(0);
-}
-x_273 = 2;
-if (lean_is_scalar(x_272)) {
- x_274 = lean_alloc_ctor(0, 0, 9);
-} else {
- x_274 = x_272;
-}
-lean_ctor_set_uint8(x_274, 0, x_264);
-lean_ctor_set_uint8(x_274, 1, x_265);
-lean_ctor_set_uint8(x_274, 2, x_266);
-lean_ctor_set_uint8(x_274, 3, x_267);
-lean_ctor_set_uint8(x_274, 4, x_268);
-lean_ctor_set_uint8(x_274, 5, x_273);
-lean_ctor_set_uint8(x_274, 6, x_269);
-lean_ctor_set_uint8(x_274, 7, x_270);
-lean_ctor_set_uint8(x_274, 8, x_271);
-x_275 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_275, 0, x_274);
-lean_ctor_set(x_275, 1, x_261);
-lean_ctor_set(x_275, 2, x_262);
-lean_ctor_set(x_275, 3, x_263);
-x_276 = 0;
-lean_inc(x_6);
-lean_inc(x_5);
-lean_inc(x_4);
-lean_inc(x_275);
-x_277 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_276, x_275, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_277) == 0)
-{
-lean_object* x_278; lean_object* x_279; 
-x_278 = lean_ctor_get(x_277, 0);
-lean_inc(x_278);
-x_279 = lean_ctor_get(x_278, 0);
-lean_inc(x_279);
-switch (lean_obj_tag(x_279)) {
-case 0:
-{
-lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; 
-x_280 = lean_ctor_get(x_277, 1);
-lean_inc(x_280);
-if (lean_is_exclusive(x_277)) {
- lean_ctor_release(x_277, 0);
- lean_ctor_release(x_277, 1);
- x_281 = x_277;
-} else {
- lean_dec_ref(x_277);
- x_281 = lean_box(0);
-}
-x_282 = lean_ctor_get(x_278, 1);
-lean_inc(x_282);
-lean_dec(x_278);
-lean_inc(x_1);
-x_283 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_284 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__1___rarg(x_1, x_279);
-lean_dec(x_279);
-if (lean_obj_tag(x_284) == 0)
-{
-lean_object* x_285; 
-lean_dec(x_282);
-lean_dec(x_275);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_281)) {
- x_285 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_285 = x_281;
-}
-lean_ctor_set(x_285, 0, x_283);
-lean_ctor_set(x_285, 1, x_280);
-return x_285;
-}
-else
-{
-lean_object* x_286; lean_object* x_287; lean_object* x_288; 
-lean_dec(x_281);
-x_286 = lean_ctor_get(x_284, 0);
-lean_inc(x_286);
-lean_dec(x_284);
-x_287 = lean_unsigned_to_nat(0u);
-x_288 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_287, x_282, x_286, x_283, x_275, x_4, x_5, x_6, x_280);
-if (lean_obj_tag(x_288) == 0)
-{
-lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; 
-x_289 = lean_ctor_get(x_288, 0);
-lean_inc(x_289);
-x_290 = lean_ctor_get(x_288, 1);
-lean_inc(x_290);
-if (lean_is_exclusive(x_288)) {
- lean_ctor_release(x_288, 0);
- lean_ctor_release(x_288, 1);
- x_291 = x_288;
-} else {
- lean_dec_ref(x_288);
- x_291 = lean_box(0);
-}
-if (lean_is_scalar(x_291)) {
- x_292 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_292 = x_291;
-}
-lean_ctor_set(x_292, 0, x_289);
-lean_ctor_set(x_292, 1, x_290);
-return x_292;
-}
-else
-{
-lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; 
-x_293 = lean_ctor_get(x_288, 0);
-lean_inc(x_293);
-x_294 = lean_ctor_get(x_288, 1);
-lean_inc(x_294);
-if (lean_is_exclusive(x_288)) {
- lean_ctor_release(x_288, 0);
- lean_ctor_release(x_288, 1);
- x_295 = x_288;
-} else {
- lean_dec_ref(x_288);
- x_295 = lean_box(0);
-}
-if (lean_is_scalar(x_295)) {
- x_296 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_296 = x_295;
-}
-lean_ctor_set(x_296, 0, x_293);
-lean_ctor_set(x_296, 1, x_294);
-return x_296;
-}
-}
-}
-case 1:
-{
-lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; 
-x_297 = lean_ctor_get(x_277, 1);
-lean_inc(x_297);
-if (lean_is_exclusive(x_277)) {
- lean_ctor_release(x_277, 0);
- lean_ctor_release(x_277, 1);
- x_298 = x_277;
-} else {
- lean_dec_ref(x_277);
- x_298 = lean_box(0);
-}
-x_299 = lean_ctor_get(x_278, 1);
-lean_inc(x_299);
-lean_dec(x_278);
-lean_inc(x_1);
-x_300 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_301 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__4___rarg(x_1, x_279);
-lean_dec(x_279);
-if (lean_obj_tag(x_301) == 0)
-{
-lean_object* x_302; 
-lean_dec(x_299);
-lean_dec(x_275);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-if (lean_is_scalar(x_298)) {
- x_302 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_302 = x_298;
-}
-lean_ctor_set(x_302, 0, x_300);
-lean_ctor_set(x_302, 1, x_297);
-return x_302;
-}
-else
-{
-lean_object* x_303; lean_object* x_304; lean_object* x_305; 
-lean_dec(x_298);
-x_303 = lean_ctor_get(x_301, 0);
-lean_inc(x_303);
-lean_dec(x_301);
-x_304 = lean_unsigned_to_nat(0u);
-x_305 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_304, x_299, x_303, x_300, x_275, x_4, x_5, x_6, x_297);
-if (lean_obj_tag(x_305) == 0)
-{
-lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; 
-x_306 = lean_ctor_get(x_305, 0);
+x_306 = lean_ctor_get(x_207, 0);
 lean_inc(x_306);
-x_307 = lean_ctor_get(x_305, 1);
+x_307 = lean_ctor_get(x_207, 1);
 lean_inc(x_307);
-if (lean_is_exclusive(x_305)) {
- lean_ctor_release(x_305, 0);
- lean_ctor_release(x_305, 1);
- x_308 = x_305;
+if (lean_is_exclusive(x_207)) {
+ lean_ctor_release(x_207, 0);
+ lean_ctor_release(x_207, 1);
+ x_308 = x_207;
 } else {
- lean_dec_ref(x_305);
+ lean_dec_ref(x_207);
  x_308 = lean_box(0);
 }
 if (lean_is_scalar(x_308)) {
- x_309 = lean_alloc_ctor(0, 2, 0);
+ x_309 = lean_alloc_ctor(1, 2, 0);
 } else {
  x_309 = x_308;
 }
@@ -18170,279 +20267,602 @@ 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; 
-x_310 = lean_ctor_get(x_305, 0);
-lean_inc(x_310);
-x_311 = lean_ctor_get(x_305, 1);
+lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; uint8_t x_314; uint8_t x_315; uint8_t x_316; uint8_t x_317; uint8_t x_318; uint8_t x_319; uint8_t x_320; uint8_t x_321; lean_object* x_322; uint8_t x_323; lean_object* x_324; lean_object* x_325; uint8_t x_326; lean_object* x_327; 
+x_310 = lean_ctor_get(x_3, 0);
+x_311 = lean_ctor_get(x_3, 1);
+x_312 = lean_ctor_get(x_3, 2);
+x_313 = lean_ctor_get(x_3, 3);
+lean_inc(x_313);
+lean_inc(x_312);
 lean_inc(x_311);
-if (lean_is_exclusive(x_305)) {
- lean_ctor_release(x_305, 0);
- lean_ctor_release(x_305, 1);
- x_312 = x_305;
+lean_inc(x_310);
+lean_dec(x_3);
+x_314 = lean_ctor_get_uint8(x_310, 0);
+x_315 = lean_ctor_get_uint8(x_310, 1);
+x_316 = lean_ctor_get_uint8(x_310, 2);
+x_317 = lean_ctor_get_uint8(x_310, 3);
+x_318 = lean_ctor_get_uint8(x_310, 4);
+x_319 = lean_ctor_get_uint8(x_310, 6);
+x_320 = lean_ctor_get_uint8(x_310, 7);
+x_321 = lean_ctor_get_uint8(x_310, 8);
+if (lean_is_exclusive(x_310)) {
+ x_322 = x_310;
 } else {
- lean_dec_ref(x_305);
- x_312 = lean_box(0);
+ lean_dec_ref(x_310);
+ x_322 = lean_box(0);
 }
-if (lean_is_scalar(x_312)) {
- x_313 = lean_alloc_ctor(1, 2, 0);
+x_323 = 2;
+if (lean_is_scalar(x_322)) {
+ x_324 = lean_alloc_ctor(0, 0, 9);
 } else {
- x_313 = x_312;
+ x_324 = x_322;
 }
-lean_ctor_set(x_313, 0, x_310);
-lean_ctor_set(x_313, 1, x_311);
-return x_313;
+lean_ctor_set_uint8(x_324, 0, x_314);
+lean_ctor_set_uint8(x_324, 1, x_315);
+lean_ctor_set_uint8(x_324, 2, x_316);
+lean_ctor_set_uint8(x_324, 3, x_317);
+lean_ctor_set_uint8(x_324, 4, x_318);
+lean_ctor_set_uint8(x_324, 5, x_323);
+lean_ctor_set_uint8(x_324, 6, x_319);
+lean_ctor_set_uint8(x_324, 7, x_320);
+lean_ctor_set_uint8(x_324, 8, x_321);
+x_325 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_325, 0, x_324);
+lean_ctor_set(x_325, 1, x_311);
+lean_ctor_set(x_325, 2, x_312);
+lean_ctor_set(x_325, 3, x_313);
+x_326 = 0;
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_325);
+x_327 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getKeyArgs(x_2, x_326, x_325, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_327) == 0)
+{
+lean_object* x_328; lean_object* x_329; 
+x_328 = lean_ctor_get(x_327, 0);
+lean_inc(x_328);
+x_329 = lean_ctor_get(x_328, 0);
+lean_inc(x_329);
+switch (lean_obj_tag(x_329)) {
+case 0:
+{
+lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; 
+x_330 = lean_ctor_get(x_327, 1);
+lean_inc(x_330);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_331 = x_327;
+} else {
+ lean_dec_ref(x_327);
+ x_331 = lean_box(0);
+}
+x_332 = lean_ctor_get(x_328, 1);
+lean_inc(x_332);
+lean_dec(x_328);
+lean_inc(x_1);
+x_333 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_334 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__1___rarg(x_1, x_329);
+lean_dec(x_329);
+if (lean_obj_tag(x_334) == 0)
+{
+lean_object* x_335; 
+lean_dec(x_332);
+lean_dec(x_325);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_331)) {
+ x_335 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_335 = x_331;
+}
+lean_ctor_set(x_335, 0, x_333);
+lean_ctor_set(x_335, 1, x_330);
+return x_335;
+}
+else
+{
+lean_object* x_336; lean_object* x_337; lean_object* x_338; 
+lean_dec(x_331);
+x_336 = lean_ctor_get(x_334, 0);
+lean_inc(x_336);
+lean_dec(x_334);
+x_337 = lean_unsigned_to_nat(0u);
+x_338 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_337, x_332, x_336, x_333, x_325, x_4, x_5, x_6, x_330);
+if (lean_obj_tag(x_338) == 0)
+{
+lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; 
+x_339 = lean_ctor_get(x_338, 0);
+lean_inc(x_339);
+x_340 = lean_ctor_get(x_338, 1);
+lean_inc(x_340);
+if (lean_is_exclusive(x_338)) {
+ lean_ctor_release(x_338, 0);
+ lean_ctor_release(x_338, 1);
+ x_341 = x_338;
+} else {
+ lean_dec_ref(x_338);
+ x_341 = lean_box(0);
+}
+if (lean_is_scalar(x_341)) {
+ x_342 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_342 = x_341;
+}
+lean_ctor_set(x_342, 0, x_339);
+lean_ctor_set(x_342, 1, x_340);
+return x_342;
+}
+else
+{
+lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; 
+x_343 = lean_ctor_get(x_338, 0);
+lean_inc(x_343);
+x_344 = lean_ctor_get(x_338, 1);
+lean_inc(x_344);
+if (lean_is_exclusive(x_338)) {
+ lean_ctor_release(x_338, 0);
+ lean_ctor_release(x_338, 1);
+ x_345 = x_338;
+} else {
+ lean_dec_ref(x_338);
+ x_345 = lean_box(0);
+}
+if (lean_is_scalar(x_345)) {
+ x_346 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_346 = x_345;
+}
+lean_ctor_set(x_346, 0, x_343);
+lean_ctor_set(x_346, 1, x_344);
+return x_346;
+}
+}
+}
+case 1:
+{
+lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; 
+x_347 = lean_ctor_get(x_327, 1);
+lean_inc(x_347);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_348 = x_327;
+} else {
+ lean_dec_ref(x_327);
+ x_348 = lean_box(0);
+}
+x_349 = lean_ctor_get(x_328, 1);
+lean_inc(x_349);
+lean_dec(x_328);
+lean_inc(x_1);
+x_350 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_351 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__4___rarg(x_1, x_329);
+lean_dec(x_329);
+if (lean_obj_tag(x_351) == 0)
+{
+lean_object* x_352; 
+lean_dec(x_349);
+lean_dec(x_325);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_348)) {
+ x_352 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_352 = x_348;
+}
+lean_ctor_set(x_352, 0, x_350);
+lean_ctor_set(x_352, 1, x_347);
+return x_352;
+}
+else
+{
+lean_object* x_353; lean_object* x_354; lean_object* x_355; 
+lean_dec(x_348);
+x_353 = lean_ctor_get(x_351, 0);
+lean_inc(x_353);
+lean_dec(x_351);
+x_354 = lean_unsigned_to_nat(0u);
+x_355 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_354, x_349, x_353, x_350, x_325, x_4, x_5, x_6, x_347);
+if (lean_obj_tag(x_355) == 0)
+{
+lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; 
+x_356 = lean_ctor_get(x_355, 0);
+lean_inc(x_356);
+x_357 = lean_ctor_get(x_355, 1);
+lean_inc(x_357);
+if (lean_is_exclusive(x_355)) {
+ lean_ctor_release(x_355, 0);
+ lean_ctor_release(x_355, 1);
+ x_358 = x_355;
+} else {
+ lean_dec_ref(x_355);
+ x_358 = lean_box(0);
+}
+if (lean_is_scalar(x_358)) {
+ x_359 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_359 = x_358;
+}
+lean_ctor_set(x_359, 0, x_356);
+lean_ctor_set(x_359, 1, x_357);
+return x_359;
+}
+else
+{
+lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; 
+x_360 = lean_ctor_get(x_355, 0);
+lean_inc(x_360);
+x_361 = lean_ctor_get(x_355, 1);
+lean_inc(x_361);
+if (lean_is_exclusive(x_355)) {
+ lean_ctor_release(x_355, 0);
+ lean_ctor_release(x_355, 1);
+ x_362 = x_355;
+} else {
+ lean_dec_ref(x_355);
+ x_362 = lean_box(0);
+}
+if (lean_is_scalar(x_362)) {
+ x_363 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_363 = x_362;
+}
+lean_ctor_set(x_363, 0, x_360);
+lean_ctor_set(x_363, 1, x_361);
+return x_363;
 }
 }
 }
 case 2:
 {
-lean_object* x_314; lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; 
-x_314 = lean_ctor_get(x_277, 1);
-lean_inc(x_314);
-if (lean_is_exclusive(x_277)) {
- lean_ctor_release(x_277, 0);
- lean_ctor_release(x_277, 1);
- x_315 = x_277;
+lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; 
+x_364 = lean_ctor_get(x_327, 1);
+lean_inc(x_364);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_365 = x_327;
 } else {
- lean_dec_ref(x_277);
- x_315 = lean_box(0);
+ lean_dec_ref(x_327);
+ x_365 = lean_box(0);
 }
-x_316 = lean_ctor_get(x_278, 1);
-lean_inc(x_316);
-lean_dec(x_278);
+x_366 = lean_ctor_get(x_328, 1);
+lean_inc(x_366);
+lean_dec(x_328);
 lean_inc(x_1);
-x_317 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_318 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg(x_1, x_279);
-lean_dec(x_279);
-if (lean_obj_tag(x_318) == 0)
+x_367 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_368 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg(x_1, x_329);
+lean_dec(x_329);
+if (lean_obj_tag(x_368) == 0)
 {
-lean_object* x_319; 
-lean_dec(x_316);
-lean_dec(x_275);
+lean_object* x_369; 
+lean_dec(x_366);
+lean_dec(x_325);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_315)) {
- x_319 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_365)) {
+ x_369 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_319 = x_315;
+ x_369 = x_365;
 }
-lean_ctor_set(x_319, 0, x_317);
-lean_ctor_set(x_319, 1, x_314);
-return x_319;
+lean_ctor_set(x_369, 0, x_367);
+lean_ctor_set(x_369, 1, x_364);
+return x_369;
 }
 else
 {
-lean_object* x_320; lean_object* x_321; lean_object* x_322; 
-lean_dec(x_315);
-x_320 = lean_ctor_get(x_318, 0);
-lean_inc(x_320);
-lean_dec(x_318);
-x_321 = lean_unsigned_to_nat(0u);
-x_322 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_321, x_316, x_320, x_317, x_275, x_4, x_5, x_6, x_314);
-if (lean_obj_tag(x_322) == 0)
+lean_object* x_370; lean_object* x_371; lean_object* x_372; 
+lean_dec(x_365);
+x_370 = lean_ctor_get(x_368, 0);
+lean_inc(x_370);
+lean_dec(x_368);
+x_371 = lean_unsigned_to_nat(0u);
+x_372 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_371, x_366, x_370, x_367, x_325, x_4, x_5, x_6, x_364);
+if (lean_obj_tag(x_372) == 0)
 {
-lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; 
-x_323 = lean_ctor_get(x_322, 0);
-lean_inc(x_323);
-x_324 = lean_ctor_get(x_322, 1);
-lean_inc(x_324);
-if (lean_is_exclusive(x_322)) {
- lean_ctor_release(x_322, 0);
- lean_ctor_release(x_322, 1);
- x_325 = x_322;
+lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; 
+x_373 = lean_ctor_get(x_372, 0);
+lean_inc(x_373);
+x_374 = lean_ctor_get(x_372, 1);
+lean_inc(x_374);
+if (lean_is_exclusive(x_372)) {
+ lean_ctor_release(x_372, 0);
+ lean_ctor_release(x_372, 1);
+ x_375 = x_372;
 } else {
- lean_dec_ref(x_322);
- x_325 = lean_box(0);
+ lean_dec_ref(x_372);
+ x_375 = lean_box(0);
 }
-if (lean_is_scalar(x_325)) {
- x_326 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_375)) {
+ x_376 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_326 = x_325;
+ x_376 = x_375;
 }
-lean_ctor_set(x_326, 0, x_323);
-lean_ctor_set(x_326, 1, x_324);
-return x_326;
+lean_ctor_set(x_376, 0, x_373);
+lean_ctor_set(x_376, 1, x_374);
+return x_376;
 }
 else
 {
-lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; 
-x_327 = lean_ctor_get(x_322, 0);
-lean_inc(x_327);
-x_328 = lean_ctor_get(x_322, 1);
-lean_inc(x_328);
-if (lean_is_exclusive(x_322)) {
- lean_ctor_release(x_322, 0);
- lean_ctor_release(x_322, 1);
- x_329 = x_322;
+lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; 
+x_377 = lean_ctor_get(x_372, 0);
+lean_inc(x_377);
+x_378 = lean_ctor_get(x_372, 1);
+lean_inc(x_378);
+if (lean_is_exclusive(x_372)) {
+ lean_ctor_release(x_372, 0);
+ lean_ctor_release(x_372, 1);
+ x_379 = x_372;
 } else {
- lean_dec_ref(x_322);
- x_329 = lean_box(0);
+ lean_dec_ref(x_372);
+ x_379 = lean_box(0);
 }
-if (lean_is_scalar(x_329)) {
- x_330 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_379)) {
+ x_380 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_330 = x_329;
+ x_380 = x_379;
 }
-lean_ctor_set(x_330, 0, x_327);
-lean_ctor_set(x_330, 1, x_328);
-return x_330;
+lean_ctor_set(x_380, 0, x_377);
+lean_ctor_set(x_380, 1, x_378);
+return x_380;
 }
 }
 }
 case 3:
 {
-lean_object* x_331; lean_object* x_332; lean_object* x_333; 
-lean_dec(x_278);
-x_331 = lean_ctor_get(x_277, 1);
-lean_inc(x_331);
-lean_dec(x_277);
-x_332 = l_Array_empty___closed__1;
-x_333 = l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg(x_1, x_332, x_275, x_4, x_5, x_6, x_331);
+lean_object* x_381; lean_object* x_382; lean_object* x_383; 
+lean_dec(x_328);
+x_381 = lean_ctor_get(x_327, 1);
+lean_inc(x_381);
+lean_dec(x_327);
+x_382 = l_Array_empty___closed__1;
+x_383 = l_Std_PersistentHashMap_foldlM___at_Lean_Meta_DiscrTree_getUnify___spec__10___rarg(x_1, x_382, x_325, x_4, x_5, x_6, x_381);
 lean_dec(x_1);
-if (lean_obj_tag(x_333) == 0)
+if (lean_obj_tag(x_383) == 0)
 {
-lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; 
-x_334 = lean_ctor_get(x_333, 0);
-lean_inc(x_334);
-x_335 = lean_ctor_get(x_333, 1);
-lean_inc(x_335);
-if (lean_is_exclusive(x_333)) {
- lean_ctor_release(x_333, 0);
- lean_ctor_release(x_333, 1);
- x_336 = x_333;
+lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; 
+x_384 = lean_ctor_get(x_383, 0);
+lean_inc(x_384);
+x_385 = lean_ctor_get(x_383, 1);
+lean_inc(x_385);
+if (lean_is_exclusive(x_383)) {
+ lean_ctor_release(x_383, 0);
+ lean_ctor_release(x_383, 1);
+ x_386 = x_383;
 } else {
- lean_dec_ref(x_333);
- x_336 = lean_box(0);
+ lean_dec_ref(x_383);
+ x_386 = lean_box(0);
 }
-if (lean_is_scalar(x_336)) {
- x_337 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_386)) {
+ x_387 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_337 = x_336;
+ x_387 = x_386;
 }
-lean_ctor_set(x_337, 0, x_334);
-lean_ctor_set(x_337, 1, x_335);
-return x_337;
+lean_ctor_set(x_387, 0, x_384);
+lean_ctor_set(x_387, 1, x_385);
+return x_387;
 }
 else
 {
-lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; 
-x_338 = lean_ctor_get(x_333, 0);
-lean_inc(x_338);
-x_339 = lean_ctor_get(x_333, 1);
-lean_inc(x_339);
-if (lean_is_exclusive(x_333)) {
- lean_ctor_release(x_333, 0);
- lean_ctor_release(x_333, 1);
- x_340 = x_333;
+lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; 
+x_388 = lean_ctor_get(x_383, 0);
+lean_inc(x_388);
+x_389 = lean_ctor_get(x_383, 1);
+lean_inc(x_389);
+if (lean_is_exclusive(x_383)) {
+ lean_ctor_release(x_383, 0);
+ lean_ctor_release(x_383, 1);
+ x_390 = x_383;
 } else {
- lean_dec_ref(x_333);
- x_340 = lean_box(0);
+ lean_dec_ref(x_383);
+ x_390 = lean_box(0);
 }
-if (lean_is_scalar(x_340)) {
- x_341 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_390)) {
+ x_391 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_341 = x_340;
+ x_391 = x_390;
+}
+lean_ctor_set(x_391, 0, x_388);
+lean_ctor_set(x_391, 1, x_389);
+return x_391;
+}
+}
+case 4:
+{
+lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; 
+x_392 = lean_ctor_get(x_327, 1);
+lean_inc(x_392);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_393 = x_327;
+} else {
+ lean_dec_ref(x_327);
+ x_393 = lean_box(0);
+}
+x_394 = lean_ctor_get(x_328, 1);
+lean_inc(x_394);
+lean_dec(x_328);
+lean_inc(x_1);
+x_395 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_396 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg(x_1, x_329);
+if (lean_obj_tag(x_396) == 0)
+{
+lean_object* x_397; 
+lean_dec(x_394);
+lean_dec(x_325);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+if (lean_is_scalar(x_393)) {
+ x_397 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_397 = x_393;
+}
+lean_ctor_set(x_397, 0, x_395);
+lean_ctor_set(x_397, 1, x_392);
+return x_397;
+}
+else
+{
+lean_object* x_398; lean_object* x_399; lean_object* x_400; 
+lean_dec(x_393);
+x_398 = lean_ctor_get(x_396, 0);
+lean_inc(x_398);
+lean_dec(x_396);
+x_399 = lean_unsigned_to_nat(0u);
+x_400 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_399, x_394, x_398, x_395, x_325, x_4, x_5, x_6, x_392);
+if (lean_obj_tag(x_400) == 0)
+{
+lean_object* x_401; lean_object* x_402; lean_object* x_403; lean_object* x_404; 
+x_401 = lean_ctor_get(x_400, 0);
+lean_inc(x_401);
+x_402 = lean_ctor_get(x_400, 1);
+lean_inc(x_402);
+if (lean_is_exclusive(x_400)) {
+ lean_ctor_release(x_400, 0);
+ lean_ctor_release(x_400, 1);
+ x_403 = x_400;
+} else {
+ lean_dec_ref(x_400);
+ x_403 = lean_box(0);
+}
+if (lean_is_scalar(x_403)) {
+ x_404 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_404 = x_403;
+}
+lean_ctor_set(x_404, 0, x_401);
+lean_ctor_set(x_404, 1, x_402);
+return x_404;
+}
+else
+{
+lean_object* x_405; lean_object* x_406; lean_object* x_407; lean_object* x_408; 
+x_405 = lean_ctor_get(x_400, 0);
+lean_inc(x_405);
+x_406 = lean_ctor_get(x_400, 1);
+lean_inc(x_406);
+if (lean_is_exclusive(x_400)) {
+ lean_ctor_release(x_400, 0);
+ lean_ctor_release(x_400, 1);
+ x_407 = x_400;
+} else {
+ lean_dec_ref(x_400);
+ x_407 = lean_box(0);
+}
+if (lean_is_scalar(x_407)) {
+ x_408 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_408 = x_407;
+}
+lean_ctor_set(x_408, 0, x_405);
+lean_ctor_set(x_408, 1, x_406);
+return x_408;
 }
-lean_ctor_set(x_341, 0, x_338);
-lean_ctor_set(x_341, 1, x_339);
-return x_341;
 }
 }
 default: 
 {
-lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; 
-x_342 = lean_ctor_get(x_277, 1);
-lean_inc(x_342);
-if (lean_is_exclusive(x_277)) {
- lean_ctor_release(x_277, 0);
- lean_ctor_release(x_277, 1);
- x_343 = x_277;
+lean_object* x_409; lean_object* x_410; lean_object* x_411; lean_object* x_412; lean_object* x_413; 
+x_409 = lean_ctor_get(x_327, 1);
+lean_inc(x_409);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_410 = x_327;
 } else {
- lean_dec_ref(x_277);
- x_343 = lean_box(0);
+ lean_dec_ref(x_327);
+ x_410 = lean_box(0);
 }
-x_344 = lean_ctor_get(x_278, 1);
-lean_inc(x_344);
-lean_dec(x_278);
+x_411 = lean_ctor_get(x_328, 1);
+lean_inc(x_411);
+lean_dec(x_328);
 lean_inc(x_1);
-x_345 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
-x_346 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__14___rarg(x_1, x_279);
-if (lean_obj_tag(x_346) == 0)
+x_412 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___rarg(x_1);
+x_413 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(x_1, x_329);
+if (lean_obj_tag(x_413) == 0)
 {
-lean_object* x_347; 
-lean_dec(x_344);
-lean_dec(x_275);
+lean_object* x_414; 
+lean_dec(x_411);
+lean_dec(x_325);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-if (lean_is_scalar(x_343)) {
- x_347 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_410)) {
+ x_414 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_347 = x_343;
+ x_414 = x_410;
 }
-lean_ctor_set(x_347, 0, x_345);
-lean_ctor_set(x_347, 1, x_342);
-return x_347;
+lean_ctor_set(x_414, 0, x_412);
+lean_ctor_set(x_414, 1, x_409);
+return x_414;
 }
 else
 {
-lean_object* x_348; lean_object* x_349; lean_object* x_350; 
-lean_dec(x_343);
-x_348 = lean_ctor_get(x_346, 0);
-lean_inc(x_348);
-lean_dec(x_346);
-x_349 = lean_unsigned_to_nat(0u);
-x_350 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_349, x_344, x_348, x_345, x_275, x_4, x_5, x_6, x_342);
-if (lean_obj_tag(x_350) == 0)
+lean_object* x_415; lean_object* x_416; lean_object* x_417; 
+lean_dec(x_410);
+x_415 = lean_ctor_get(x_413, 0);
+lean_inc(x_415);
+lean_dec(x_413);
+x_416 = lean_unsigned_to_nat(0u);
+x_417 = l_Lean_Meta_DiscrTree_getUnify_process___rarg(x_416, x_411, x_415, x_412, x_325, x_4, x_5, x_6, x_409);
+if (lean_obj_tag(x_417) == 0)
 {
-lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; 
-x_351 = lean_ctor_get(x_350, 0);
-lean_inc(x_351);
-x_352 = lean_ctor_get(x_350, 1);
-lean_inc(x_352);
-if (lean_is_exclusive(x_350)) {
- lean_ctor_release(x_350, 0);
- lean_ctor_release(x_350, 1);
- x_353 = x_350;
+lean_object* x_418; lean_object* x_419; lean_object* x_420; lean_object* x_421; 
+x_418 = lean_ctor_get(x_417, 0);
+lean_inc(x_418);
+x_419 = lean_ctor_get(x_417, 1);
+lean_inc(x_419);
+if (lean_is_exclusive(x_417)) {
+ lean_ctor_release(x_417, 0);
+ lean_ctor_release(x_417, 1);
+ x_420 = x_417;
 } else {
- lean_dec_ref(x_350);
- x_353 = lean_box(0);
+ lean_dec_ref(x_417);
+ x_420 = lean_box(0);
 }
-if (lean_is_scalar(x_353)) {
- x_354 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_420)) {
+ x_421 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_354 = x_353;
+ x_421 = x_420;
 }
-lean_ctor_set(x_354, 0, x_351);
-lean_ctor_set(x_354, 1, x_352);
-return x_354;
+lean_ctor_set(x_421, 0, x_418);
+lean_ctor_set(x_421, 1, x_419);
+return x_421;
 }
 else
 {
-lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; 
-x_355 = lean_ctor_get(x_350, 0);
-lean_inc(x_355);
-x_356 = lean_ctor_get(x_350, 1);
-lean_inc(x_356);
-if (lean_is_exclusive(x_350)) {
- lean_ctor_release(x_350, 0);
- lean_ctor_release(x_350, 1);
- x_357 = x_350;
+lean_object* x_422; lean_object* x_423; lean_object* x_424; lean_object* x_425; 
+x_422 = lean_ctor_get(x_417, 0);
+lean_inc(x_422);
+x_423 = lean_ctor_get(x_417, 1);
+lean_inc(x_423);
+if (lean_is_exclusive(x_417)) {
+ lean_ctor_release(x_417, 0);
+ lean_ctor_release(x_417, 1);
+ x_424 = x_417;
 } else {
- lean_dec_ref(x_350);
- x_357 = lean_box(0);
+ lean_dec_ref(x_417);
+ x_424 = lean_box(0);
 }
-if (lean_is_scalar(x_357)) {
- x_358 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_424)) {
+ x_425 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_358 = x_357;
+ x_425 = x_424;
 }
-lean_ctor_set(x_358, 0, x_355);
-lean_ctor_set(x_358, 1, x_356);
-return x_358;
+lean_ctor_set(x_425, 0, x_422);
+lean_ctor_set(x_425, 1, x_423);
+return x_425;
 }
 }
 }
@@ -18450,32 +20870,32 @@ return x_358;
 }
 else
 {
-lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; 
-lean_dec(x_275);
+lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; 
+lean_dec(x_325);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
-x_359 = lean_ctor_get(x_277, 0);
-lean_inc(x_359);
-x_360 = lean_ctor_get(x_277, 1);
-lean_inc(x_360);
-if (lean_is_exclusive(x_277)) {
- lean_ctor_release(x_277, 0);
- lean_ctor_release(x_277, 1);
- x_361 = x_277;
+x_426 = lean_ctor_get(x_327, 0);
+lean_inc(x_426);
+x_427 = lean_ctor_get(x_327, 1);
+lean_inc(x_427);
+if (lean_is_exclusive(x_327)) {
+ lean_ctor_release(x_327, 0);
+ lean_ctor_release(x_327, 1);
+ x_428 = x_327;
 } else {
- lean_dec_ref(x_277);
- x_361 = lean_box(0);
+ lean_dec_ref(x_327);
+ x_428 = lean_box(0);
 }
-if (lean_is_scalar(x_361)) {
- x_362 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_428)) {
+ x_429 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_362 = x_361;
+ x_429 = x_428;
 }
-lean_ctor_set(x_362, 0, x_359);
-lean_ctor_set(x_362, 1, x_360);
-return x_362;
+lean_ctor_set(x_429, 0, x_426);
+lean_ctor_set(x_429, 1, x_427);
+return x_429;
 }
 }
 }
@@ -18662,6 +21082,37 @@ lean_dec(x_2);
 return x_3;
 }
 }
+lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__19___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; lean_object* x_5; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__18___rarg(x_1, x_4, x_3);
+lean_dec(x_3);
+return x_5;
+}
+}
+lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__17___rarg(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
 lean_object* initialize_Init(lean_object*);
 lean_object* initialize_Lean_Meta_Basic(lean_object*);
 lean_object* initialize_Lean_Meta_FunInfo(lean_object*);
@@ -18691,6 +21142,8 @@ l_Lean_Meta_DiscrTree_Key_format___closed__2 = _init_l_Lean_Meta_DiscrTree_Key_f
 lean_mark_persistent(l_Lean_Meta_DiscrTree_Key_format___closed__2);
 l_Lean_Meta_DiscrTree_Key_format___closed__3 = _init_l_Lean_Meta_DiscrTree_Key_format___closed__3();
 lean_mark_persistent(l_Lean_Meta_DiscrTree_Key_format___closed__3);
+l_Lean_Meta_DiscrTree_Key_format___closed__4 = _init_l_Lean_Meta_DiscrTree_Key_format___closed__4();
+lean_mark_persistent(l_Lean_Meta_DiscrTree_Key_format___closed__4);
 l_Lean_Meta_DiscrTree_instToFormatKey___closed__1 = _init_l_Lean_Meta_DiscrTree_instToFormatKey___closed__1();
 lean_mark_persistent(l_Lean_Meta_DiscrTree_instToFormatKey___closed__1);
 l_Lean_Meta_DiscrTree_instToFormatKey = _init_l_Lean_Meta_DiscrTree_instToFormatKey();
diff --git a/stage0/stdlib/Lean/Meta/DiscrTreeTypes.c b/stage0/stdlib/Lean/Meta/DiscrTreeTypes.c
index b359657ef2..d22e7acf5b 100644
--- a/stage0/stdlib/Lean/Meta/DiscrTreeTypes.c
+++ b/stage0/stdlib/Lean/Meta/DiscrTreeTypes.c
@@ -20,18 +20,18 @@ lean_object* l_Lean_Meta_DiscrTree_instInhabitedKey___closed__1;
 lean_object* l_Lean_Meta_DiscrTree_instHashableKey;
 extern lean_object* l_Std_PersistentHashMap_root___default___closed__2;
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34__match__1(lean_object*);
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35__match__1(lean_object*);
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_DiscrTree_Key_hash_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_Key_hash_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_root___default___closed__1;
 size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instBEqKey;
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34__match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35__match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Lean_Expr_0__Lean_beqLiteral____x40_Lean_Expr___hyg_14_(lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instHashableKey___closed__1;
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34____boxed(lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35____boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_instInhabitedKey;
 size_t l_Lean_Literal_hash(lean_object*);
 size_t lean_usize_mix_hash(size_t, size_t);
@@ -57,155 +57,183 @@ x_1 = l_Lean_Meta_DiscrTree_instInhabitedKey___closed__1;
 return x_1;
 }
 }
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34__match__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_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35__match__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_object* x_9) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 if (lean_obj_tag(x_2) == 0)
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-lean_dec(x_8);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_9);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-lean_dec(x_1);
-x_11 = lean_ctor_get(x_2, 0);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_2, 1);
+lean_dec(x_1);
+x_12 = lean_ctor_get(x_2, 0);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_2, 1);
+lean_inc(x_13);
 lean_dec(x_2);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 else
 {
-lean_object* x_14; 
+lean_object* x_15; 
 lean_dec(x_3);
-x_14 = lean_apply_2(x_8, x_1, x_2);
-return x_14;
+x_15 = lean_apply_2(x_9, x_1, x_2);
+return x_15;
 }
 }
 case 1:
 {
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 if (lean_obj_tag(x_2) == 1)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-lean_dec(x_8);
-x_15 = lean_ctor_get(x_1, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_1, 1);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+lean_dec(x_9);
+x_16 = lean_ctor_get(x_1, 0);
 lean_inc(x_16);
-lean_dec(x_1);
-x_17 = lean_ctor_get(x_2, 0);
+x_17 = lean_ctor_get(x_1, 1);
 lean_inc(x_17);
-x_18 = lean_ctor_get(x_2, 1);
+lean_dec(x_1);
+x_18 = lean_ctor_get(x_2, 0);
 lean_inc(x_18);
+x_19 = lean_ctor_get(x_2, 1);
+lean_inc(x_19);
 lean_dec(x_2);
-x_19 = lean_apply_4(x_4, x_15, x_16, x_17, x_18);
-return x_19;
+x_20 = lean_apply_4(x_4, x_16, x_17, x_18, x_19);
+return x_20;
 }
 else
 {
-lean_object* x_20; 
+lean_object* x_21; 
 lean_dec(x_4);
-x_20 = lean_apply_2(x_8, x_1, x_2);
-return x_20;
+x_21 = lean_apply_2(x_9, x_1, x_2);
+return x_21;
 }
 }
 case 2:
 {
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 if (lean_obj_tag(x_2) == 2)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-lean_dec(x_8);
-x_21 = lean_ctor_get(x_1, 0);
-lean_inc(x_21);
-lean_dec(x_1);
-x_22 = lean_ctor_get(x_2, 0);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_dec(x_9);
+x_22 = lean_ctor_get(x_1, 0);
 lean_inc(x_22);
+lean_dec(x_1);
+x_23 = lean_ctor_get(x_2, 0);
+lean_inc(x_23);
 lean_dec(x_2);
-x_23 = lean_apply_2(x_5, x_21, x_22);
-return x_23;
+x_24 = lean_apply_2(x_5, x_22, x_23);
+return x_24;
 }
 else
 {
-lean_object* x_24; 
+lean_object* x_25; 
 lean_dec(x_5);
-x_24 = lean_apply_2(x_8, x_1, x_2);
-return x_24;
+x_25 = lean_apply_2(x_9, x_1, x_2);
+return x_25;
 }
 }
 case 3:
 {
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 if (lean_obj_tag(x_2) == 3)
 {
-lean_object* x_25; lean_object* x_26; 
-lean_dec(x_8);
-x_25 = lean_box(0);
-x_26 = lean_apply_1(x_6, x_25);
-return x_26;
+lean_object* x_26; lean_object* x_27; 
+lean_dec(x_9);
+x_26 = lean_box(0);
+x_27 = lean_apply_1(x_6, x_26);
+return x_27;
 }
 else
 {
-lean_object* x_27; 
+lean_object* x_28; 
 lean_dec(x_6);
-x_27 = lean_apply_2(x_8, x_1, x_2);
-return x_27;
+x_28 = lean_apply_2(x_9, x_1, x_2);
+return x_28;
 }
 }
-default: 
+case 4:
 {
+lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 if (lean_obj_tag(x_2) == 4)
 {
-lean_object* x_28; lean_object* x_29; 
-lean_dec(x_8);
-x_28 = lean_box(0);
-x_29 = lean_apply_1(x_7, x_28);
-return x_29;
+lean_object* x_29; lean_object* x_30; 
+lean_dec(x_9);
+x_29 = lean_box(0);
+x_30 = lean_apply_1(x_7, x_29);
+return x_30;
 }
 else
 {
-lean_object* x_30; 
+lean_object* x_31; 
 lean_dec(x_7);
-x_30 = lean_apply_2(x_8, x_1, x_2);
-return x_30;
+x_31 = lean_apply_2(x_9, x_1, x_2);
+return x_31;
+}
+}
+default: 
+{
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+if (lean_obj_tag(x_2) == 5)
+{
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_9);
+x_32 = lean_box(0);
+x_33 = lean_apply_1(x_8, x_32);
+return x_33;
+}
+else
+{
+lean_object* x_34; 
+lean_dec(x_8);
+x_34 = lean_apply_2(x_9, x_1, x_2);
+return x_34;
 }
 }
 }
 }
 }
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34__match__1(lean_object* x_1) {
+lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35__match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34__match__1___rarg), 8, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35__match__1___rarg), 9, 0);
 return x_2;
 }
 }
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object* x_1, lean_object* x_2) {
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
@@ -301,7 +329,7 @@ x_24 = 0;
 return x_24;
 }
 }
-default: 
+case 4:
 {
 if (lean_obj_tag(x_2) == 4)
 {
@@ -316,14 +344,29 @@ x_26 = 0;
 return x_26;
 }
 }
+default: 
+{
+if (lean_obj_tag(x_2) == 5)
+{
+uint8_t x_27; 
+x_27 = 1;
+return x_27;
+}
+else
+{
+uint8_t x_28; 
+x_28 = 0;
+return x_28;
 }
 }
 }
-lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34____boxed(lean_object* x_1, lean_object* x_2) {
+}
+}
+lean_object* l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35____boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_1, x_2);
+x_3 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 x_4 = lean_box(x_3);
@@ -334,7 +377,7 @@ static lean_object* _init_l_Lean_Meta_DiscrTree_instBEqKey___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34____boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35____boxed), 2, 0);
 return x_1;
 }
 }
@@ -346,74 +389,91 @@ x_1 = l_Lean_Meta_DiscrTree_instBEqKey___closed__1;
 return x_1;
 }
 }
-lean_object* l_Lean_Meta_DiscrTree_Key_hash_match__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* l_Lean_Meta_DiscrTree_Key_hash_match__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) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
 case 0:
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_object* x_8; 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);
-x_7 = lean_ctor_get(x_1, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_1, 1);
+x_8 = lean_ctor_get(x_1, 0);
 lean_inc(x_8);
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
 lean_dec(x_1);
-x_9 = lean_apply_2(x_2, x_7, x_8);
-return x_9;
+x_10 = lean_apply_2(x_2, x_8, x_9);
+return x_10;
 }
 case 1:
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_2);
-x_10 = lean_ctor_get(x_1, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 1);
+x_11 = lean_ctor_get(x_1, 0);
 lean_inc(x_11);
+x_12 = lean_ctor_get(x_1, 1);
+lean_inc(x_12);
 lean_dec(x_1);
-x_12 = lean_apply_2(x_3, x_10, x_11);
-return x_12;
+x_13 = lean_apply_2(x_3, x_11, x_12);
+return x_13;
 }
 case 2:
 {
-lean_object* x_13; lean_object* x_14; 
+lean_object* x_14; lean_object* x_15; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-x_13 = lean_ctor_get(x_1, 0);
-lean_inc(x_13);
+x_14 = lean_ctor_get(x_1, 0);
+lean_inc(x_14);
 lean_dec(x_1);
-x_14 = lean_apply_1(x_4, x_13);
-return x_14;
+x_15 = lean_apply_1(x_4, x_14);
+return x_15;
 }
 case 3:
 {
-lean_object* x_15; lean_object* x_16; 
+lean_object* x_16; lean_object* x_17; 
+lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_15 = lean_box(0);
-x_16 = lean_apply_1(x_5, x_15);
-return x_16;
+x_16 = lean_box(0);
+x_17 = lean_apply_1(x_5, x_16);
+return x_17;
 }
-default: 
+case 4:
 {
-lean_object* x_17; lean_object* x_18; 
+lean_object* x_18; lean_object* x_19; 
+lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_17 = lean_box(0);
-x_18 = lean_apply_1(x_6, x_17);
-return x_18;
+x_18 = lean_box(0);
+x_19 = lean_apply_1(x_6, x_18);
+return x_19;
+}
+default: 
+{
+lean_object* x_20; lean_object* x_21; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_20 = lean_box(0);
+x_21 = lean_apply_1(x_7, x_20);
+return x_21;
 }
 }
 }
@@ -422,7 +482,7 @@ lean_object* l_Lean_Meta_DiscrTree_Key_hash_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_hash_match__1___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_DiscrTree_Key_hash_match__1___rarg), 7, 0);
 return x_2;
 }
 }
@@ -469,12 +529,18 @@ size_t x_20;
 x_20 = 7883;
 return x_20;
 }
-default: 
+case 4:
 {
 size_t x_21; 
 x_21 = 2411;
 return x_21;
 }
+default: 
+{
+size_t x_22; 
+x_22 = 17;
+return x_22;
+}
 }
 }
 }
diff --git a/stage0/stdlib/Lean/Meta/Instances.c b/stage0/stdlib/Lean/Meta/Instances.c
index 836a89583e..8933977c9f 100644
--- a/stage0/stdlib/Lean/Meta/Instances.c
+++ b/stage0/stdlib/Lean/Meta/Instances.c
@@ -97,7 +97,7 @@ extern lean_object* l_Lean_ScopedEnvExtension_instInhabitedDescr___rarg___closed
 extern lean_object* l_Lean_throwUnknownConstant___rarg___closed__2;
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Instances___hyg_104____closed__4;
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerTagAttribute___closed__5;
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_addInstanceEntry___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instInhabitedInstances___closed__1;
@@ -517,7 +517,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -567,7 +567,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -710,7 +710,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_17);
+x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -799,7 +799,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_19);
+x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -833,7 +833,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_26);
+x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -954,7 +954,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_60);
+x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Apply.c b/stage0/stdlib/Lean/Meta/Tactic/Apply.c
index 4a08e5a7ca..a8bc91e6ab 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Apply.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Apply.c
@@ -19,6 +19,7 @@ lean_object* l_Lean_Meta_withMVarContext___at_Lean_Meta_admit___spec__1___rarg(l
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l_Lean_FindMVar_main___at___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_dependsOnOthers___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_getExpectedNumArgsAux___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Array_split___rarg___closed__1;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
@@ -65,7 +66,6 @@ lean_object* l_Lean_FindMVar_visit(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_FindMVar_main___at___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_dependsOnOthers___spec__1___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_getExpectedNumArgs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3;
 lean_object* l_Lean_Meta_apply___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_apply_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_List_forM___at_Lean_Meta_apply___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1808,9 +1808,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Array_empty___closed__1;
-x_2 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_2, 0, x_1);
-lean_ctor_set(x_2, 1, x_1);
+x_2 = lean_array_to_list(lean_box(0), x_1);
 return x_2;
 }
 }
@@ -1818,16 +1816,7 @@ static lean_object* _init_l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorde
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_empty___closed__1;
-x_2 = lean_array_to_list(lean_box(0), x_1);
-return x_2;
-}
-}
-static lean_object* _init_l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_1 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_2 = l_List_append___rarg(x_1, x_1);
 return x_2;
 }
@@ -1847,7 +1836,7 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_10 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3;
+x_10 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
 x_11 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_11, 0, x_10);
 lean_ctor_set(x_11, 1, x_6);
@@ -1865,7 +1854,7 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_13 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3;
+x_13 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
 x_14 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_14, 0, x_13);
 lean_ctor_set(x_14, 1, x_6);
@@ -1877,7 +1866,7 @@ size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18;
 x_15 = 0;
 x_16 = lean_usize_of_nat(x_7);
 lean_dec(x_7);
-x_17 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
+x_17 = l_Array_split___rarg___closed__1;
 x_18 = l_Array_foldlMUnsafe_fold___at___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___spec__1(x_1, x_1, x_15, x_16, x_17, x_2, x_3, x_4, x_5, x_6);
 if (lean_obj_tag(x_18) == 0)
 {
@@ -2284,7 +2273,7 @@ if (x_27 == 0)
 lean_object* x_28; lean_object* x_29; lean_object* x_30; 
 lean_dec(x_25);
 lean_dec(x_20);
-x_28 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_28 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_29 = l_List_append___rarg(x_23, x_28);
 lean_inc(x_29);
 x_30 = l_List_forM___at_Lean_Meta_apply___spec__2(x_29, x_7, x_8, x_9, x_10, x_24);
@@ -2349,7 +2338,7 @@ if (x_39 == 0)
 lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 lean_dec(x_25);
 lean_dec(x_20);
-x_40 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_40 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_41 = l_List_append___rarg(x_23, x_40);
 lean_inc(x_41);
 x_42 = l_List_forM___at_Lean_Meta_apply___spec__2(x_41, x_7, x_8, x_9, x_10, x_24);
@@ -3117,8 +3106,6 @@ l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___close
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1);
 l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2 = _init_l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2);
-l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3 = _init_l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__3);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Rewrite.c b/stage0/stdlib/Lean/Meta/Tactic/Rewrite.c
index 99f5696a6d..d0f90589d6 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Rewrite.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Rewrite.c
@@ -69,13 +69,13 @@ lean_object* l_Lean_Meta_matchEq_x3f(lean_object*, lean_object*, lean_object*, l
 lean_object* l_List_map___at_Lean_Meta_rewrite___spec__1(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_apply___spec__4(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_throwTacticEx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
 uint8_t l_Lean_Expr_isMVar(lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_rewrite___lambda__4___closed__4;
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_rewrite___lambda__2___closed__5;
 lean_object* l_Lean_Meta_rewrite_match__3(lean_object*);
+extern lean_object* l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 lean_object* l_Lean_Meta_rewrite___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*);
 lean_object* l_Lean_Meta_rewrite_match__4(lean_object*);
 lean_object* l_Lean_Meta_rewrite___lambda__4___closed__3;
@@ -282,7 +282,7 @@ static lean_object* _init_l_Lean_Meta_rewrite___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__2;
+x_1 = l___private_Lean_Meta_Tactic_Apply_0__Lean_Meta_reorderNonDependentFirst___closed__1;
 x_2 = l_List_map___at_Lean_Meta_rewrite___spec__1(x_1);
 return x_2;
 }
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpAll.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpAll.c
index f85cb98cee..959e54841c 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpAll.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpAll.c
@@ -17,6 +17,7 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Meta_Tactic_Simp_SimpA
 lean_object* l_Lean_Meta_simpTarget(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_SimpAll_main___spec__2___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_withMVarContext___at_Lean_Meta_admit___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
@@ -27,10 +28,13 @@ lean_object* l_Std_Range_forIn_loop___at___private_Lean_Meta_Tactic_Simp_SimpAll
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpStep(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_simpAll___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_simpAll___lambda__2___boxed(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*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop_match__3___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_ReaderT_bind___at_Lean_Meta_instMonadLCtxMetaM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_initEntries___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_initEntries(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpAll_instInhabitedEntry___closed__1;
@@ -54,12 +58,14 @@ lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_PersistentHashMap_contains___at_Lean_Meta_SimpLemmas_isDeclToUnfold___spec__1(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_addSimpLemmaEntry_updateLemmaNames___spec__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
-lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpAll_main_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_simpAll___closed__2;
 lean_object* l_Lean_Meta_SimpAll_main_match__1(lean_object*);
+lean_object* l_Lean_Meta_simpAll___closed__1;
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_eraseCore___at___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_transform___rarg___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_Meta_assertHypotheses(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop_match__2(lean_object*);
@@ -90,6 +96,7 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_SimpAll_main___spec__1(size_t
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_getSimpLemmas___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_findSomeM_x3f___rarg___closed__1;
+lean_object* l_Lean_Meta_simpAll___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_eraseCore___at___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___spec__1___boxed(lean_object*, lean_object*, 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_Meta_SimpAll_instInhabitedEntry___closed__1() {
@@ -3779,90 +3786,147 @@ x_6 = l_Array_mapMUnsafe_map___at_Lean_Meta_SimpAll_main___spec__2(x_4, x_5, x_3
 return x_6;
 }
 }
+lean_object* l_Lean_Meta_simpAll___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_inc(x_5);
+lean_inc(x_1);
+x_7 = l_Lean_Meta_SimpAll_main(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_12; uint8_t x_13; 
+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_st_ref_get(x_5, x_9);
+lean_dec(x_5);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_st_ref_get(x_1, x_11);
+lean_dec(x_1);
+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 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_8);
+lean_ctor_set(x_15, 1, 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 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_8);
+lean_ctor_set(x_18, 1, 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_5);
+lean_dec(x_1);
+x_20 = !lean_is_exclusive(x_7);
+if (x_20 == 0)
+{
+return x_7;
+}
+else
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_7, 0);
+x_22 = lean_ctor_get(x_7, 1);
+lean_inc(x_22);
+lean_inc(x_21);
+lean_dec(x_7);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
+}
+}
+}
+}
+lean_object* l_Lean_Meta_simpAll___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) {
+_start:
+{
+lean_object* x_7; lean_object* x_8; 
+x_7 = lean_ctor_get(x_1, 0);
+lean_inc(x_7);
+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;
+}
+}
+static lean_object* _init_l_Lean_Meta_simpAll___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_simpAll___lambda__1), 6, 0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_simpAll___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_simpAll___lambda__2___boxed), 6, 0);
+return x_1;
+}
+}
 lean_object* l_Lean_Meta_simpAll(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; lean_object* x_16; 
 x_8 = 0;
 x_9 = l_Array_empty___closed__1;
+lean_inc(x_1);
 x_10 = lean_alloc_ctor(0, 3, 1);
 lean_ctor_set(x_10, 0, x_1);
 lean_ctor_set(x_10, 1, x_9);
 lean_ctor_set(x_10, 2, x_2);
 lean_ctor_set_uint8(x_10, sizeof(void*)*3, x_8);
-x_11 = lean_st_ref_get(x_6, x_7);
-x_12 = lean_ctor_get(x_11, 1);
-lean_inc(x_12);
-lean_dec(x_11);
-x_13 = lean_st_mk_ref(x_10, 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);
-lean_inc(x_6);
-lean_inc(x_14);
-x_16 = l_Lean_Meta_SimpAll_main(x_14, x_3, x_4, x_5, x_6, x_15);
-if (lean_obj_tag(x_16) == 0)
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
-lean_inc(x_18);
-lean_dec(x_16);
-x_19 = lean_st_ref_get(x_6, x_18);
-lean_dec(x_6);
-x_20 = lean_ctor_get(x_19, 1);
-lean_inc(x_20);
-lean_dec(x_19);
-x_21 = lean_st_ref_get(x_14, x_20);
-lean_dec(x_14);
-x_22 = !lean_is_exclusive(x_21);
-if (x_22 == 0)
-{
-lean_object* x_23; 
-x_23 = lean_ctor_get(x_21, 0);
-lean_dec(x_23);
-lean_ctor_set(x_21, 0, x_17);
-return x_21;
-}
-else
-{
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_21, 1);
-lean_inc(x_24);
-lean_dec(x_21);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_17);
-lean_ctor_set(x_25, 1, x_24);
-return x_25;
-}
-}
-else
-{
-uint8_t x_26; 
-lean_dec(x_14);
-lean_dec(x_6);
-x_26 = !lean_is_exclusive(x_16);
-if (x_26 == 0)
-{
+x_11 = lean_alloc_closure((void*)(l_Lean_Meta_transform___rarg___lambda__3___boxed), 6, 1);
+lean_closure_set(x_11, 0, x_10);
+x_12 = l_Lean_Meta_simpAll___closed__1;
+x_13 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Meta_instMonadLCtxMetaM___spec__2___rarg), 7, 2);
+lean_closure_set(x_13, 0, x_11);
+lean_closure_set(x_13, 1, x_12);
+x_14 = l_Lean_Meta_simpAll___closed__2;
+x_15 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Meta_instMonadLCtxMetaM___spec__2___rarg), 7, 2);
+lean_closure_set(x_15, 0, x_13);
+lean_closure_set(x_15, 1, x_14);
+x_16 = l_Lean_Meta_withMVarContext___at_Lean_Meta_admit___spec__1___rarg(x_1, x_15, x_3, x_4, x_5, x_6, x_7);
 return x_16;
 }
-else
+}
+lean_object* l_Lean_Meta_simpAll___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) {
+_start:
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-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 = 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_object* x_7; 
+x_7 = l_Lean_Meta_simpAll___lambda__2(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);
+lean_dec(x_1);
+return x_7;
 }
 }
 lean_object* initialize_Init(lean_object*);
@@ -3899,6 +3963,10 @@ l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___lambda__2_
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___lambda__2___closed__1);
 l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___closed__1();
 lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpAll_0__Lean_Meta_SimpAll_loop___closed__1);
+l_Lean_Meta_simpAll___closed__1 = _init_l_Lean_Meta_simpAll___closed__1();
+lean_mark_persistent(l_Lean_Meta_simpAll___closed__1);
+l_Lean_Meta_simpAll___closed__2 = _init_l_Lean_Meta_simpAll___closed__2();
+lean_mark_persistent(l_Lean_Meta_simpAll___closed__2);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c
index b164e2e0c6..e78f3b1eab 100644
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c
@@ -115,7 +115,7 @@ lean_object* l_Std_PersistentHashMap_containsAtAux___at_Lean_Meta_SimpLemmas_isD
 lean_object* l_Lean_Meta_SimpLemmas_post___default;
 lean_object* l_Lean_Meta_SimpLemmas_addDeclToUnfold(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_add_getName_x3f_match__1(lean_object*);
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkSimpLemmaCore___lambda__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_2052____spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_erase___at_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_2052____spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1315,7 +1315,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -1365,7 +1365,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -1508,7 +1508,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_17);
+x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -1597,7 +1597,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_19);
+x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -1631,7 +1631,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_26);
+x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -1752,7 +1752,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_60);
+x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
diff --git a/stage0/stdlib/Lean/Meta/UnificationHint.c b/stage0/stdlib/Lean/Meta/UnificationHint.c
index 121b0eb108..1cea51a5e3 100644
--- a/stage0/stdlib/Lean/Meta/UnificationHint.c
+++ b/stage0/stdlib/Lean/Meta/UnificationHint.c
@@ -104,7 +104,7 @@ lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_instToFormatUnific
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_instToFormatUnificationHints___spec__11___closed__1;
 lean_object* l_Lean_Meta_addUnificationHint_match__1(lean_object*);
 lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_UnificationHint___hyg_598____closed__2;
-uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
+uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerTagAttribute___closed__5;
 lean_object* l_Lean_ConstantInfo_levelParams(lean_object*);
 lean_object* l_Lean_Meta_tryUnificationHints(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -1065,7 +1065,7 @@ else
 {
 lean_object* x_9; uint8_t x_10; 
 x_9 = lean_array_fget(x_1, x_4);
-x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_5, x_9);
+x_10 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_5, x_9);
 lean_dec(x_9);
 if (x_10 == 0)
 {
@@ -1115,7 +1115,7 @@ 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_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_11);
+x_13 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_11);
 lean_dec(x_11);
 if (x_13 == 0)
 {
@@ -1258,7 +1258,7 @@ else
 {
 lean_object* x_17; uint8_t x_18; 
 x_17 = lean_array_fget(x_5, x_2);
-x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_3, x_17);
+x_18 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_3, x_17);
 lean_dec(x_17);
 if (x_18 == 0)
 {
@@ -1347,7 +1347,7 @@ if (x_18 == 0)
 lean_object* x_19; lean_object* x_20; uint8_t x_21; 
 x_19 = lean_ctor_get(x_15, 0);
 x_20 = lean_ctor_get(x_15, 1);
-x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_19);
+x_21 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_19);
 if (x_21 == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; 
@@ -1381,7 +1381,7 @@ x_27 = lean_ctor_get(x_15, 1);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_dec(x_15);
-x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_26);
+x_28 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; lean_object* x_31; 
@@ -1502,7 +1502,7 @@ if (lean_is_exclusive(x_57)) {
  lean_dec_ref(x_57);
  x_62 = lean_box(0);
 }
-x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(x_4, x_60);
+x_63 = l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_35_(x_4, x_60);
 if (x_63 == 0)
 {
 lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67;